diff options
| author | Christian Grothoff <christian@grothoff.org> | 2023-08-22 00:39:20 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2023-08-22 23:15:29 +0200 |
| commit | b0614cfbd74b226b90ddcbc243c0c42e0f01f67a (patch) | |
| tree | 392b5f93f06fec02c27a705e35cf3730c7ad9160 | |
| parent | 2071e9605e3b3b3255ef549783301e9425472d1f (diff) | |
| download | anastasis-b0614cfbd74b226b90ddcbc243c0c42e0f01f67a.tar.gz anastasis-b0614cfbd74b226b90ddcbc243c0c42e0f01f67a.tar.bz2 anastasis-b0614cfbd74b226b90ddcbc243c0c42e0f01f67a.zip | |
-adjust to latest merchant testing API
| -rwxr-xr-x | src/cli/test_anastasis_reducer_enter_secret.sh | 2 | ||||
| -rwxr-xr-x | src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh | 2 | ||||
| -rw-r--r-- | src/testing/test_anastasis.c | 3 | ||||
| -rw-r--r-- | src/testing/test_anastasis_api.c | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/cli/test_anastasis_reducer_enter_secret.sh b/src/cli/test_anastasis_reducer_enter_secret.sh index e656116..e6b6610 100755 --- a/src/cli/test_anastasis_reducer_enter_secret.sh +++ b/src/cli/test_anastasis_reducer_enter_secret.sh @@ -291,7 +291,7 @@ 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":{},"default_max_wire_fee":"TESTKUDOS:1", "default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"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":"payto://iban/SANDBOXX/DE648226?receiver-name=anastasis"}],"id":"default","name":"default","user_type":"business","address":{},"jurisdiction":{},"enable_stefan":true,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000}}' http://localhost:9966/management/instances echo " DONE" diff --git a/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh b/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh index 4f8b451..32f9461 100755 --- a/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh +++ b/src/cli/test_anastasis_reducer_recovery_enter_user_attributes.sh @@ -318,7 +318,7 @@ 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":{},"default_max_wire_fee":"TESTKUDOS:1", "default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"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":"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 echo " DONE" diff --git a/src/testing/test_anastasis.c b/src/testing/test_anastasis.c index e3eec24..eed0071 100644 --- a/src/testing/test_anastasis.c +++ b/src/testing/test_anastasis.c @@ -328,14 +328,13 @@ run (void *cls, NULL), TALER_TESTING_cmd_get_exchange ("get-exchange", cred.cfg, + NULL, true, true), - TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys"), TALER_TESTING_cmd_merchant_post_instances ("instance-create-default", merchant_url, "default", merchant_payto, - "EUR", MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_batch ("pay", pay), diff --git a/src/testing/test_anastasis_api.c b/src/testing/test_anastasis_api.c index cdf8f54..5f24858 100644 --- a/src/testing/test_anastasis_api.c +++ b/src/testing/test_anastasis_api.c @@ -276,14 +276,13 @@ run (void *cls, NULL), TALER_TESTING_cmd_get_exchange ("get-exchange", cred.cfg, + NULL, true, true), - TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys"), TALER_TESTING_cmd_merchant_post_instances ("instance-create-default", merchant_url, "default", merchant_payto, - "EUR", MHD_HTTP_NO_CONTENT), ANASTASIS_TESTING_cmd_config ("salt-request-1", anastasis_url, |