Re-order arguments of commitTx

Idea of ordering: Most generic arguments first (networkId), then protocol-specific (scriptRegistry), then head-specific (headId).
input-output-hk · Feb 6, 2023 · 8377393 · 8377393
1 parent ceaf952
commit 8377393
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/hydra-node/src/Hydra/Chain/Direct/State.hs b/hydra-node/src/Hydra/Chain/Direct/State.hs
@@ -296,9 +296,9 @@ commit ctx st utxo = do
       case UTxO.pairs utxo of
         [aUTxO] -> do
           rejectByronAddress aUTxO
-          Right $ commitTx scriptRegistry networkId headId ownParty (Just aUTxO) initial
+          Right $ commitTx networkId scriptRegistry headId ownParty (Just aUTxO) initial
         [] -> do
-          Right $ commitTx scriptRegistry networkId headId ownParty Nothing initial
+          Right $ commitTx networkId scriptRegistry headId ownParty Nothing initial
         _ ->
           Left (MoreThanOneUTxOCommitted @Tx)
  where

diff --git a/hydra-node/src/Hydra/Chain/Direct/Tx.hs b/hydra-node/src/Hydra/Chain/Direct/Tx.hs
@@ -160,9 +160,9 @@ mkInitialOutput networkId tokenPolicyId (verificationKeyHash -> pkh) =
 
 -- | Craft a commit transaction which includes the "committed" utxo as a datum.
 commitTx ::
+  NetworkId ->
   -- | Published Hydra scripts to reference.
   ScriptRegistry ->
-  NetworkId ->
   HeadId ->
   Party ->
   -- | A single UTxO to commit to the Head
@@ -172,7 +172,7 @@ commitTx ::
   -- locked by initial script
   (TxIn, TxOut CtxUTxO, Hash PaymentKey) ->
   Tx
-commitTx scriptRegistry networkId headId party utxo (initialInput, out, vkh) =
+commitTx networkId scriptRegistry headId party utxo (initialInput, out, vkh) =
   unsafeBuildTransaction $
     emptyTxBody
       & addInputs [(initialInput, initialWitness)]

diff --git a/hydra-node/test/Hydra/Chain/Direct/Contract/Commit.hs b/hydra-node/test/Hydra/Chain/Direct/Contract/Commit.hs
@@ -45,8 +45,8 @@ healthyCommitTx =
       <> registryUTxO scriptRegistry
   tx =
     commitTx
-      scriptRegistry
       Fixture.testNetworkId
+      scriptRegistry
       (mkHeadId Fixture.testPolicyId)
       commitParty
       (Just healthyCommittedUTxO)