[taler-grid5k] 21/189: generic wire-fee year, fix empty shards when partitioned only

[gnunet]

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

marco-boss pushed a commit to branch master
in repository grid5k.

commit 5712ba035a6ceb08766b9501094ff42a59af6216
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Tue Feb 22 13:14:10 2022 +0100

    generic wire-fee year, fix empty shards when partitioned only
---
 experiment/scripts/.run.sh.swp | Bin 0 -> 12288 bytes
 experiment/scripts/exchange.sh |   2 +-
 experiment/scripts/setup.sh    |   4 +++-
 sql/exchange-0002.sql          |  24 ++++++++++++------------
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/experiment/scripts/.run.sh.swp b/experiment/scripts/.run.sh.swp
new file mode 100644
index 0000000..3bb9928
Binary files /dev/null and b/experiment/scripts/.run.sh.swp differ
diff --git a/experiment/scripts/exchange.sh b/experiment/scripts/exchange.sh
index 7277211..1bf5035 100755
--- a/experiment/scripts/exchange.sh
+++ b/experiment/scripts/exchange.sh
@@ -52,7 +52,7 @@ function setup_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_DOMAIN}/Exchange" > acct-res.json
-  taler-exchange-offline wire-fee 2021 x-taler-bank KUDOS:0 KUDOS:0 > 
fee-res.json
+  taler-exchange-offline wire-fee $(date +%Y) x-taler-bank KUDOS:0 KUDOS:0 > 
fee-res.json
   taler-exchange-offline upload < sig-res.json
   taler-exchange-offline upload < acct-res.json
   taler-exchange-offline upload < fee-res.json
