finish migration of test_anastasis_reducer_enter_secret.sh to fakebank

4 files changed, 12 insertions, 14 deletions

diff --git a/src/cli/.gitignore b/src/cli/.gitignore
index 67af1d8..98afc90 100644
--- a/src/cli/.gitignore
+++ b/src/cli/.gitignore
@@ -7,3 +7,6 @@ taler-bank.err
 wallet.err
 anastasis-discover
 talercheck
+test_reducer.conf.edited
+wallet-withdraw.out
+libeufin-transfer-initiate.out
diff --git a/src/cli/test_anastasis_reducer_enter_secret.sh b/src/cli/test_anastasis_reducer_enter_secret.sh
index e54dd40..f9d212a 100755
--- a/src/cli/test_anastasis_reducer_enter_secret.sh
+++ b/src/cli/test_anastasis_reducer_enter_secret.sh
@@ -19,11 +19,13 @@ then
     WIRE_METHOD="x-taler-bank"
     BANK_FLAGS="-f -d $WIRE_METHOD -u $ACCOUNT"
     BANK_URL="http://localhost:18082/taler-bank-access/"
+    MERCHANT_PAYTO="payto://x-taler-bank/localhost/anastasis?receiver-name=anastasis"
 else
     ACCOUNT="exchange-account-1"
     WIRE_METHOD="iban"
     BANK_FLAGS="-ns -d $WIRE_METHOD -u $ACCOUNT"
     BANK_URL="http://localhost:18082/demobanks/default/access-api/"
+    MERCHANT_PAYTO="payto://iban/SANDBOXX/DE648226?receiver-name=anastasis"
 fi
 
 # Check we can actually run
@@ -144,7 +146,9 @@ echo "OK"
 echo -n "Configuring merchant instance ..."
 # Setup merchant
 
-curl -H "Content-Type: application/json" -X POST -d '{"auth":{"method":"external"},"accounts":[{"payto_uri":"payto://iban/SANDBOXX/DE648226?receiver-name=anastasis"}],"id":"default","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000}}' http://localhost:9966/management/instances
+
+
+curl -H "Content-Type: application/json" -X POST -d '{"auth":{"method":"external"},"accounts":[{"payto_uri":"'"$MERCHANT_PAYTO"'"}],"id":"default","name":"default","user_type":"business","address":{},"jurisdiction":{},"use_stefan":true,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000}}' http://localhost:9966/management/instances
 
 
 echo " DONE"
@@ -287,7 +291,7 @@ fi
 
 echo -en "${COLOR}${BOLD}Making payments for policy uploads ... ${NORM}${NOCOLOR}"
 OBJECT_SIZE="$(jq -r -e '.policy_payment_requests | length' < "$TFILE")"
-for ((INDEX=0; INDEX < "$OBJECT_SIZE"x; INDEX++))
+for ((INDEX=0; INDEX < "$OBJECT_SIZE"; INDEX++))
 do
     PAY_URI="$(jq --argjson INDEX "$INDEX" -r -e '.policy_payment_requests[$INDEX].payto' < "$TFILE")"
     # run wallet CLI
@@ -329,5 +333,4 @@ jq -r -e .core_secret \
     && exit_fail "'core_secret' was not cleared upon success"
 
 echo " OK"
-rm -f "$TALER_DB"
 exit 0
diff --git a/src/cli/test_reducer.conf b/src/cli/test_reducer.conf
index 83cc6a4..1c60b4d 100644
--- a/src/cli/test_reducer.conf
+++ b/src/cli/test_reducer.conf
@@ -26,7 +26,7 @@ COST = TESTKUDOS:0.0
 
 
 [exchange]
-MASTER_PUBLIC_KEY = 05PFE7Z2VR074MD07ARZJY937VQ7THA648PSVN3PZ2R2RS54HG0G
+MASTER_PUBLIC_KEY = 3NX5DJDBD8XVGZYHV3PBF8C3Z4GK48XD59YY5GF3CZE8AJM04WSG
 AML_THRESHOLD = TESTKUDOS:1000000
 MAX_KEYS_CACHING = forever
 DB = postgres
@@ -66,22 +66,13 @@ ENABLE_CREDIT = YES
 WIRE_GATEWAY_AUTH_METHOD = none
 WIRE_GATEWAY_URL = "http://localhost:18082/exchange/"
 
-
 [merchant]
 SERVE = tcp
 PORT = 9966
 UNIXPATH = ${TALER_RUNTIME_DIR}/merchant.http
 UNIXPATH_MODE = 660
-DEFAULT_WIRE_FEE_AMORTIZATION = 1
 DB = postgres
-WIREFORMAT = default
-# Set very low, so we can be sure that the database generated
-# will contain wire transfers "ready" for the aggregator.
-WIRE_TRANSFER_DELAY = 1 minute
-DEFAULT_PAY_DEADLINE = 1 day
-DEFAULT_MAX_DEPOSIT_FEE = TESTKUDOS:0.1
 KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv
-DEFAULT_MAX_WIRE_FEE = TESTKUDOS:0.10
 
 # Ensure that merchant reports EVERY deposit confirmation to auditor
 FORCE_AUDIT = YES
@@ -124,7 +115,7 @@ CONFIG = "postgres:///talercheck"
 [merchant-exchange-default]
 EXCHANGE_BASE_URL = http://localhost:8081/
 CURRENCY = TESTKUDOS
-MASTER_KEY = 05PFE7Z2VR074MD07ARZJY937VQ7THA648PSVN3PZ2R2RS54HG0G
+MASTER_KEY = 3NX5DJDBD8XVGZYHV3PBF8C3Z4GK48XD59YY5GF3CZE8AJM04WSG
 
 [payments-generator]
 currency = TESTKUDOS
diff --git a/src/cli/test_reducer_home/.local/share/taler/exchange-offline/master.priv b/src/cli/test_reducer_home/.local/share/taler/exchange-offline/master.priv
new file mode 100644
index 0000000..d990a05
--- /dev/null
+++ b/src/cli/test_reducer_home/.local/share/taler/exchange-offline/master.priv
@@ -0,0 +1 @@
+�>e��n�͙[��z�3���pwTj?c�n21
\ No newline at end of file