-code cleanup

6 files changed, 15 insertions, 22 deletions

diff --git a/src/testing/testing_api_cmd_contract_get.c b/src/testing/testing_api_cmd_contract_get.c
index 10a43aa3b..428bf7e8c 100644
--- a/src/testing/testing_api_cmd_contract_get.c
+++ b/src/testing/testing_api_cmd_contract_get.c
@@ -115,6 +115,7 @@ get_cb (void *cls,
   }
   ref = TALER_TESTING_interpreter_lookup_command (ds->is,
                                                   ds->contract_ref);
+  GNUNET_assert (NULL != ref);
   if (MHD_HTTP_OK == dr->hr.http_status)
   {
     const struct TALER_PurseMergePrivateKeyP *mp;
diff --git a/src/testing/testing_api_cmd_exec_closer.c b/src/testing/testing_api_cmd_exec_closer.c
index 9ee436af0..2501b39a6 100644
--- a/src/testing/testing_api_cmd_exec_closer.c
+++ b/src/testing/testing_api_cmd_exec_closer.c
@@ -91,6 +91,7 @@ closer_run (void *cls,
 
     rcmd = TALER_TESTING_interpreter_lookup_command (is,
                                                      as->reserve_ref);
+    GNUNET_assert (NULL != rcmd);
     if (GNUNET_OK !=
         TALER_TESTING_get_trait_reserve_pub (rcmd,
                                              &reserve_pubp))
diff --git a/src/testing/testing_api_cmd_purse_deposit.c b/src/testing/testing_api_cmd_purse_deposit.c
index b056497e3..ff8e6d2e3 100644
--- a/src/testing/testing_api_cmd_purse_deposit.c
+++ b/src/testing/testing_api_cmd_purse_deposit.c
@@ -163,7 +163,7 @@ deposit_cb (void *cls,
 
       purse_cmd = TALER_TESTING_interpreter_lookup_command (ds->is,
                                                             ds->purse_ref);
-
+      GNUNET_assert (NULL != purse_cmd);
       if (GNUNET_OK !=
           TALER_TESTING_get_trait_reserve_sig (purse_cmd,
                                                &reserve_sig))
@@ -270,6 +270,7 @@ deposit_run (void *cls,
 
   purse_cmd = TALER_TESTING_interpreter_lookup_command (is,
                                                         ds->purse_ref);
+  GNUNET_assert (NULL != purse_cmd);
   if (GNUNET_OK !=
       TALER_TESTING_get_trait_purse_pub (purse_cmd,
                                          &purse_pub))
@@ -291,13 +292,7 @@ deposit_run (void *cls,
 
     coin_cmd = TALER_TESTING_interpreter_lookup_command (is,
                                                          cr->command_ref);
-    if (NULL == coin_cmd)
-    {
-      GNUNET_break (0);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-
+    GNUNET_assert (NULL != coin_cmd);
     if ( (GNUNET_OK !=
           TALER_TESTING_get_trait_coin_priv (coin_cmd,
                                              cr->coin_index,
diff --git a/src/testing/testing_api_cmd_purse_get.c b/src/testing/testing_api_cmd_purse_get.c
index 61873721b..3e7da38f0 100644
--- a/src/testing/testing_api_cmd_purse_get.c
+++ b/src/testing/testing_api_cmd_purse_get.c
@@ -188,13 +188,7 @@ status_run (void *cls,
   create_purse
     = TALER_TESTING_interpreter_lookup_command (is,
                                                 ss->purse_reference);
-
-  if (NULL == create_purse)
-  {
-    GNUNET_break (0);
-    TALER_TESTING_interpreter_fail (is);
-    return;
-  }
+  GNUNET_assert (NULL != create_purse);
   if (GNUNET_OK !=
       TALER_TESTING_get_trait_purse_pub (create_purse,
                                          &ss->purse_pub))
@@ -311,6 +305,7 @@ finish_run (void *cls,
   poll_purse
     = TALER_TESTING_interpreter_lookup_command (is,
                                                 ps->poll_reference);
+  GNUNET_assert (NULL != poll_purse);
   GNUNET_assert (poll_purse->run == &status_run);
   ss = poll_purse->cls;
   if (NULL == ss->pgh)
diff --git a/src/testing/testing_api_cmd_reserve_get.c b/src/testing/testing_api_cmd_reserve_get.c
index f9b8ff6cd..22c29a3be 100644
--- a/src/testing/testing_api_cmd_reserve_get.c
+++ b/src/testing/testing_api_cmd_reserve_get.c
@@ -183,13 +183,7 @@ status_run (void *cls,
   create_reserve
     = TALER_TESTING_interpreter_lookup_command (is,
                                                 ss->reserve_reference);
-
-  if (NULL == create_reserve)
-  {
-    GNUNET_break (0);
-    TALER_TESTING_interpreter_fail (is);
-    return;
-  }
+  GNUNET_assert (NULL != create_reserve);
   if (GNUNET_OK !=
       TALER_TESTING_get_trait_reserve_pub (create_reserve,
                                            &ss->reserve_pubp))
@@ -328,6 +322,7 @@ finish_run (void *cls,
   poll_reserve
     = TALER_TESTING_interpreter_lookup_command (is,
                                                 ps->poll_reference);
+  GNUNET_assert (NULL != poll_reserve);
   GNUNET_assert (poll_reserve->run == &status_run);
   ss = poll_reserve->cls;
   if (NULL == ss->rsh)
diff --git a/src/testing/testing_api_cmd_wire.c b/src/testing/testing_api_cmd_wire.c
index 4b0a177b5..6e44403bc 100644
--- a/src/testing/testing_api_cmd_wire.c
+++ b/src/testing/testing_api_cmd_wire.c
@@ -105,6 +105,12 @@ wire_cb (void *cls,
       char *method;
 
       method = TALER_payto_get_method (accounts[i].payto_uri);
+      if (NULL == method)
+      {
+        GNUNET_break (0);
+        TALER_TESTING_interpreter_fail (ws->is);
+        return;
+      }
       if (0 == strcmp (ws->expected_method,
                        method))
       {