Skip to content

Commit 7770fc8

Browse files
gzliudangzliudan
committed
accounts: run tests in parallel (ethereum#28544)
1 parent 77ed181 commit 7770fc8

19 files changed

+174
-45
lines changed

‎accounts/abi/abi_test.go

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ var methods = map[string]Method{
120120
}
121121

122122
func TestReader(t *testing.T) {
123+
t.Parallel()
123124
abi := ABI{
124125
Methods: methods,
125126
}
@@ -151,6 +152,7 @@ func TestReader(t *testing.T) {
151152
}
152153

153154
func TestInvalidABI(t *testing.T) {
155+
t.Parallel()
154156
json := `[{ "type" : "function", "name" : "", "constant" : fals }]`
155157
_, err := JSON(strings.NewReader(json))
156158
if err == nil {
@@ -170,6 +172,7 @@ func TestInvalidABI(t *testing.T) {
170172
// constructor(uint256 a, uint256 b) public{}
171173
// }
172174
func TestConstructor(t *testing.T) {
175+
t.Parallel()
173176
json := `[{ "inputs": [{"internalType": "uint256","name": "a","type": "uint256" },{ "internalType": "uint256","name": "b","type": "uint256"}],"stateMutability": "nonpayable","type": "constructor"}]`
174177
method := NewMethod("", "", Constructor, "nonpayable", false, false, []Argument{{"a", Uint256, false}, {"b", Uint256, false}}, nil)
175178
// Test from JSON
@@ -199,6 +202,7 @@ func TestConstructor(t *testing.T) {
199202
}
200203

201204
func TestTestNumbers(t *testing.T) {
205+
t.Parallel()
202206
abi, err := JSON(strings.NewReader(jsondata))
203207
if err != nil {
204208
t.Fatal(err)
@@ -236,6 +240,7 @@ func TestTestNumbers(t *testing.T) {
236240
}
237241

238242
func TestMethodSignature(t *testing.T) {
243+
t.Parallel()
239244
m := NewMethod("foo", "foo", Function, "", false, false, []Argument{{"bar", String, false}, {"baz", String, false}}, nil)
240245
exp := "foo(string,string)"
241246
if m.Sig != exp {
@@ -274,6 +279,7 @@ func TestMethodSignature(t *testing.T) {
274279
}
275280

276281
func TestOverloadedMethodSignature(t *testing.T) {
282+
t.Parallel()
277283
json := `[{"constant":true,"inputs":[{"name":"i","type":"uint256"},{"name":"j","type":"uint256"}],"name":"foo","outputs":[],"payable":false,"stateMutability":"pure","type":"function"},{"constant":true,"inputs":[{"name":"i","type":"uint256"}],"name":"foo","outputs":[],"payable":false,"stateMutability":"pure","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"i","type":"uint256"}],"name":"bar","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"i","type":"uint256"},{"indexed":false,"name":"j","type":"uint256"}],"name":"bar","type":"event"}]`
278284
abi, err := JSON(strings.NewReader(json))
279285
if err != nil {
@@ -297,6 +303,7 @@ func TestOverloadedMethodSignature(t *testing.T) {
297303
}
298304

299305
func TestCustomErrors(t *testing.T) {
306+
t.Parallel()
300307
json := `[{ "inputs": [ { "internalType": "uint256", "name": "", "type": "uint256" } ],"name": "MyError", "type": "error"} ]`
301308
abi, err := JSON(strings.NewReader(json))
302309
if err != nil {
@@ -311,6 +318,7 @@ func TestCustomErrors(t *testing.T) {
311318
}
312319

313320
func TestMultiPack(t *testing.T) {
321+
t.Parallel()
314322
abi, err := JSON(strings.NewReader(jsondata))
315323
if err != nil {
316324
t.Fatal(err)
@@ -349,6 +357,7 @@ func ExampleJSON() {
349357
}
350358

351359
func TestInputVariableInputLength(t *testing.T) {
360+
t.Parallel()
352361
const definition = `[
353362
{ "type" : "function", "name" : "strOne", "constant" : true, "inputs" : [ { "name" : "str", "type" : "string" } ] },
354363
{ "type" : "function", "name" : "bytesOne", "constant" : true, "inputs" : [ { "name" : "str", "type" : "bytes" } ] },
@@ -477,6 +486,7 @@ func TestInputVariableInputLength(t *testing.T) {
477486
}
478487

479488
func TestInputFixedArrayAndVariableInputLength(t *testing.T) {
489+
t.Parallel()
480490
abi, err := JSON(strings.NewReader(jsondata))
481491
if err != nil {
482492
t.Error(err)
@@ -651,6 +661,7 @@ func TestInputFixedArrayAndVariableInputLength(t *testing.T) {
651661
}
652662

653663
func TestDefaultFunctionParsing(t *testing.T) {
664+
t.Parallel()
654665
const definition = `[{ "name" : "balance", "type" : "function" }]`
655666

656667
abi, err := JSON(strings.NewReader(definition))
@@ -664,6 +675,7 @@ func TestDefaultFunctionParsing(t *testing.T) {
664675
}
665676

666677
func TestBareEvents(t *testing.T) {
678+
t.Parallel()
667679
const definition = `[
668680
{ "type" : "event", "name" : "balance" },
669681
{ "type" : "event", "name" : "anon", "anonymous" : true},
@@ -740,6 +752,7 @@ func TestBareEvents(t *testing.T) {
740752
//
741753
// receipt{status=1 cgas=23949 bloom=00000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000040200000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 logs=[log: b6818c8064f645cd82d99b59a1a267d6d61117ef [75fd880d39c1daf53b6547ab6cb59451fc6452d27caa90e5b6649dd8293b9eed] 000000000000000000000000376c47978271565f56deb45495afa69e59c16ab200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000158 9ae378b6d4409eada347a5dc0c180f186cb62dc68fcc0f043425eb917335aa28 0 95d429d309bb9d753954195fe2d69bd140b4ae731b9b5b605c34323de162cf00 0]}
742754
func TestUnpackEvent(t *testing.T) {
755+
t.Parallel()
743756
const abiJSON = `[{"constant":false,"inputs":[{"name":"memo","type":"bytes"}],"name":"receive","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"sender","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"memo","type":"bytes"}],"name":"received","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"sender","type":"address"}],"name":"receivedAddr","type":"event"}]`
744757
abi, err := JSON(strings.NewReader(abiJSON))
745758
if err != nil {
@@ -778,6 +791,7 @@ func TestUnpackEvent(t *testing.T) {
778791
}
779792

780793
func TestUnpackEventIntoMap(t *testing.T) {
794+
t.Parallel()
781795
const abiJSON = `[{"constant":false,"inputs":[{"name":"memo","type":"bytes"}],"name":"receive","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"sender","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"memo","type":"bytes"}],"name":"received","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"sender","type":"address"}],"name":"receivedAddr","type":"event"}]`
782796
abi, err := JSON(strings.NewReader(abiJSON))
783797
if err != nil {
@@ -828,6 +842,7 @@ func TestUnpackEventIntoMap(t *testing.T) {
828842
}
829843

830844
func TestUnpackMethodIntoMap(t *testing.T) {
845+
t.Parallel()
831846
const abiJSON = `[{"constant":false,"inputs":[{"name":"memo","type":"bytes"}],"name":"receive","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[],"name":"send","outputs":[{"name":"amount","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"name":"addr","type":"address"}],"name":"get","outputs":[{"name":"hash","type":"bytes"}],"payable":true,"stateMutability":"payable","type":"function"}]`
832847
abi, err := JSON(strings.NewReader(abiJSON))
833848
if err != nil {
@@ -878,6 +893,7 @@ func TestUnpackMethodIntoMap(t *testing.T) {
878893
}
879894

880895
func TestUnpackIntoMapNamingConflict(t *testing.T) {
896+
t.Parallel()
881897
// Two methods have the same name
882898
var abiJSON = `[{"constant":false,"inputs":[{"name":"memo","type":"bytes"}],"name":"get","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[],"name":"send","outputs":[{"name":"amount","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"name":"addr","type":"address"}],"name":"get","outputs":[{"name":"hash","type":"bytes"}],"payable":true,"stateMutability":"payable","type":"function"}]`
883899
abi, err := JSON(strings.NewReader(abiJSON))
@@ -961,6 +977,7 @@ func TestUnpackIntoMapNamingConflict(t *testing.T) {
961977
}
962978

963979
func TestABI_MethodById(t *testing.T) {
980+
t.Parallel()
964981
abi, err := JSON(strings.NewReader(jsondata))
965982
if err != nil {
966983
t.Fatal(err)
@@ -993,6 +1010,7 @@ func TestABI_MethodById(t *testing.T) {
9931010
}
9941011

9951012
func TestABI_EventById(t *testing.T) {
1013+
t.Parallel()
9961014
tests := []struct {
9971015
name string
9981016
json string
@@ -1059,6 +1077,7 @@ func TestABI_EventById(t *testing.T) {
10591077
}
10601078

10611079
func TestABI_ErrorByID(t *testing.T) {
1080+
t.Parallel()
10621081
abi, err := JSON(strings.NewReader(`[
10631082
{"inputs":[{"internalType":"uint256","name":"x","type":"uint256"}],"name":"MyError1","type":"error"},
10641083
{"inputs":[{"components":[{"internalType":"uint256","name":"a","type":"uint256"},{"internalType":"string","name":"b","type":"string"},{"internalType":"address","name":"c","type":"address"}],"internalType":"struct MyError.MyStruct","name":"x","type":"tuple"},{"internalType":"address","name":"y","type":"address"},{"components":[{"internalType":"uint256","name":"a","type":"uint256"},{"internalType":"string","name":"b","type":"string"},{"internalType":"address","name":"c","type":"address"}],"internalType":"struct MyError.MyStruct","name":"z","type":"tuple"}],"name":"MyError2","type":"error"},
@@ -1089,6 +1108,7 @@ func TestABI_ErrorByID(t *testing.T) {
10891108
// TestDoubleDuplicateMethodNames checks that if transfer0 already exists, there won't be a name
10901109
// conflict and that the second transfer method will be renamed transfer1.
10911110
func TestDoubleDuplicateMethodNames(t *testing.T) {
1111+
t.Parallel()
10921112
abiJSON := `[{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transfer","outputs":[{"name":"ok","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"value","type":"uint256"},{"name":"data","type":"bytes"}],"name":"transfer0","outputs":[{"name":"ok","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"value","type":"uint256"},{"name":"data","type":"bytes"},{"name":"customFallback","type":"string"}],"name":"transfer","outputs":[{"name":"ok","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"}]`
10931113
contractAbi, err := JSON(strings.NewReader(abiJSON))
10941114
if err != nil {
@@ -1118,6 +1138,7 @@ func TestDoubleDuplicateMethodNames(t *testing.T) {
11181138
// event send();
11191139
// }
11201140
func TestDoubleDuplicateEventNames(t *testing.T) {
1141+
t.Parallel()
11211142
abiJSON := `[{"anonymous": false,"inputs": [{"indexed": false,"internalType": "uint256","name": "a","type": "uint256"}],"name": "send","type": "event"},{"anonymous": false,"inputs": [],"name": "send0","type": "event"},{ "anonymous": false, "inputs": [],"name": "send","type": "event"}]`
11221143
contractAbi, err := JSON(strings.NewReader(abiJSON))
11231144
if err != nil {
@@ -1145,6 +1166,7 @@ func TestDoubleDuplicateEventNames(t *testing.T) {
11451166
// event send(uint256, uint256);
11461167
// }
11471168
func TestUnnamedEventParam(t *testing.T) {
1169+
t.Parallel()
11481170
abiJSON := `[{ "anonymous": false, "inputs": [{ "indexed": false,"internalType": "uint256", "name": "","type": "uint256"},{"indexed": false,"internalType": "uint256","name": "","type": "uint256"}],"name": "send","type": "event"}]`
11491171
contractAbi, err := JSON(strings.NewReader(abiJSON))
11501172
if err != nil {
@@ -1178,7 +1200,9 @@ func TestUnpackRevert(t *testing.T) {
11781200
{"4e487b7100000000000000000000000000000000000000000000000000000000000000ff", "unknown panic code: 0xff", nil},
11791201
}
11801202
for index, c := range cases {
1203+
index, c := index, c
11811204
t.Run(fmt.Sprintf("case %d", index), func(t *testing.T) {
1205+
t.Parallel()
11821206
got, err := UnpackRevert(common.Hex2Bytes(c.input))
11831207
if c.expectErr != nil {
11841208
if err == nil {

‎accounts/abi/abifuzzer_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
// TestReplicate can be used to replicate crashers from the fuzzing tests.
2929
// Just replace testString with the data in .quoted
3030
func TestReplicate(t *testing.T) {
31+
t.Parallel()
3132
//t.Skip("Test only useful for reproducing issues")
3233
fuzzAbi([]byte("\x20\x20\x20\x20\x20\x20\x20\x20\x80\x00\x00\x00\x20\x20\x20\x20\x00"))
3334
//fuzzAbi([]byte("asdfasdfkadsf;lasdf;lasd;lfk"))

0 commit comments

Comments
 (0)