add receiver-name to all accounts

5 files changed, 10 insertions, 7 deletions

diff --git a/experiment/scripts/benchmark.sh b/experiment/scripts/benchmark.sh
index c48d36d..61bf66b 100755
--- a/experiment/scripts/benchmark.sh
+++ b/experiment/scripts/benchmark.sh
@@ -45,11 +45,14 @@ function start_wallet_bench() {
       \"paytoTemplate\": \"payto://x-taler-bank/bank.${DNS_ZONE}/merchant-\${id}?receiver-name=merchant\",
       \"randomAlg\": \"${WALLET_MERCHANT_SELECTION}\",
       \"numMerchants\": ${WALLET_NUM_MERCHANTS},
-      \"iterations\": 100000,
+      \"iterations\": 10000,
       \"deposits\": ${NUM_DEPOSITS},
       \"restartAfter\": 2
     }"
   else
+    if [[ "${WALLET_BENCHMARK}" == bench3 ]]; then
+      WALLET_BENCHMARK=bench1
+    fi
     taler-wallet-cli \
       -L ${LOG_LEVEL} \
       advanced ${WALLET_BENCHMARK} \
@@ -58,8 +61,8 @@ function start_wallet_bench() {
       \"exchange\": \"${PROTO}://${EXCHANGE_GW_DOMAIN}/\",
       \"bank\": \"http://bank.${DNS_ZONE}/\",
       \"currency\": \"KUDOS\",
-      \"payto\": \"payto://x-taler-bank/bank.${DNS_ZONE}/merchant-1?receiver-name=merchant\",
-      \"iterations\": 100000,
+      \"payto\": \"payto://x-taler-bank/bank.${DNS_ZONE}/merchant-1?receiver-name=merchant-1\",
+      \"iterations\": 10000,
       \"deposits\": ${NUM_DEPOSITS},
       \"restartAfter\": 2
     }"
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index 535188f..6cb1bbb 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -209,7 +209,7 @@ function setup_config() {
   max_parallel_maintenance_workers=12
   
   # out of shared memory
-  max_locks_per_transaction=120
+  max_locks_per_transaction=200
   
   # (max used =~ work_mem * max_connections)
   # NOTE: This formula is not completely correct 
diff --git a/experiment/scripts/exchange.sh b/experiment/scripts/exchange.sh
index a887ae2..38d46e9 100755
--- a/experiment/scripts/exchange.sh
+++ b/experiment/scripts/exchange.sh
@@ -85,7 +85,7 @@ function setup_primary_exchange() {
   
   taler-exchange-offline download > sig-req.json
   taler-exchange-offline sign < sig-req.json > sig-res.json
-  taler-exchange-offline enable-account "payto://x-taler-bank/bank.${DNS_ZONE}/Exchange" > acct-res.json
+  taler-exchange-offline enable-account "payto://x-taler-bank/bank.${DNS_ZONE}/exchange?receiver-name=exchange" > acct-res.json
   taler-exchange-offline wire-fee $(date +%Y) x-taler-bank KUDOS:0 KUDOS:0 KUDOS:0 > fee-res.json
   taler-exchange-offline upload < sig-res.json
   taler-exchange-offline upload < acct-res.json
diff --git a/experiment/scripts/merchant.sh b/experiment/scripts/merchant.sh
index 80d4c93..1ec68a2 100755
--- a/experiment/scripts/merchant.sh
+++ b/experiment/scripts/merchant.sh
@@ -68,7 +68,7 @@ function create_instance() {
        -H "Authorization: Bearer secret-token:${TALER_MERCHANT_TOKEN}" \
        -H "Content-Type: application/json" \
        -d "{
-             \"payto_uris\": [ \"payto://x-taler-bank/bank.${DNS_ZONE}/${1}\" ],
+             \"payto_uris\": [ \"payto://x-taler-bank/bank.${DNS_ZONE}/${1}?receiver-name=${1}\" ],
 	     \"id\": \"${1}\",
 	     \"name\": \"${1}\",
 	     \"address\": {\"country\": \"CH\"},
diff --git a/experiment/scripts/postgres-cluster/exch-cluster.sh b/experiment/scripts/postgres-cluster/exch-cluster.sh
index 9500dc4..fbd2176 100755
--- a/experiment/scripts/postgres-cluster/exch-cluster.sh
+++ b/experiment/scripts/postgres-cluster/exch-cluster.sh
@@ -46,7 +46,7 @@ sleep 5
 
 taler-exchange-offline download > sig-req.json
 taler-exchange-offline sign < sig-req.json > sig-res.json
-taler-exchange-offline enable-account "payto://x-taler-bank/bank.${DNS_ZONE}/Exchange" > acct-res.json
+taler-exchange-offline enable-account "payto://x-taler-bank/bank.${DNS_ZONE}/exchange?receiver-name=exchange" > acct-res.json
 taler-exchange-offline wire-fee $(date +%Y) x-taler-bank KUDOS:0 KUDOS:0 KUDOS:0 > fee-res.json
 taler-exchange-offline upload < sig-res.json
 taler-exchange-offline upload < acct-res.json