diff --git a/eddsa_sed.sh b/eddsa_sed.sh deleted file mode 100644 index 4fab4e85..00000000 --- a/eddsa_sed.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -set -e - -file="tools/*" - -sed "s/EddsaPrivateKey\.t /Eddsa\.priv /g" -i $file -sed "s/EddsaPrivateKey\.t;/Eddsa\.priv;/g" -i $file -sed "s/EddsaPublicKey\.t /Eddsa\.pub /g" -i $file -sed "s/EddsaPublicKey\.t;/Eddsa\.pub;/g" -i $file -sed "s/EddsaSignature\.t /Eddsa\.sig_ /g" -i $file -sed "s/EddsaSignature\.t;/Eddsa\.sig_;/g" -i $file -sed "s/EddsaPublicKey\.t)/Eddsa\.pub)/g" -i $file - -sed "s/EddsaPrivateKey\.of_octets /Eddsa\.priv_of_octets /g" -i $file -sed "s/EddsaPrivateKey\.to_octets /Eddsa\.priv_to_octets /g" -i $file -sed "s/EddsaPrivateKey\.pub_of_priv /Eddsa\.pub_of_priv /g" -i $file -sed "s/EddsaPrivateKey\.generate /Eddsa\.generate /g" -i $file -sed "s/EddsaPrivateKey\.bin /Eddsa\.priv_bin /g" -i $file - -sed "s/EddsaPublicKey\.to_b32 /Eddsa\.pub_to_b32 /g" -i $file -sed "s/EddsaPublicKey\.of_b32 /Eddsa\.pub_of_b32 /g" -i $file -sed "s/EddsaSignature\.sign /Eddsa\.sign /g" -i $file - -sed "s/EddsaPrivateKey\.jsont/Eddsa\.priv_jsont/g" -i $file -sed "s/EddsaPublicKey\.jsont/Eddsa\.pub_jsont/g" -i $file -sed "s/EddsaSignature\.jsont/Eddsa\.sig_jsont/g" -i $file -sed "s/EddsaPrivateKey\.caqti/Eddsa\.priv_caqti/g" -i $file -sed "s/EddsaPublicKey\.caqti/Eddsa\.pub_caqti/g" -i $file -sed "s/EddsaSignature\.caqti/Eddsa\.sig_caqti/g" -i $file diff --git a/test/dune b/test/dune index 21fb4bb1..cfea041f 100644 --- a/test/dune +++ b/test/dune @@ -4,6 +4,11 @@ (libraries mte mirage-crypto-rng.unix)) (executable - (name validate_response) - (modules validate_response) + (public_name mte-validate) + (name validate) + (modules validate) (libraries mte bos cmdliner)) + +(cram + (deps + (file "keys.demo.taler.net.v31_0_9.json"))) diff --git a/test/validate_response.ml b/test/validate.ml similarity index 93% rename from test/validate_response.ml rename to test/validate.ml index eaa5f741..567d13ad 100644 --- a/test/validate_response.ml +++ b/test/validate.ml @@ -121,16 +121,16 @@ open Cmdliner open Cmdliner.Term.Syntax let keys_cmd = - let input = - let doc = "input file" in - Arg.(required & opt (some filepath) None & info [ "i"; "input" ] ~doc) + let file = + let doc = "JSON file with /keys response" in + Arg.(required & pos 0 (some filepath) None & info [] ~doc) in - let doc = "validate a /keys JSON response" in + let doc = "Validate a /keys response" in Cmd.make (Cmd.info "keys" ~doc) @@ - let+ input = input in + let+ file = file in let* content = - Result.bind (Fpath.of_string input) Bos.OS.File.read |> unwrap_msg + Result.bind (Fpath.of_string file) Bos.OS.File.read |> unwrap_msg in keys content diff --git a/test/validate.t b/test/validate.t new file mode 100644 index 00000000..f0022330 --- /dev/null +++ b/test/validate.t @@ -0,0 +1 @@ + $ mte-validate keys keys.demo.taler.net.v31_0_9.json diff --git a/tools/dune b/tools/dune index 8f30fd36..0a60a05b 100644 --- a/tools/dune +++ b/tools/dune @@ -1,5 +1,5 @@ (executable - (public_name offline) + (public_name mte-offline-tool) (name offline) (modules offline offline_impl) (libraries mte mtime mtime.clock mirage-crypto-rng.unix cmdliner bos fmt))