@@ -117,18 +117,6 @@ def NestedTupleContractWithDecodeTuples(w3, NESTED_TUPLE_CONTRACT_DECODE_TUPLES)
117
117
return w3 .eth .contract (** NESTED_TUPLE_CONTRACT_DECODE_TUPLES )
118
118
119
119
120
- @pytest .fixture ()
121
- def AsyncNestedTupleContract (async_w3 , NESTED_TUPLE_CONTRACT ):
122
- return async_w3 .eth .contract (** NESTED_TUPLE_CONTRACT )
123
-
124
-
125
- @pytest .fixture ()
126
- def AsyncNestedTupleContractWithDecodeTuples (
127
- async_w3 , NESTED_TUPLE_CONTRACT_DECODE_TUPLES
128
- ):
129
- return async_w3 .eth .contract (** NESTED_TUPLE_CONTRACT_DECODE_TUPLES )
130
-
131
-
132
120
CONTRACT_TUPLE_SOURCE = """
133
121
pragma solidity >=0.4.19 <0.6.0;
134
122
pragma experimental ABIEncoderV2;
@@ -178,11 +166,6 @@ def TupleContract(w3, TUPLE_CONTRACT):
178
166
return w3 .eth .contract (** TUPLE_CONTRACT )
179
167
180
168
181
- @pytest .fixture ()
182
- def AsyncTupleContract (async_w3 , TUPLE_CONTRACT ):
183
- return async_w3 .eth .contract (** TUPLE_CONTRACT )
184
-
185
-
186
169
@pytest .fixture ()
187
170
def TUPLE_CONTRACT_DECODE_TUPLES (TUPLE_CODE , TUPLE_RUNTIME , TUPLE_ABI ):
188
171
return {
@@ -198,11 +181,6 @@ def TupleContractWithDecodeTuples(w3, TUPLE_CONTRACT_DECODE_TUPLES):
198
181
return w3 .eth .contract (** TUPLE_CONTRACT_DECODE_TUPLES )
199
182
200
183
201
- @pytest .fixture ()
202
- def AsyncTupleContractWithDecodeTuples (async_w3 , TUPLE_CONTRACT_DECODE_TUPLES ):
203
- return async_w3 .eth .contract (** TUPLE_CONTRACT_DECODE_TUPLES )
204
-
205
-
206
184
CONTRACT_CODE = "0x606060405261022e806100126000396000f360606040523615610074576000357c01000000000000000000000000000000000000000000000000000000009004806316216f391461007657806361bc221a146100995780637cf5dab0146100bc578063a5f3c23b146100e8578063d09de08a1461011d578063dcf537b11461014057610074565b005b610083600480505061016c565b6040518082815260200191505060405180910390f35b6100a6600480505061017f565b6040518082815260200191505060405180910390f35b6100d26004808035906020019091905050610188565b6040518082815260200191505060405180910390f35b61010760048080359060200190919080359060200190919050506101ea565b6040518082815260200191505060405180910390f35b61012a6004805050610201565b6040518082815260200191505060405180910390f35b6101566004808035906020019091905050610217565b6040518082815260200191505060405180910390f35b6000600d9050805080905061017c565b90565b60006000505481565b6000816000600082828250540192505081905550600060005054905080507f3496c3ede4ec3ab3686712aa1c238593ea6a42df83f98a5ec7df9834cfa577c5816040518082815260200191505060405180910390a18090506101e5565b919050565b6000818301905080508090506101fb565b92915050565b600061020d6001610188565b9050610214565b90565b60006007820290508050809050610229565b91905056" # noqa: E501
207
185
CONTRACT_RUNTIME = "0x60606040523615610074576000357c01000000000000000000000000000000000000000000000000000000009004806316216f391461007657806361bc221a146100995780637cf5dab0146100bc578063a5f3c23b146100e8578063d09de08a1461011d578063dcf537b11461014057610074565b005b610083600480505061016c565b6040518082815260200191505060405180910390f35b6100a6600480505061017f565b6040518082815260200191505060405180910390f35b6100d26004808035906020019091905050610188565b6040518082815260200191505060405180910390f35b61010760048080359060200190919080359060200190919050506101ea565b6040518082815260200191505060405180910390f35b61012a6004805050610201565b6040518082815260200191505060405180910390f35b6101566004808035906020019091905050610217565b6040518082815260200191505060405180910390f35b6000600d9050805080905061017c565b90565b60006000505481565b6000816000600082828250540192505081905550600060005054905080507f3496c3ede4ec3ab3686712aa1c238593ea6a42df83f98a5ec7df9834cfa577c5816040518082815260200191505060405180910390a18090506101e5565b919050565b6000818301905080508090506101fb565b92915050565b600061020d6001610188565b9050610214565b90565b60006007820290508050809050610229565b91905056" # noqa: E501
208
186
CONTRACT_ABI = json .loads (
@@ -1218,11 +1196,23 @@ def AsyncNestedTupleContract(async_w3, NESTED_TUPLE_CONTRACT):
1218
1196
return async_w3 .eth .contract (** NESTED_TUPLE_CONTRACT )
1219
1197
1220
1198
1199
+ @pytest .fixture ()
1200
+ def AsyncNestedTupleContractWithDecodeTuples (
1201
+ async_w3 , NESTED_TUPLE_CONTRACT_DECODE_TUPLES
1202
+ ):
1203
+ return async_w3 .eth .contract (** NESTED_TUPLE_CONTRACT_DECODE_TUPLES )
1204
+
1205
+
1221
1206
@pytest .fixture ()
1222
1207
def AsyncTupleContract (async_w3 , TUPLE_CONTRACT ):
1223
1208
return async_w3 .eth .contract (** TUPLE_CONTRACT )
1224
1209
1225
1210
1211
+ @pytest .fixture ()
1212
+ def AsyncTupleContractWithDecodeTuples (async_w3 , TUPLE_CONTRACT_DECODE_TUPLES ):
1213
+ return async_w3 .eth .contract (** TUPLE_CONTRACT_DECODE_TUPLES )
1214
+
1215
+
1226
1216
@pytest .fixture ()
1227
1217
def AsyncMathContract (async_w3 , MATH_ABI , MATH_CODE , MATH_RUNTIME ):
1228
1218
return async_w3 .eth .contract (
0 commit comments