From b37e1bfd281140cd460c1cc300e9467c7f9adf44 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Wed, 13 Oct 2021 13:24:33 +0200
Subject: use invalid state instead of error state

---
 src/reducer/anastasis_api_backup_redux.c   | 6 +++---
 src/reducer/anastasis_api_recovery_redux.c | 6 +++---
 src/reducer/anastasis_api_redux.c          | 6 +++---
 src/reducer/anastasis_api_redux.h          | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/reducer/anastasis_api_backup_redux.c b/src/reducer/anastasis_api_backup_redux.c
index 82d26ed..dba6b0b 100644
--- a/src/reducer/anastasis_api_backup_redux.c
+++ b/src/reducer/anastasis_api_backup_redux.c
@@ -131,7 +131,7 @@ ANASTASIS_backup_state_from_string_ (const char *state_string)
     if (0 == strcmp (state_string,
                      backup_strings[i]))
       return i;
-  return ANASTASIS_BACKUP_STATE_ERROR;
+  return ANASTASIS_BACKUP_STATE_INVALID;
 }
 
 
@@ -4828,7 +4828,7 @@ ANASTASIS_backup_action_ (json_t *state,
       "back",
       &back_finished
     },
-    { ANASTASIS_BACKUP_STATE_ERROR, NULL, NULL }
+    { ANASTASIS_BACKUP_STATE_INVALID, NULL, NULL }
   };
   const char *s = json_string_value (json_object_get (state,
                                                       "backup_state"));
@@ -4836,7 +4836,7 @@ ANASTASIS_backup_action_ (json_t *state,
 
   GNUNET_assert (NULL != s); /* holds as per invariant of caller */
   bs = ANASTASIS_backup_state_from_string_ (s);
-  if (ANASTASIS_BACKUP_STATE_ERROR == bs)
+  if (ANASTASIS_BACKUP_STATE_INVALID == bs)
   {
     ANASTASIS_redux_fail_ (cb,
                            cb_cls,
diff --git a/src/reducer/anastasis_api_recovery_redux.c b/src/reducer/anastasis_api_recovery_redux.c
index 17fe639..14cb657 100644
--- a/src/reducer/anastasis_api_recovery_redux.c
+++ b/src/reducer/anastasis_api_recovery_redux.c
@@ -44,7 +44,7 @@ ANASTASIS_recovery_state_from_string_ (const char *state_string)
     if (0 == strcmp (state_string,
                      recovery_strings[i]))
       return i;
-  return ANASTASIS_RECOVERY_STATE_ERROR;
+  return ANASTASIS_RECOVERY_STATE_INVALID;
 }
 
 
@@ -2103,7 +2103,7 @@ ANASTASIS_recovery_action_ (json_t *state,
       "back",
       &back_challenge_solving
     },
-    { ANASTASIS_RECOVERY_STATE_ERROR, NULL, NULL }
+    { ANASTASIS_RECOVERY_STATE_INVALID, NULL, NULL }
   };
   const char *s = json_string_value (json_object_get (state,
                                                       "recovery_state"));
@@ -2111,7 +2111,7 @@ ANASTASIS_recovery_action_ (json_t *state,
 
   GNUNET_assert (NULL != s);
   rs = ANASTASIS_recovery_state_from_string_ (s);
-  if (ANASTASIS_RECOVERY_STATE_ERROR == rs)
+  if (ANASTASIS_RECOVERY_STATE_INVALID == rs)
   {
     ANASTASIS_redux_fail_ (cb,
                            cb_cls,
diff --git a/src/reducer/anastasis_api_redux.c b/src/reducer/anastasis_api_redux.c
index 27b17f8..41bbdda 100644
--- a/src/reducer/anastasis_api_redux.c
+++ b/src/reducer/anastasis_api_redux.c
@@ -282,7 +282,7 @@ ANASTASIS_generic_state_from_string_ (const char *state_string)
     if (0 == strcmp (state_string,
                      generic_strings[i]))
       return i;
-  return ANASTASIS_GENERIC_STATE_ERROR;
+  return ANASTASIS_GENERIC_STATE_INVALID;
 }
 
 
@@ -1800,7 +1800,7 @@ ANASTASIS_redux_action (const json_t *state,
       "back",
       &ANASTASIS_back_generic_decrement_
     },
-    { ANASTASIS_GENERIC_STATE_ERROR, NULL, NULL }
+    { ANASTASIS_GENERIC_STATE_INVALID, NULL, NULL }
   };
   bool recovery_mode = false;
   const char *s = json_string_value (json_object_get (state,
@@ -1840,7 +1840,7 @@ ANASTASIS_redux_action (const json_t *state,
 
     new_state = json_deep_copy (state);
     GNUNET_assert (NULL != new_state);
-    if (gs != ANASTASIS_GENERIC_STATE_ERROR)
+    if (gs != ANASTASIS_GENERIC_STATE_INVALID)
     {
       for (unsigned int i = 0; NULL != dispatchers[i].fun; i++)
       {
diff --git a/src/reducer/anastasis_api_redux.h b/src/reducer/anastasis_api_redux.h
index b4fe5c4..408c63c 100644
--- a/src/reducer/anastasis_api_redux.h
+++ b/src/reducer/anastasis_api_redux.h
@@ -25,7 +25,7 @@
 
 
 #define ANASTASIS_GENERIC_STATES(REDUX_STATE) \
-  REDUX_STATE (ERROR) \
+  REDUX_STATE (INVALID) \
   REDUX_STATE (CONTINENT_SELECTING)   \
   REDUX_STATE (COUNTRY_SELECTING)  \
   REDUX_STATE (USER_ATTRIBUTES_COLLECTING)
-- 
cgit v1.2.3