tweak how merge conflict is resolved

o1-labs · Jun 29, 2023 · 50a5281 · 50a5281
1 parent 6763ac5
commit 50a5281
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ocaml/lib/consistency_test.ml b/ocaml/lib/consistency_test.ml
@@ -290,7 +290,12 @@ module Transaction_hash = struct
   let example_payment =
     let kp = keypair () in
     let payload : Signed_command_payload.t =
-      Signed_command_payload.dummy
+      { Signed_command_payload.dummy with
+        common =
+          { Signed_command_payload.dummy.common with
+            fee_payer_pk = Signature_lib.Public_key.compress kp.public_key
+          }
+      }
     in
     let payment = Signed_command.sign kp payload in
     (payment :> Signed_command.t)