rename crockford

tools/offline.ml

@@ -47,25 +47,26 @@ module Arg = struct
     Arg.Conv.make ~docv:"amount argument" ~parser:Amount.of_string ~pp:Amount.pp
       ()
 
-  let b32 =
-    let pp fmt v = Fmt.pf fmt "%s" (B32.encode v) in
-    Arg.Conv.make ~docv:"Crockford's Base32 encoded argument" ~parser:B32.decode
-      ~pp ()
+  let crockford =
+    let pp fmt v = Fmt.pf fmt "%s" (Crockford.encode v) in
+    Arg.Conv.make ~docv:"Crockford's Base32 encoded argument"
+      ~parser:Crockford.decode ~pp ()
 
   let eddsa_pub =
     let pp fmt key =
-      let s = Eddsa.pub_to_b32 key in
+      let s = Eddsa.pub_to_crockford key in
       Fmt.pf fmt "%s" s
     in
-    Arg.Conv.make ~docv:"eddsa public key argument" ~parser:Eddsa.pub_of_b32 ~pp
-      ()
+    Arg.Conv.make ~docv:"eddsa public key argument"
+      ~parser:Eddsa.pub_of_crockford ~pp ()
 
   let rsa_pub =
     let pp fmt key =
-      let s = Rsa.pub_to_b32 key in
+      let s = Rsa.pub_to_crockford key in
       Fmt.pf fmt "%s" s
     in
-    Arg.Conv.make ~docv:"rsa public key argument" ~parser:Rsa.pub_of_b32 ~pp ()
+    Arg.Conv.make ~docv:"rsa public key argument" ~parser:Rsa.pub_of_crockford
+      ~pp ()
 end
 
 let master_key =
@@ -310,7 +311,7 @@ let drain_cmd =
   let credit_payto_uri =
     Arg.(required & opt (some string) None & info [ "credit_payto_uri" ])
   in
-  let wtid = Arg.(required & opt (some b32) None & info [ "wtid" ]) in
+  let wtid = Arg.(required & opt (some crockford) None & info [ "wtid" ]) in
   let date = Arg.(required & opt (some timestamp) None & info [ "date" ]) in
   let amount = Arg.(required & opt (some amount) None & info [ "amount" ]) in
   Cmd.make (Cmd.info "drain" ~doc)

tools/offline_impl.ml

@@ -202,7 +202,9 @@ let setup ~output ~output_pubkey =
   @@
   let priv, pub = Mirage_crypto_ec.Ed25519.generate () in
   let priv_data = Mirage_crypto_ec.Ed25519.priv_to_octets priv in
-  let pub_data = Mirage_crypto_ec.Ed25519.pub_to_octets pub |> B32.encode in
+  let pub_data =
+    Mirage_crypto_ec.Ed25519.pub_to_octets pub |> Crockford.encode
+  in
   let* () = write_file output priv_data in
   let* () = write_file output_pubkey pub_data in
   Ok ()
@@ -223,7 +225,7 @@ let revoke_denom ~output ~master_key ~h_denom =
   @@
   let* key = read_master_key_file master_key in
   let* h_denom_pub =
-    DenominationHash.of_b32 h_denom |> Result.map_error (fun e -> `Msg e)
+    DenominationHash.of_crockford h_denom |> Result.map_error (fun e -> `Msg e)
   in
   let denom_revoke =
     let master_sig =