Skip to content

Commit b45b79a

Browse files
ARR4Nqdm12
ARR4N
authored and
qdm12
committed
refactor: use upstream core/types
Complete the transition of `core/types` to upstream code. Note that the previous commit results in _all_ upstream types / vars / consts being in the `imports.go` file. This results in a strict partition of upstream and local identifiers so it is safe to simply change import paths. 1. Globally change all imports from `subnet-evm/core/types` to `libevm/core/types`; 2. Rename all `subnet-evm/core/types` imports to `customtypes` for ease of review here; 3. Dot import `libevm/core/types` in tests only to avoid hundreds of noisy changes. See original PR ava-labs/coreth#875
1 parent f5364a1 commit b45b79a

File tree

195 files changed

+421
-485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+421
-485
lines changed

‎accounts/abi/bind/auth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ import (
3737
"github.com/ava-labs/libevm/accounts/external"
3838
"github.com/ava-labs/libevm/accounts/keystore"
3939
"github.com/ava-labs/libevm/common"
40+
"github.com/ava-labs/libevm/core/types"
4041
"github.com/ava-labs/libevm/crypto"
4142
"github.com/ava-labs/libevm/log"
42-
"github.com/ava-labs/subnet-evm/core/types"
4343
)
4444

4545
// ErrNoChainID is returned whenever the user failed to specify a chain id.

‎accounts/abi/bind/backend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"math/big"
3333

3434
"github.com/ava-labs/libevm/common"
35-
"github.com/ava-labs/subnet-evm/core/types"
35+
"github.com/ava-labs/libevm/core/types"
3636
"github.com/ava-labs/subnet-evm/interfaces"
3737
)
3838

‎accounts/abi/bind/backends/simulated.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"context"
3131

3232
"github.com/ava-labs/libevm/common"
33+
"github.com/ava-labs/libevm/core/types"
3334
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
34-
"github.com/ava-labs/subnet-evm/core/types"
3535
"github.com/ava-labs/subnet-evm/ethclient/simulated"
3636
"github.com/ava-labs/subnet-evm/interfaces"
3737
)

‎accounts/abi/bind/base.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ import (
3535
"sync"
3636

3737
"github.com/ava-labs/libevm/common"
38+
"github.com/ava-labs/libevm/core/types"
3839
"github.com/ava-labs/libevm/crypto"
3940
"github.com/ava-labs/libevm/event"
4041
"github.com/ava-labs/subnet-evm/accounts/abi"
41-
"github.com/ava-labs/subnet-evm/core/types"
4242
"github.com/ava-labs/subnet-evm/interfaces"
4343
"github.com/ava-labs/subnet-evm/rpc"
4444
)

‎accounts/abi/bind/base_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ import (
3636

3737
"github.com/ava-labs/libevm/common"
3838
"github.com/ava-labs/libevm/common/hexutil"
39+
"github.com/ava-labs/libevm/core/types"
3940
"github.com/ava-labs/libevm/crypto"
4041
"github.com/ava-labs/libevm/rlp"
4142
"github.com/ava-labs/subnet-evm/accounts/abi"
4243
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
43-
"github.com/ava-labs/subnet-evm/core/types"
4444
"github.com/ava-labs/subnet-evm/interfaces"
4545
"github.com/stretchr/testify/assert"
4646
)

