Formatting

Author: nielstron

integration-test/test/test_mint.py

@@ -214,9 +214,7 @@ def test_mint_nft_with_script(self):
         builder.add_input_address(address)
 
         # Add minting script with an empty datum and a minting redeemer
-        builder.add_minting_script(
-            forty_two_script, redeemer=Redeemer(42)
-        )
+        builder.add_minting_script(forty_two_script, redeemer=Redeemer(42))
 
         # Set nft we want to mint
         builder.mint = my_nft

pycardano/plutus.py

@@ -710,9 +710,7 @@ class Redeemer(ArrayCBORSerializable):
     def from_primitive(cls: Type[Redeemer], values: list) -> Redeemer:
         if isinstance(values[2], CBORTag) and cls is Redeemer:
             values[2] = RawPlutusData.from_primitive(values[2])
-        redeemer = super(Redeemer, cls).from_primitive(
-            [values[2], values[3]]
-        )
+        redeemer = super(Redeemer, cls).from_primitive([values[2], values[3]])
         redeemer.tag = RedeemerTag.from_primitive(values[0])
         redeemer.index = values[1]
         return redeemer

pycardano/txbuilder.py

@@ -1126,6 +1126,9 @@ def _update_execution_units(
                 change_address, merge_change, collateral_change_address
             )
             for r in self.redeemers:
+                assert (
+                    r.tag is not None
+                ), "Expected tag of redeemer to be set, but found None"
                 key = f"{r.tag.name.lower()}:{r.index}"
                 if (
                     key not in estimated_execution_units

test/pycardano/test_plutus.py

@@ -54,7 +54,6 @@ class MyRedeemer(Redeemer):
     data: MyTest
 
 
-
 def test_plutus_data():
     """Ground truth of this test is generated by test/resources/haskell/PlutusData. See its README for more details."""
     key_hash = bytes.fromhex("c2ff616e11299d9094ce0a7eb5b7284b705147a822f4ffbd471f971a")

test/pycardano/test_txbuilder.py

@@ -455,12 +455,8 @@ def test_add_script_input(chain_context):
             script_address, Value(10000000, mint), datum_hash=datum.hash()
         ),
     )
-    redeemer1 = Redeemer(
-        PlutusData(), ExecutionUnits(1000000, 1000000)
-    )
-    redeemer2 = Redeemer(
-        PlutusData(), ExecutionUnits(5000000, 1000000)
-    )
+    redeemer1 = Redeemer(PlutusData(), ExecutionUnits(1000000, 1000000))
+    redeemer2 = Redeemer(PlutusData(), ExecutionUnits(5000000, 1000000))
     tx_builder.mint = mint
     tx_builder.add_script_input(utxo1, plutus_script, datum, redeemer1)
     tx_builder.add_minting_script(plutus_script, redeemer2)
@@ -490,9 +486,7 @@ def test_add_script_input_no_script(chain_context):
             script_address, 10000000, datum_hash=datum.hash(), script=plutus_script
         ),
     )