diff --git a/experiment/scripts/setup.sh b/experiment/scripts/setup.sh
index 826ce50..a84d5ce 100644
--- a/experiment/scripts/setup.sh
+++ b/experiment/scripts/setup.sh
@@ -30,7 +30,9 @@ function parse_experiment_nodes() {
   for NODE in ${NODES}; do
     NODES_STR=$(\
       cat ~/nodes.json | \
-      jq --arg NODE ${NODE}.* -r 'map(select(.node | test($NODE)) | .host) | 
join("|")'
+      jq --arg NODE ${NODE}.* -r 'map(select(.node | test($NODE)) | .host) |
+                                  join("|") |
+                                 select(. != "") // "none"'
     )
     echo "${NODE^^}_HOSTS=\"${NODES_STR}\"" >> ~/.env
     echo "NUM_${NODE^^}S=$(echo ${NODES_STR} | awk -F '|' '{print NF}')" >> 
~/.env
diff --git a/sql/exchange-0002.sql b/sql/exchange-0002.sql
index cf97e57..cfc91dc 100644
--- a/sql/exchange-0002.sql
+++ b/sql/exchange-0002.sql
@@ -17,8 +17,8 @@ BEGIN
   ALTER TABLE IF EXISTS refresh_transfer_keys DETACH PARTITION 
refresh_transfer_keys_default;
   ALTER TABLE IF EXISTS deposits DETACH PARTITION deposits_default;
   ALTER TABLE IF EXISTS refunds DETACH PARTITION refunds_default;
-  -- ALTER TABLE IF EXISTS wire_out DETACH PARTITION wire_out_default;
-  -- ALTER TABLE IF EXISTS aggregation_tracking DETACH PARTITION 
aggregation_tracking_default;
+  ALTER TABLE IF EXISTS wire_out DETACH PARTITION wire_out_default;
+  ALTER TABLE IF EXISTS aggregation_tracking DETACH PARTITION 
aggregation_tracking_default;
   ALTER TABLE IF EXISTS recoup DETACH PARTITION recoup_default;
   ALTER TABLE IF EXISTS recoup_refresh DETACH PARTITION recoup_refresh_default;
   ALTER TABLE IF EXISTS prewire DETACH PARTITION prewire_default;
@@ -44,8 +44,8 @@ BEGIN
   DROP TABLE IF EXISTS refresh_transfer_keys_default;
   DROP TABLE IF EXISTS deposits_default;
   DROP TABLE IF EXISTS refunds_default;
-  -- DROP TABLE IF EXISTS wire_out_default;
-  -- DROP TABLE IF EXISTS aggregation_tracking_default;
+  DROP TABLE IF EXISTS wire_out_default;
+  DROP TABLE IF EXISTS aggregation_tracking_default;
   DROP TABLE IF EXISTS recoup_default;
   DROP TABLE IF EXISTS recoup_refresh_default;
   DROP TABLE IF EXISTS prewire_default;
@@ -103,8 +103,8 @@ BEGIN
     PERFORM create_partition('refresh_transfer_keys', modulus, num_partitions);
     PERFORM create_partition('deposits', modulus, num_partitions);
     PERFORM create_partition('refunds', modulus, num_partitions);
-    -- PERFORM create_partition('wire_out', modulus, num_partitions);
-    -- PERFORM create_partition('aggregation_tracking', modulus, 
num_partitions);
+    PERFORM create_partition('wire_out', modulus, num_partitions);
+    PERFORM create_partition('aggregation_tracking', modulus, num_partitions);
     PERFORM create_partition('recoup', modulus, num_partitions);
     PERFORM create_partition('recoup_refresh', modulus, num_partitions);
     PERFORM create_partition('prewire', modulus, num_partitions);
@@ -187,11 +187,11 @@ BEGIN
 
   ALTER TABLE IF EXISTS refunds DROP CONSTRAINT IF EXISTS refunds_pkey CASCADE;
 
-  -- ALTER TABLE IF EXISTS wire_out DROP CONSTRAINT IF EXISTS wire_out_pkey 
CASCADE;
-  -- ALTER TABLE IF EXISTS wire_out DROP CONSTRAINT IF EXISTS 
wire_out_wtid_raw_key CASCADE;
+  ALTER TABLE IF EXISTS wire_out DROP CONSTRAINT IF EXISTS wire_out_pkey 
CASCADE;
+  ALTER TABLE IF EXISTS wire_out DROP CONSTRAINT IF EXISTS 
wire_out_wtid_raw_key CASCADE;
 
-  -- ALTER TABLE IF EXISTS aggregation_tracking DROP CONSTRAINT IF EXISTS 
aggregation_tracking_pkey CASCADE;
-  -- ALTER TABLE IF EXISTS aggregation_tracking DROP CONSTRAINT IF EXISTS 
aggregation_tracking_wtid_raw_fkey;
+  ALTER TABLE IF EXISTS aggregation_tracking DROP CONSTRAINT IF EXISTS 
aggregation_tracking_pkey CASCADE;
+  ALTER TABLE IF EXISTS aggregation_tracking DROP CONSTRAINT IF EXISTS 
aggregation_tracking_wtid_raw_fkey;
 
   ALTER TABLE IF EXISTS recoup DROP CONSTRAINT IF EXISTS recoup_pkey CASCADE;
 
@@ -247,8 +247,8 @@ BEGIN
   PERFORM create_foreign_table('refresh_transfer_keys', num_shards, suffix, 
shard_idx);
   PERFORM create_foreign_table('deposits', num_shards, suffix, shard_idx);
   PERFORM create_foreign_table('refunds', num_shards, suffix, shard_idx);
-  -- PERFORM create_foreign_table('wire_out', num_shards, suffix, shard_idx);
-  -- PERFORM create_foreign_table('aggregation_tracking', num_shards, suffix, 
shard_idx);
+  PERFORM create_foreign_table('wire_out', num_shards, suffix, shard_idx);
+  PERFORM create_foreign_table('aggregation_tracking', num_shards, suffix, 
shard_idx);
   PERFORM create_foreign_table('recoup', num_shards, suffix, shard_idx);
   PERFORM create_foreign_table('recoup_refresh', num_shards, suffix, 
shard_idx);
   PERFORM create_foreign_table('prewire', num_shards, suffix, shard_idx);

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.