test/offline_management.sh

@@ -6,13 +6,15 @@ a="tmp_a.json"
 b="tmp_b.json"
 
 auditor_pub=$(<"./test/auditor_public_key")
+master_key="./default/master_offline_private_key"
 zero_euro="EUR:0.0"
 
 dune exec offline -- download --output $a
-dune exec offline -- sign --input $a --output $b
+dune exec offline -- sign --master_key $master_key --input $a --output $b
 dune exec offline -- upload --input $b --url "/management/keys"
 
 dune exec offline -- enable-auditor \
+--master_key $master_key \
 --output $b \
 --auditor_url "auditor.example.com" \
 --auditor_name "auditor example" \
@@ -21,6 +23,7 @@ dune exec offline -- enable-auditor \
 dune exec offline -- upload --input $b --url "/management/auditors"
 
 dune exec offline -- wire-fee \
+--master_key $master_key \
 --output $b \
 --wire_method "xxx" \
 --fee_start 0 \
@@ -30,6 +33,7 @@ dune exec offline -- wire-fee \
 dune exec offline -- upload --input $b --url "/management/wire-fee"
 
 dune exec offline -- global-fees \
+--master_key $master_key \
 --output $b \
 --start_date 0 \
 --end_date 99999999 \

tools/offline.ml

@@ -1,4 +1,7 @@
 (* TODO
+   change download_cmd/upload_cmd
+   change arguments: '_' -> '-'
+
    all management operations:
      /management/wire
      /management/wire/disable
@@ -65,18 +68,9 @@ module Arg = struct
     Arg.Conv.make ~docv:"eddsa public key argument" ~parser ~pp ()
 end
 
-let default_master_offline_key_file = "data/master_offline_private_key"
-(*
-let default_response_file = "response.json"
-let default_request_file = "request.json"
-*)
-
 let master_key =
   let doc = "Master offline Eddsa private key file." in
-  Arg.(
+  Arg.(required & opt (some file) None & info [ "master_key" ] ~doc)
-    value
-    & opt file default_master_offline_key_file
-    & info [ "master_key_file" ] ~doc)
 
 let input =
   let doc = "input file" in
@@ -94,10 +88,7 @@ let setup_cmd =
   let doc = "Generate offline master keys" in
   let output =
     let doc = "output file" in
-    Arg.(
+    Arg.(required & opt (some filepath) None & info [ "o"; "output" ] ~doc)
-      value
-      & opt filepath default_master_offline_key_file
-      & info [ "o"; "output" ] ~doc)
   in
   Cmd.make (Cmd.info "setup" ~doc)
   @@
@@ -105,17 +96,14 @@ let setup_cmd =
   setup ~output
 
 let download_cmd =
-  let doc = "GET /management/keys/" in
+  let doc = "GET" in
-  let man =
+  Cmd.make (Cmd.info "download" ~doc)
-    [ `S Manpage.s_description; `P "$(cmd) download /management/keys." ]
-  in
-  Cmd.make (Cmd.info "download" ~doc ~man)
   @@
   let+ output = output in
   download ~output
 
 let upload_cmd =
-  let doc = "POST input.json data to url (default /management/keys)" in
+  let doc = "POST" in
   Cmd.make (Cmd.info "upload" ~doc)
   @@
   let+ input = input and+ url = url in