From cecd59bca228c0d52302a7699fc7aa8462acd2e9 Mon Sep 17 00:00:00 2001 From: brendanrbrown Date: Tue, 7 Nov 2023 14:08:01 -0500 Subject: [PATCH 1/2] put n shelley/byron key witnesses arguments in correct order --- cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs index 8d74b09651..30c3188be6 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs @@ -969,7 +969,7 @@ runTransactionCalculateMinFeeCmd (protocolParamTxFeePerByte pparams) tx nInputs nOutputs - nByronKeyWitnesses nShelleyKeyWitnesses + nShelleyKeyWitnesses nByronKeyWitnesses liftIO $ putStrLn $ (show fee :: String) <> " Lovelace" From 21f93202be679ccb4605b6a7b25705803b93c3e7 Mon Sep 17 00:00:00 2001 From: brendanrbrown Date: Tue, 7 Nov 2023 15:14:04 -0500 Subject: [PATCH 2/2] swap arguments in golden test --- .../Test/Golden/Shelley/Transaction/CalculateMinFee.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/CalculateMinFee.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/CalculateMinFee.hs index 220da1a6f9..51e3eb5d86 100644 --- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/CalculateMinFee.hs +++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Transaction/CalculateMinFee.hs @@ -19,11 +19,11 @@ hprop_golden_shelley_transaction_calculate_min_fee = propertyOnce $ do [ "transaction","calculate-min-fee" , "--tx-in-count", "32" , "--tx-out-count", "27" - , "--byron-witness-count", "5" - , "--witness-count", "10" + , "--byron-witness-count", "10" + , "--witness-count", "5" , "--testnet-magic", "4036000900" , "--protocol-params-file", protocolParamsJsonFile , "--tx-body-file", txBodyFile ] - H.diff minFeeTxt (==) "5083100 Lovelace\n" \ No newline at end of file + H.diff minFeeTxt (==) "5083100 Lovelace\n"