[GNUnet-SVN] [taler-merchant] 05/09: --with-pybank option removed.

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository merchant.

commit 9259ddb29aff66210562f064a03532d24ec2489b
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu May 10 19:49:23 2018 +0200

    --with-pybank option removed.
    
    Paygen must be run against Python bank, as all the
    components involved uses real databases on the hosting
    system, and so must do the bank.
    
    Fakebank is not able to fit in this picture, as it
    uses a in-memory (mock) database, which starts "fresh"
    upon every invocation and whose data cannot be consistent
    with data that exists into the ordinary databases used
    by other components.
---
 .../taler-merchant-generate-payments_new.c         | 32 ++++------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/src/merchant-tools/taler-merchant-generate-payments_new.c 
b/src/merchant-tools/taler-merchant-generate-payments_new.c
index b8498c8..12375de 100644
--- a/src/merchant-tools/taler-merchant-generate-payments_new.c
+++ b/src/merchant-tools/taler-merchant-generate-payments_new.c
@@ -74,12 +74,6 @@ static unsigned int result;
 static struct GNUNET_OS_Process *bankd;
 
 /**
- * Indicates whether we'll use the Python bank (GNUNET_YES),
- * or the fakebank.
- */
-static int with_pybank;
-
-/**
  * Merchant process.
  */
 static struct GNUNET_OS_Process *merchantd;
@@ -184,17 +178,8 @@ run (void *cls,
     TALER_TESTING_cmd_end ()
   };
 
-  if (GNUNET_YES == with_pybank)
-  {
-    TALER_TESTING_run (is,
-                       commands);
-    return; 
-  }
-
-  TALER_TESTING_run_with_fakebank
-    (is,
-     commands,
-     bank_url);
+  TALER_TESTING_run (is,
+                     commands);
 }
 
 /**
@@ -269,12 +254,6 @@ main (int argc,
        "will log to file LF",
        &logfile),
 
-    GNUNET_GETOPT_option_flag
-      ('p',
-       "with-pybank",
-       "Use the Python bank, if given",
-       &with_pybank),
-
     GNUNET_GETOPT_OPTION_END
   };
 
@@ -308,10 +287,9 @@ main (int argc,
     return MISSING_BANK_URL;
   }
 
-  if ((GNUNET_YES == with_pybank)
-      && NULL == (bankd = TALER_TESTING_run_bank
-        (default_config_file,
-         bank_url)))
+  if ( NULL == (bankd = TALER_TESTING_run_bank
+    (default_config_file,
+     bank_url)))
   {
     TALER_LOG_ERROR ("Failed to run the bank\n");
     terminate_process (bankd);

-- 
To stop receiving notification emails like this one, please contact
address@hidden