@@ -42,7 +42,18 @@ func NewRandomTest(
42
42
return nil , err
43
43
}
44
44
45
- _ , tx , contract , err := contracts .DeployEVMLoadSimulator (txOpts , worker .Client )
45
+ _ , tx , simulatorContract , err := contracts .DeployEVMLoadSimulator (txOpts , worker .Client )
46
+ if err != nil {
47
+ return nil , err
48
+ }
49
+
50
+ if _ , err := bind .WaitDeployed (ctx , worker .Client , tx ); err != nil {
51
+ return nil , err
52
+ }
53
+
54
+ worker .Nonce ++
55
+
56
+ _ , tx , trieContract , err := contracts .DeployTrieStressTest (txOpts , worker .Client )
46
57
if err != nil {
47
58
return nil , err
48
59
}
@@ -74,66 +85,73 @@ func NewRandomTest(
74
85
},
75
86
{
76
87
Test : ReadTest {
77
- Contract : contract ,
88
+ Contract : simulatorContract ,
78
89
Count : count ,
79
90
},
80
91
Weight : weight ,
81
92
},
82
93
{
83
94
Test : WriteTest {
84
- Contract : contract ,
95
+ Contract : simulatorContract ,
85
96
Count : count ,
86
97
},
87
98
Weight : weight ,
88
99
},
89
100
{
90
101
Test : StateModificationTest {
91
- Contract : contract ,
102
+ Contract : simulatorContract ,
92
103
Count : count ,
93
104
},
94
105
Weight : weight ,
95
106
},
96
107
{
97
108
Test : HashingTest {
98
- Contract : contract ,
109
+ Contract : simulatorContract ,
99
110
Count : count ,
100
111
},
101
112
Weight : weight ,
102
113
},
103
114
{
104
115
Test : MemoryTest {
105
- Contract : contract ,
116
+ Contract : simulatorContract ,
106
117
Count : count ,
107
118
},
108
119
Weight : weight ,
109
120
},
110
121
{
111
122
Test : CallDepthTest {
112
- Contract : contract ,
123
+ Contract : simulatorContract ,
113
124
Count : count ,
114
125
},
115
126
Weight : weight ,
116
127
},
117
128
{
118
- Test : ContractCreationTest {Contract : contract },
129
+ Test : ContractCreationTest {Contract : simulatorContract },
119
130
Weight : weight ,
120
131
},
121
132
{
122
133
Test : PureComputeTest {
123
- Contract : contract ,
134
+ Contract : simulatorContract ,
124
135
NumIterations : count ,
125
136
},
126
137
Weight : weight ,
127
138
},
128
139
{
129
140
Test : LargeEventTest {
130
- Contract : contract ,
141
+ Contract : simulatorContract ,
131
142
NumEvents : count ,
132
143
},
133
144
Weight : weight ,
134
145
},
135
146
{
136
- Test : ExternalCallTest {Contract : contract },
147
+ Test : ExternalCallTest {Contract : simulatorContract },
148
+ Weight : weight ,
149
+ },
150
+ {
151
+ Test : TrieStressTest {
152
+ Contract : trieContract ,
153
+ NumValues : count ,
154
+ },
137
155
Weight : weight ,
138
156
},
139
157
}
@@ -383,6 +401,21 @@ func (e ExternalCallTest) Run(
383
401
executeContractTx (tc , ctx , wallet , e .Contract .SimulateExternalCall )
384
402
}
385
403
404
+ type TrieStressTest struct {
405
+ Contract * contracts.TrieStressTest
406
+ NumValues * big.Int
407
+ }
408
+
409
+ func (t TrieStressTest ) Run (
410
+ tc tests.TestContext ,
411
+ ctx context.Context ,
412
+ wallet * Wallet ,
413
+ ) {
414
+ executeContractTx (tc , ctx , wallet , func (txOpts * bind.TransactOpts ) (* types.Transaction , error ) {
415
+ return t .Contract .WriteValues (txOpts , t .NumValues )
416
+ })
417
+ }
418
+
386
419
func executeContractTx (
387
420
tc tests.TestContext ,
388
421
ctx context.Context ,
0 commit comments