From 05f4b39a7bbc77986878d9bf0fe4074d0359d190 Mon Sep 17 00:00:00 2001 From: swrup Date: Sat, 21 Feb 2026 23:40:58 +0100 Subject: [PATCH] test: curl --fail; use KUDOs --- default/assets/mte.conf | 34 +++++++++++++++++----------------- test/auditor_public_key | 1 - test/offline_management.sh | 4 ++-- test/test.ml | 6 +++--- tools/gen_registry_files.ml | 10 +++++++++- tools/offline_impl.ml | 3 +++ 6 files changed, 34 insertions(+), 24 deletions(-) delete mode 100644 test/auditor_public_key diff --git a/default/assets/mte.conf b/default/assets/mte.conf index c401d5f3..3cc477c1 100644 --- a/default/assets/mte.conf +++ b/default/assets/mte.conf @@ -1,6 +1,6 @@ -[currency-EUR] +[currency-KUDO] enabled= YES -code= EUR +code= KUDO name= euro fractional_input_digits= 2 fractional_normal_digits= 2 @@ -8,15 +8,15 @@ fractional_trailing_zero_digits= 2 alt_unit_names= "{"0":"€","3":"k€"}" [exchange] -currency = EUR -currency_round_unit = EUR:0.01 +currency = KUDO +currency_round_unit = KUDO:0.01 db = postgres attribute_encryption_key = "deadbeef" port = 3434 bind_to = localhost master_public_key = "SJ0NYND22VQP3MP7FM754RDX8HCKVWAXTHY9SQNBTPRJZ2SPM2S0" -stefan_abs = EUR:0.00 -stefan_log = EUR:0.00 +stefan_abs = KUDO:0.00 +stefan_log = KUDO:0.00 stefan_lin = 0.00 aggregator_idle_sleep_interval = "1 hour" closer_idle_sleep_interval = "1 hour" @@ -40,7 +40,7 @@ default_purse_limit = 9999 config = "pgx://mte:hunter2@localhost:5432/taler-exchange" [taler-exchange-secmod-rsa] -lookahead_sign = "1 year" +lookahead_sign = "7 weeks" overlap_duration = "1 hour" duration = "3 weeks" key_dir = "secrets/secmod_rsa" @@ -54,27 +54,27 @@ key_dir = "secrets/secmod_eddsa" sm_priv_key = "secrets/secmod_eddsa/sm_key" [coin_kudo_1] -value= EUR:0.01 +value= KUDO:0.01 duration_withdraw= "1 year" duration_spend= "1 year" duration_legal= "1 year" -fee_withdraw= EUR:0.00 -fee_deposit= EUR:0.00 -fee_refresh= EUR:0.00 -fee_refund= EUR:0.00 +fee_withdraw= KUDO:0.00 +fee_deposit= KUDO:0.00 +fee_refresh= KUDO:0.00 +fee_refund= KUDO:0.00 cipher= RSA rsa_keysize= 2048 age_restricted= NO [coin_kudo_2] -value= EUR:0.02 +value= KUDO:0.02 duration_withdraw= "1 year" duration_spend= "1 year" duration_legal= "1 year" -fee_withdraw= EUR:0.00 -fee_deposit= EUR:0.00 -fee_refresh= EUR:0.00 -fee_refund= EUR:0.00 +fee_withdraw= KUDO:0.00 +fee_deposit= KUDO:0.00 +fee_refresh= KUDO:0.00 +fee_refund= KUDO:0.00 cipher= RSA rsa_keysize= 2048 age_restricted= NO diff --git a/test/auditor_public_key b/test/auditor_public_key deleted file mode 100644 index 4b97fccf..00000000 --- a/test/auditor_public_key +++ /dev/null @@ -1 +0,0 @@ -A17JXR3E6J4CXDPYT7S1H25PGJ3ABS26TQ38654QCX0TB59RPMF0 diff --git a/test/offline_management.sh b/test/offline_management.sh index 119c46e0..e8a22785 100755 --- a/test/offline_management.sh +++ b/test/offline_management.sh @@ -6,9 +6,9 @@ a="/tmp/a.json" b="/tmp/b.json" url="http://localhost:3434" -auditor_pub=$(<"./test/auditor_public_key") +auditor_pub="A17JXR3E6J4CXDPYT7S1H25PGJ3ABS26TQ38654QCX0TB59RPMF0" master_key="./default/master_offline_private_key" -zero_euro="EUR:0.0" +zero_euro="KUDO:0.0" offline_tool() { dune exec offline -- "$@" > /dev/null diff --git a/test/test.ml b/test/test.ml index 58b19438..c9af9bd5 100644 --- a/test/test.ml +++ b/test/test.ml @@ -48,16 +48,16 @@ let () = let () = let open Amount in let v = - make ~sign:(Some Sign_plus) ~currency:"EUR" ~value:(Int64.of_int 25) + make ~sign:(Some Sign_plus) ~currency:"KUDO" ~value:(Int64.of_int 25) ~fraction:(Int32.of_int 678) |> Result.get_ok in let s = to_string v in let v' = of_string s |> Result.get_ok in assert (v = v'); - let r = of_string {|~EUR:4.9|} in + let r = of_string {|~KUDO:4.9|} in assert (Result.is_error r); - let r = of_string {|+EUR:4.99999999999999999999999|} in + let r = of_string {|+KUDO:4.99999999999999999999999|} in assert (Result.is_error r); () diff --git a/tools/gen_registry_files.ml b/tools/gen_registry_files.ml index ebaae034..e3ca917d 100644 --- a/tools/gen_registry_files.ml +++ b/tools/gen_registry_files.ml @@ -41,7 +41,15 @@ let download ~tmp ~url = let res = OS.Cmd.run Cmd.( - v "curl" % "--silent" % "--show-error" % "-o" % tmp % "-X" % "GET" % url) + v "curl" + % "--silent" + % "--show-error" + % "--fail" + % "-o" + % tmp + % "-X" + % "GET" + % url) in match res with | Error (`Msg s) -> Fmt.failwith "download failure: %s" s diff --git a/tools/offline_impl.ml b/tools/offline_impl.ml index aa0d08e3..f8c1c895 100644 --- a/tools/offline_impl.ml +++ b/tools/offline_impl.ml @@ -158,6 +158,7 @@ let download ~output ~url = v "curl" % "--silent" % "--show-error" + % "--fail" % "-o" % output % "-X" @@ -171,6 +172,8 @@ let upload ~input ~url = Cmd.( v "curl" % "--silent" + % "--show-error" + % "--fail" % "-i" % "-X" % "POST"