-    redeemer = Redeemer(
-        PlutusData(), ExecutionUnits(1000000, 1000000)
-    )
+    redeemer = Redeemer(PlutusData(), ExecutionUnits(1000000, 1000000))
     tx_builder.add_script_input(utxo1, datum=datum, redeemer=redeemer)
     receiver = Address.from_primitive(
         "addr_test1vrm9x2zsux7va6w892g38tvchnzahvcd9tykqf3ygnmwtaqyfg52x"
@@ -534,9 +528,7 @@ def test_add_script_input_find_script(chain_context):
 
         mock_utxos.return_value = original_utxos + [existing_script_utxo]
 
-        redeemer = Redeemer(
-            PlutusData(), ExecutionUnits(1000000, 1000000)
-        )
+        redeemer = Redeemer(PlutusData(), ExecutionUnits(1000000, 1000000))
         tx_builder.add_script_input(utxo1, datum=datum, redeemer=redeemer)
         receiver = Address.from_primitive(
             "addr_test1vrm9x2zsux7va6w892g38tvchnzahvcd9tykqf3ygnmwtaqyfg52x"
@@ -573,9 +565,7 @@ def test_add_script_input_with_script_from_specified_utxo(chain_context):
         TransactionOutput(script_address, 1234567, script=plutus_script),
     )
 
-    redeemer = Redeemer(
-        PlutusData(), ExecutionUnits(1000000, 1000000)
-    )
+    redeemer = Redeemer(PlutusData(), ExecutionUnits(1000000, 1000000))
     tx_builder.add_script_input(
         utxo1, script=existing_script_utxo, datum=datum, redeemer=redeemer
     )
@@ -609,9 +599,7 @@ def test_add_minting_script_from_specified_utxo(chain_context):
 
     mint = MultiAsset.from_primitive({script_hash.payload: {b"TestToken": 1}})
 
-    redeemer = Redeemer(
-        PlutusData(), ExecutionUnits(1000000, 1000000)
-    )
+    redeemer = Redeemer(PlutusData(), ExecutionUnits(1000000, 1000000))
     tx_builder.add_minting_script(existing_script_utxo, redeemer=redeemer)
     receiver = Address.from_primitive(
         "addr_test1vrm9x2zsux7va6w892g38tvchnzahvcd9tykqf3ygnmwtaqyfg52x"
@@ -662,9 +650,7 @@ def test_collateral_return(chain_context):
 
         mock_utxos.return_value = original_utxos + [existing_script_utxo]
 
-        redeemer = Redeemer(
-            PlutusData(), ExecutionUnits(1000000, 1000000)
-        )
+        redeemer = Redeemer(PlutusData(), ExecutionUnits(1000000, 1000000))
         tx_builder.add_script_input(utxo1, datum=datum, redeemer=redeemer)
         receiver = Address.from_primitive(
             "addr_test1vrm9x2zsux7va6w892g38tvchnzahvcd9tykqf3ygnmwtaqyfg52x"
@@ -702,9 +688,7 @@ def test_wrong_redeemer_execution_units(chain_context):
     )
     redeemer1 = Redeemer(PlutusData())
     redeemer2 = Redeemer(PlutusData())
-    redeemer3 = Redeemer(
-        PlutusData(), ExecutionUnits(1000000, 1000000)
-    )
+    redeemer3 = Redeemer(PlutusData(), ExecutionUnits(1000000, 1000000))
     tx_builder.mint = mint
     tx_builder.add_script_input(utxo1, plutus_script, datum, redeemer1)
     tx_builder.add_minting_script(plutus_script, redeemer2)
@@ -728,9 +712,7 @@ def test_all_redeemer_should_provide_execution_units(chain_context):
         tx_in1, TransactionOutput(script_address, 10000000, datum_hash=datum.hash())
     )
     mint = MultiAsset.from_primitive({script_hash.payload: {b"TestToken": 1}})
-    redeemer1 = Redeemer(
-        PlutusData(), ExecutionUnits(1000000, 1000000)
-    )
+    redeemer1 = Redeemer(PlutusData(), ExecutionUnits(1000000, 1000000))
     redeemer2 = Redeemer(PlutusData())
     tx_builder.mint = mint
     tx_builder.add_script_input(utxo1, plutus_script, datum, redeemer1)
@@ -748,9 +730,7 @@ def test_add_minting_script(chain_context):
     script_address = Address(script_hash)
     utxo1 = UTxO(tx_in1, TransactionOutput(script_address, 10000000))
     mint = MultiAsset.from_primitive({script_hash.payload: {b"TestToken": 1}})
-    redeemer1 = Redeemer(
-        PlutusData(), ExecutionUnits(1000000, 1000000)
-    )
+    redeemer1 = Redeemer(PlutusData(), ExecutionUnits(1000000, 1000000))
     tx_builder.mint = mint
     tx_builder.add_input(utxo1)
     tx_builder.add_minting_script(plutus_script, redeemer1)
@@ -766,9 +746,7 @@ def test_add_minting_script(chain_context):
 def test_add_minting_script_wrong_redeemer_type(chain_context):
     tx_builder = TransactionBuilder(chain_context)
     plutus_script = PlutusV1Script(b"dummy test script")
-    redeemer1 = Redeemer(
-        PlutusData(), ExecutionUnits(1000000, 1000000)
-    )
+    redeemer1 = Redeemer(PlutusData(), ExecutionUnits(1000000, 1000000))
     redeemer1.tag = RedeemerTag.SPEND
 
     with pytest.raises(InvalidArgumentException):