‎accounts/abi/bind/bind_test.go

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ var bindTests = []struct {
299299
300300
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
301301
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
302-
"github.com/ava-labs/subnet-evm/core/types"
302+
"github.com/ava-labs/libevm/core/types"
303303
"github.com/ava-labs/libevm/crypto"
304304
`,
305305
`
@@ -355,7 +355,7 @@ var bindTests = []struct {
355355
356356
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
357357
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
358-
"github.com/ava-labs/subnet-evm/core/types"
358+
"github.com/ava-labs/libevm/core/types"
359359
"github.com/ava-labs/libevm/crypto"
360360
`,
361361
`
@@ -401,7 +401,7 @@ var bindTests = []struct {
401401
402402
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
403403
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
404-
"github.com/ava-labs/subnet-evm/core/types"
404+
"github.com/ava-labs/libevm/core/types"
405405
"github.com/ava-labs/libevm/crypto"
406406
`,
407407
`
@@ -459,7 +459,7 @@ var bindTests = []struct {
459459
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
460460
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
461461
"github.com/ava-labs/libevm/common"
462-
"github.com/ava-labs/subnet-evm/core/types"
462+
"github.com/ava-labs/libevm/core/types"
463463
"github.com/ava-labs/libevm/crypto"
464464
`,
465465
`
@@ -507,7 +507,7 @@ var bindTests = []struct {
507507
508508
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
509509
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
510-
"github.com/ava-labs/subnet-evm/core/types"
510+
"github.com/ava-labs/libevm/core/types"
511511
"github.com/ava-labs/libevm/crypto"
512512
`,
513513
`
@@ -574,7 +574,7 @@ var bindTests = []struct {
574574
575575
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
576576
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
577-
"github.com/ava-labs/subnet-evm/core/types"
577+
"github.com/ava-labs/libevm/core/types"
578578
"github.com/ava-labs/libevm/crypto"
579579
`,
580580
`
@@ -620,7 +620,7 @@ var bindTests = []struct {
620620
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
621621
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
622622
"github.com/ava-labs/libevm/common"
623-
"github.com/ava-labs/subnet-evm/core/types"
623+
"github.com/ava-labs/libevm/core/types"
624624
`,
625625
`
626626
// Create a simulator and wrap a non-deployed contract
@@ -659,7 +659,7 @@ var bindTests = []struct {
659659
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
660660
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
661661
"github.com/ava-labs/libevm/common"
662-
"github.com/ava-labs/subnet-evm/core/types"
662+
"github.com/ava-labs/libevm/core/types"
663663
`,
664664
`
665665
// Create a simulator and wrap a non-deployed contract
@@ -706,7 +706,7 @@ var bindTests = []struct {
706706
707707
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
708708
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
709-
"github.com/ava-labs/subnet-evm/core/types"
709+
"github.com/ava-labs/libevm/core/types"
710710
"github.com/ava-labs/libevm/crypto"
711711
`,
712712
`
@@ -756,7 +756,7 @@ var bindTests = []struct {
756756
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
757757
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
758758
"github.com/ava-labs/libevm/common"
759-
"github.com/ava-labs/subnet-evm/core/types"
759+
"github.com/ava-labs/libevm/core/types"
760760
"github.com/ava-labs/libevm/crypto"
761761
`,
762762
`
@@ -831,7 +831,7 @@ var bindTests = []struct {
831831
832832
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
833833
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
834-
"github.com/ava-labs/subnet-evm/core/types"
834+
"github.com/ava-labs/libevm/core/types"
835835
"github.com/ava-labs/libevm/crypto"
836836
`,
837837
`
@@ -925,7 +925,7 @@ var bindTests = []struct {
925925
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
926926
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
927927
"github.com/ava-labs/libevm/common"
928-
"github.com/ava-labs/subnet-evm/core/types"
928+
"github.com/ava-labs/libevm/core/types"
929929
"github.com/ava-labs/libevm/crypto"
930930
`,
931931
`
@@ -1115,7 +1115,7 @@ var bindTests = []struct {
11151115
11161116
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
11171117
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
1118-
"github.com/ava-labs/subnet-evm/core/types"
1118+
"github.com/ava-labs/libevm/core/types"
11191119
"github.com/ava-labs/libevm/crypto"
11201120
`,
11211121
`
@@ -1250,7 +1250,7 @@ var bindTests = []struct {
12501250
12511251
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
12521252
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
1253-
"github.com/ava-labs/subnet-evm/core/types"
1253+
"github.com/ava-labs/libevm/core/types"
12541254
"github.com/ava-labs/libevm/crypto"
12551255
`,
12561256

@@ -1392,7 +1392,7 @@ var bindTests = []struct {
13921392
13931393
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
13941394
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
1395-
"github.com/ava-labs/subnet-evm/core/types"
1395+
"github.com/ava-labs/libevm/core/types"
13961396
"github.com/ava-labs/libevm/crypto"
13971397
`,
13981398
`
@@ -1458,7 +1458,7 @@ var bindTests = []struct {
14581458
14591459
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
14601460
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
1461-
"github.com/ava-labs/subnet-evm/core/types"
1461+
"github.com/ava-labs/libevm/core/types"
14621462
"github.com/ava-labs/libevm/crypto"
14631463
`,
14641464
`
@@ -1568,7 +1568,7 @@ var bindTests = []struct {
15681568
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
15691569
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
15701570
"github.com/ava-labs/libevm/crypto"
1571-
"github.com/ava-labs/subnet-evm/core/types"
1571+
"github.com/ava-labs/libevm/core/types"
15721572
`,
15731573
`
15741574
// Initialize test accounts
@@ -1631,7 +1631,7 @@ var bindTests = []struct {
16311631
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
16321632
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
16331633
"github.com/ava-labs/libevm/crypto"
1634-
"github.com/ava-labs/subnet-evm/core/types"
1634+
"github.com/ava-labs/libevm/core/types"
16351635
`,
16361636
`
16371637
key, _ := crypto.GenerateKey()
@@ -1692,7 +1692,7 @@ var bindTests = []struct {
16921692
16931693
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
16941694
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
1695-
"github.com/ava-labs/subnet-evm/core/types"
1695+
"github.com/ava-labs/libevm/core/types"
16961696
"github.com/ava-labs/libevm/crypto"
16971697
`,
16981698
`
@@ -1753,7 +1753,7 @@ var bindTests = []struct {
17531753
17541754
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
17551755
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
1756-
"github.com/ava-labs/subnet-evm/core/types"
1756+
"github.com/ava-labs/libevm/core/types"
17571757
"github.com/ava-labs/libevm/crypto"
17581758
`,
17591759
`
@@ -1841,7 +1841,7 @@ var bindTests = []struct {
18411841
18421842
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
18431843
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
1844-
"github.com/ava-labs/subnet-evm/core/types"
1844+
"github.com/ava-labs/libevm/core/types"
18451845
"github.com/ava-labs/libevm/crypto"
18461846
`,
18471847
`
@@ -1911,7 +1911,7 @@ var bindTests = []struct {
19111911
19121912
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
19131913
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
1914-
"github.com/ava-labs/subnet-evm/core/types"
1914+
"github.com/ava-labs/libevm/core/types"
19151915
"github.com/ava-labs/libevm/crypto"
19161916
`,
19171917
`
@@ -1963,7 +1963,7 @@ var bindTests = []struct {
19631963
19641964
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
19651965
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
1966-
"github.com/ava-labs/subnet-evm/core/types"
1966+
"github.com/ava-labs/libevm/core/types"
19671967
"github.com/ava-labs/libevm/crypto"
19681968
`,
19691969
tester: `
@@ -2011,7 +2011,7 @@ var bindTests = []struct {
20112011
20122012
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
20132013
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
2014-
"github.com/ava-labs/subnet-evm/core/types"
2014+
"github.com/ava-labs/libevm/core/types"
20152015
"github.com/ava-labs/libevm/crypto"
20162016
`,
20172017
tester: `
@@ -2052,7 +2052,7 @@ var bindTests = []struct {
20522052
20532053
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
20542054
"github.com/ava-labs/subnet-evm/accounts/abi/bind/backends"
2055-
"github.com/ava-labs/subnet-evm/core/types"
2055+
"github.com/ava-labs/libevm/core/types"
20562056
"github.com/ava-labs/libevm/crypto"
20572057
`,
20582058
tester: `

‎accounts/abi/bind/template.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ import (
103103
104104
"github.com/ava-labs/subnet-evm/accounts/abi"
105105
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
106-
"github.com/ava-labs/subnet-evm/core/types"
106+
"github.com/ava-labs/libevm/core/types"
107107
"github.com/ava-labs/subnet-evm/interfaces"
108108
"github.com/ava-labs/libevm/common"
109109
"github.com/ava-labs/libevm/event"

‎accounts/abi/bind/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232
"time"
3333

3434
"github.com/ava-labs/libevm/common"
35+
"github.com/ava-labs/libevm/core/types"
3536
"github.com/ava-labs/libevm/log"
36-
"github.com/ava-labs/subnet-evm/core/types"
3737
"github.com/ava-labs/subnet-evm/interfaces"
3838
)
3939

‎accounts/abi/bind/util_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ import (
3434
"time"
3535

3636
"github.com/ava-labs/libevm/common"
37+
"github.com/ava-labs/libevm/core/types"
3738
"github.com/ava-labs/libevm/crypto"
3839
"github.com/ava-labs/subnet-evm/accounts/abi/bind"
39-
"github.com/ava-labs/subnet-evm/core/types"
4040
"github.com/ava-labs/subnet-evm/ethclient/simulated"
4141
"github.com/ava-labs/subnet-evm/params"
4242
)

‎cmd/evm/internal/t8ntool/block.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ import (
3737
"github.com/ava-labs/libevm/common"
3838
"github.com/ava-labs/libevm/common/hexutil"
3939
"github.com/ava-labs/libevm/common/math"
40+
"github.com/ava-labs/libevm/core/types"
4041
"github.com/ava-labs/libevm/crypto"
4142
"github.com/ava-labs/libevm/rlp"
42-
"github.com/ava-labs/subnet-evm/core/types"
4343
"github.com/urfave/cli/v2"
4444
)
4545

‎cmd/evm/internal/t8ntool/execution.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"github.com/ava-labs/libevm/common"
3434
"github.com/ava-labs/libevm/common/math"
3535
"github.com/ava-labs/libevm/core/rawdb"
36+
"github.com/ava-labs/libevm/core/types"
3637
"github.com/ava-labs/libevm/core/vm"
3738
"github.com/ava-labs/libevm/crypto"
3839
"github.com/ava-labs/libevm/ethdb"
@@ -43,7 +44,6 @@ import (
4344
"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
4445
"github.com/ava-labs/subnet-evm/core"
4546
"github.com/ava-labs/subnet-evm/core/state"
46-
"github.com/ava-labs/subnet-evm/core/types"
4747
"github.com/ava-labs/subnet-evm/params"
4848
"github.com/holiman/uint256"
4949
"golang.org/x/crypto/sha3"

‎cmd/evm/internal/t8ntool/gen_header.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/evm/internal/t8ntool/transaction.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ import (
3636

3737
"github.com/ava-labs/libevm/common"
3838
"github.com/ava-labs/libevm/common/hexutil"
39+
"github.com/ava-labs/libevm/core/types"
3940
"github.com/ava-labs/libevm/rlp"
4041
"github.com/ava-labs/subnet-evm/core"
41-
"github.com/ava-labs/subnet-evm/core/types"
4242
"github.com/ava-labs/subnet-evm/params"
4343
"github.com/ava-labs/subnet-evm/tests"
4444
"github.com/urfave/cli/v2"

0 commit comments

Comments
 (0)