Merge pull request #5710 from CodaProtocol/fix/rosetta-unsigned-yojson

Rosetta, Unsigned_extended types for Yojson
MinaProtocol · Aug 20, 2020 · a320a4c · a320a4c
2 parents 2ca2335 + 067dbe9
commit a320a4c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/app/rosetta/lib/block.ml b/src/app/rosetta/lib/block.ml
@@ -47,8 +47,8 @@ module Internal_command_info = struct
   type t =
     { kind: Kind.t
     ; receiver: [`Pk of string]
-    ; fee: Unsigned.UInt64.t
-    ; token: Unsigned.UInt64.t
+    ; fee: Unsigned_extended.UInt64.t
+    ; token: Unsigned_extended.UInt64.t
     ; hash: string }
   [@@deriving to_yojson]
 

diff --git a/src/app/rosetta/lib/user_command_info.ml b/src/app/rosetta/lib/user_command_info.ml
@@ -42,8 +42,8 @@ end
 module Account_creation_fees_paid = struct
   type t =
     | By_no_one
-    | By_fee_payer of Unsigned.UInt64.t
-    | By_receiver of Unsigned.UInt64.t
+    | By_fee_payer of Unsigned_extended.UInt64.t
+    | By_receiver of Unsigned_extended.UInt64.t
   [@@deriving eq, to_yojson, sexp, compare]
 end
 
@@ -57,11 +57,11 @@ type t =
   ; fee_payer: [`Pk of string]
   ; source: [`Pk of string]
   ; receiver: [`Pk of string]
-  ; fee_token: Unsigned.UInt64.t
-  ; token: Unsigned.UInt64.t
-  ; fee: Unsigned.UInt64.t
-  ; nonce: Unsigned.UInt32.t
-  ; amount: Unsigned.UInt64.t option
+  ; fee_token: Unsigned_extended.UInt64.t
+  ; token: Unsigned_extended.UInt64.t
+  ; fee: Unsigned_extended.UInt64.t
+  ; nonce: Unsigned_extended.UInt32.t
+  ; amount: Unsigned_extended.UInt64.t option
   ; hash: string
   ; failure_status: Failure_status.t option }
 [@@deriving to_yojson, eq, sexp, compare]
@@ -72,10 +72,10 @@ module Partial = struct
     ; fee_payer: [`Pk of string]
     ; source: [`Pk of string]
     ; receiver: [`Pk of string]
-    ; fee_token: Unsigned.UInt64.t
-    ; token: Unsigned.UInt64.t
-    ; fee: Unsigned.UInt64.t
-    ; amount: Unsigned.UInt64.t option }
+    ; fee_token: Unsigned_extended.UInt64.t
+    ; token: Unsigned_extended.UInt64.t
+    ; fee: Unsigned_extended.UInt64.t
+    ; amount: Unsigned_extended.UInt64.t option }
   [@@deriving to_yojson, sexp, compare]
 
   module Reason = Errors.Partial_reason