cleanup

Author: pacrob

tests/frontier/opcodes/test_calldataload.py

@@ -82,11 +82,9 @@ def test_calldataload(
     tx = Transaction(
         data=calldata,
         gas_limit=100_000,
-        gas_price=0x0A,
         protected=fork >= Byzantium,
         sender=pre.fund_eoa(),
         to=to,
-        value=0x01,
     )
     post = {
         address_a: Account(storage={0x00: expected_storage}),

tests/frontier/opcodes/test_calldatasize.py

@@ -10,26 +10,26 @@
 @pytest.mark.parametrize(
     "args_size,sha3_len,storage",
     [
-        ("0002", "01", Account(storage={0x00: 0x02})),
-        ("0011", "01", Account(storage={0x00: 0x11})),
-        ("0021", "01", Account(storage={0x00: 0x21})),
-        ("0031", "01", Account(storage={0x00: 0x31})),
-        ("0101", "01", Account(storage={0x00: 0x101})),
-        ("0002", "02", Account(storage={0x00: 0x02})),
-        ("0011", "02", Account(storage={0x00: 0x11})),
-        ("0021", "02", Account(storage={0x00: 0x21})),
-        ("0031", "02", Account(storage={0x00: 0x31})),
-        ("0101", "02", Account(storage={0x00: 0x101})),
-        ("0002", "03", Account(storage={0x00: 0x02})),
-        ("0011", "03", Account(storage={0x00: 0x11})),
-        ("0021", "03", Account(storage={0x00: 0x21})),
-        ("0031", "03", Account(storage={0x00: 0x31})),
-        ("0101", "03", Account(storage={0x00: 0x101})),
-        ("0002", "04", Account(storage={0x00: 0x02})),
-        ("0011", "04", Account(storage={0x00: 0x11})),
-        ("0021", "04", Account(storage={0x00: 0x21})),
-        ("0031", "04", Account(storage={0x00: 0x31})),
-        ("0101", "04", Account(storage={0x00: 0x101})),
+        ("0002", "01", 0x02),
+        ("0011", "01", 0x11),
+        ("0021", "01", 0x21),
+        ("0031", "01", 0x31),
+        ("0101", "01", 0x101),
+        ("0002", "02", 0x02),
+        ("0011", "02", 0x11),
+        ("0021", "02", 0x21),
+        ("0031", "02", 0x31),
+        ("0101", "02", 0x101),
+        ("0002", "03", 0x02),
+        ("0011", "03", 0x11),
+        ("0021", "03", 0x21),
+        ("0031", "03", 0x31),
+        ("0101", "03", 0x101),
+        ("0002", "04", 0x02),
+        ("0011", "04", 0x11),
+        ("0021", "04", 0x21),
+        ("0031", "04", 0x31),
+        ("0101", "04", 0x101),
     ],
     ids=[
         "data1_2",
@@ -88,11 +88,9 @@ def test_calldataload(
     tx = Transaction(
         data=tx_data,
         gas_limit=100_000,
-        gas_price=0x0A,
         protected=fork >= Byzantium,
         sender=pre.fund_eoa(),
         to=to,
-        value=0x01,
     )
-    post = {address: storage}
+    post = {address: Account(storage={0x00: storage})}
     state_test(pre=pre, post=post, tx=tx)