~

src/management.ml

@@ -28,26 +28,34 @@ let mk_future_denom denom_secmod_sign_f
      } :
       Secmod_denom.rsa_denom) =
   let denom_pub = mk_denomination_key pub in
-  let ps =
+  let denom_secmod_sig =
+    let open Binary_formats in
     let h_denom_pub =
       (* TODO hash *)
-      let v = pub |> RsaPublicKey.to_string in
-      Binary_formats.DenominationHash.{ v= { v } }
+      let v = pub |> Types.RsaPublicKey.to_string in
+      DenominationHash.{ v= { v } }
     in
     let h_section_name =
       (* TODO hash *)
       let v = section_name in
-      Binary_formats.HashCode.{ v }
+      HashCode.{ v }
     in
-    let anchor_time = Binary_formats.TimeAbsoluteNBO.{ v= 0_L } in
-    let duration_withdraw = Binary_formats.TimeRelativeNBO.{ v= 0_L } in
-    Binary_formats.DenominationKeyAnnouncementPS.
-      { h_denom_pub; h_section_name; anchor_time; duration_withdraw }
-  in
-  let denom_secmod_sig =
-    ps
-    |> Bin.to_string Binary_formats.DenominationKeyAnnouncementPS.bin
-    |> denom_secmod_sign_f
+    let anchor_time =
+      TimeAbsoluteNBO.{ v= Util.ptime_to_int64_us stamp_start }
+    in
+    let duration_withdraw =
+      let v =
+        Ptime.diff stamp_start stamp_expire_withdraw
+        |> Util.ptime_of_span_exn
+        |> Util.ptime_to_int64_us
+      in
+      TimeRelativeNBO.{ v }
+    in
+    let ps =
+      DenominationKeyAnnouncementPS.
+        { h_denom_pub; h_section_name; anchor_time; duration_withdraw }
+    in
+    ps |> Bin.to_string DenominationKeyAnnouncementPS.bin |> denom_secmod_sign_f
   in
   FutureDenom.
     {
@@ -80,22 +88,24 @@ let mk_future_sign_key signkey_secmod_sign_f
     let v = EddsaPublicKey.to_string pub in
     Binary_formats.ExchangePublicKeyP.{ v= { v } }
   in
-  let signing_key_announcement_ps =
-    let anchor_time =
-      Binary_formats.TimeAbsoluteNBO.{ v= Util.ptime_to_int64_us stamp_start }
-    in
-    let duration =
-      let v =
-        Ptime.diff stamp_start stamp_expire
-        |> Util.ptime_of_span_exn
-        |> Util.ptime_to_int64_us
+  let signkey_secmod_sig =
+    let open Binary_formats in
+    let ps =
+      let anchor_time =
+        TimeAbsoluteNBO.{ v= Util.ptime_to_int64_us stamp_start }
       in
-      Binary_formats.TimeRelativeNBO.{ v }
+      let duration =
+        let v =
+          Ptime.diff stamp_start stamp_expire
+          |> Util.ptime_of_span_exn
+          |> Util.ptime_to_int64_us
+        in
+        TimeRelativeNBO.{ v }
+      in
+      SigningKeyAnnouncementPS.{ exchange_pub; anchor_time; duration }
     in
-    Binary_formats.SigningKeyAnnouncementPS.
-      { exchange_pub; anchor_time; duration }
+    ps |> Bin.to_string SigningKeyAnnouncementPS.bin |> signkey_secmod_sign_f
   in
-  let signkey_secmod_sig = signkey_secmod_sign_f signing_key_announcement_ps in
   FutureSignKey.
     {
       key= pub;