From 1acced0bf6fc3521c7f6e6d8cf844355f4d8f1ba Mon Sep 17 00:00:00 2001 From: Guillaume Ballet Date: Wed, 15 Jan 2020 16:06:50 +0100 Subject: [PATCH] abi: Move abi ahead of refactor --- {accounts/abi => abi}/abi.go | 0 {accounts/abi => abi}/abi_test.go | 0 {accounts/abi => abi}/argument.go | 0 {accounts/abi => abi}/bind/auth.go | 0 {accounts/abi => abi}/bind/backend.go | 0 .../abi => abi}/bind/backends/simulated.go | 2 +- .../bind/backends/simulated_test.go | 4 +- {accounts/abi => abi}/bind/base.go | 2 +- {accounts/abi => abi}/bind/base_test.go | 4 +- {accounts/abi => abi}/bind/bind.go | 2 +- {accounts/abi => abi}/bind/bind_test.go | 70 +++++++++---------- {accounts/abi => abi}/bind/template.go | 6 +- {accounts/abi => abi}/bind/topics.go | 2 +- {accounts/abi => abi}/bind/topics_test.go | 2 +- {accounts/abi => abi}/bind/util.go | 0 {accounts/abi => abi}/bind/util_test.go | 4 +- {accounts/abi => abi}/doc.go | 0 {accounts/abi => abi}/error.go | 0 {accounts/abi => abi}/event.go | 0 {accounts/abi => abi}/event_test.go | 0 {accounts/abi => abi}/method.go | 0 {accounts/abi => abi}/method_test.go | 0 {accounts/abi => abi}/numbers.go | 0 {accounts/abi => abi}/numbers_test.go | 0 {accounts/abi => abi}/pack.go | 0 {accounts/abi => abi}/pack_test.go | 0 {accounts/abi => abi}/reflect.go | 0 {accounts/abi => abi}/reflect_test.go | 0 {accounts/abi => abi}/type.go | 0 {accounts/abi => abi}/type_test.go | 0 {accounts/abi => abi}/unpack.go | 0 {accounts/abi => abi}/unpack_test.go | 0 cmd/abigen/main.go | 4 +- cmd/checkpoint-admin/common.go | 2 +- contracts/checkpointoracle/contract/oracle.go | 4 +- contracts/checkpointoracle/oracle.go | 2 +- contracts/checkpointoracle/oracle_test.go | 4 +- core/vm/runtime/runtime_test.go | 2 +- eth/backend.go | 2 +- les/checkpointoracle/oracle.go | 2 +- les/client.go | 2 +- les/server.go | 2 +- les/sync_test.go | 2 +- les/test_helper.go | 4 +- mobile/bind.go | 4 +- signer/core/signed_data.go | 2 +- signer/fourbyte/abi.go | 2 +- signer/fourbyte/abi_test.go | 2 +- signer/fourbyte/fourbyte_test.go | 2 +- 49 files changed, 71 insertions(+), 71 deletions(-) rename {accounts/abi => abi}/abi.go (100%) rename {accounts/abi => abi}/abi_test.go (100%) rename {accounts/abi => abi}/argument.go (100%) rename {accounts/abi => abi}/bind/auth.go (100%) rename {accounts/abi => abi}/bind/backend.go (100%) rename {accounts/abi => abi}/bind/backends/simulated.go (99%) rename {accounts/abi => abi}/bind/backends/simulated_test.go (99%) rename {accounts/abi => abi}/bind/base.go (99%) rename {accounts/abi => abi}/bind/base_test.go (99%) rename {accounts/abi => abi}/bind/bind.go (99%) rename {accounts/abi => abi}/bind/bind_test.go (98%) rename {accounts/abi => abi}/bind/template.go (99%) rename {accounts/abi => abi}/bind/topics.go (99%) rename {accounts/abi => abi}/bind/topics_test.go (99%) rename {accounts/abi => abi}/bind/util.go (100%) rename {accounts/abi => abi}/bind/util_test.go (96%) rename {accounts/abi => abi}/doc.go (100%) rename {accounts/abi => abi}/error.go (100%) rename {accounts/abi => abi}/event.go (100%) rename {accounts/abi => abi}/event_test.go (100%) rename {accounts/abi => abi}/method.go (100%) rename {accounts/abi => abi}/method_test.go (100%) rename {accounts/abi => abi}/numbers.go (100%) rename {accounts/abi => abi}/numbers_test.go (100%) rename {accounts/abi => abi}/pack.go (100%) rename {accounts/abi => abi}/pack_test.go (100%) rename {accounts/abi => abi}/reflect.go (100%) rename {accounts/abi => abi}/reflect_test.go (100%) rename {accounts/abi => abi}/type.go (100%) rename {accounts/abi => abi}/type_test.go (100%) rename {accounts/abi => abi}/unpack.go (100%) rename {accounts/abi => abi}/unpack_test.go (100%) diff --git a/accounts/abi/abi.go b/abi/abi.go similarity index 100% rename from accounts/abi/abi.go rename to abi/abi.go diff --git a/accounts/abi/abi_test.go b/abi/abi_test.go similarity index 100% rename from accounts/abi/abi_test.go rename to abi/abi_test.go diff --git a/accounts/abi/argument.go b/abi/argument.go similarity index 100% rename from accounts/abi/argument.go rename to abi/argument.go diff --git a/accounts/abi/bind/auth.go b/abi/bind/auth.go similarity index 100% rename from accounts/abi/bind/auth.go rename to abi/bind/auth.go diff --git a/accounts/abi/bind/backend.go b/abi/bind/backend.go similarity index 100% rename from accounts/abi/bind/backend.go rename to abi/bind/backend.go diff --git a/accounts/abi/bind/backends/simulated.go b/abi/bind/backends/simulated.go similarity index 99% rename from accounts/abi/bind/backends/simulated.go rename to abi/bind/backends/simulated.go index 0b2555c994..65016503fe 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/abi/bind/backends/simulated.go @@ -25,7 +25,7 @@ import ( "time" "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/consensus/ethash" diff --git a/accounts/abi/bind/backends/simulated_test.go b/abi/bind/backends/simulated_test.go similarity index 99% rename from accounts/abi/bind/backends/simulated_test.go rename to abi/bind/backends/simulated_test.go index 455d89c1e3..aa5177a422 100644 --- a/accounts/abi/bind/backends/simulated_test.go +++ b/abi/bind/backends/simulated_test.go @@ -25,8 +25,8 @@ import ( "time" "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/abi" + "github.com/ethereum/go-ethereum/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" diff --git a/accounts/abi/bind/base.go b/abi/bind/base.go similarity index 99% rename from accounts/abi/bind/base.go rename to abi/bind/base.go index 499b4bda07..07c011dada 100644 --- a/accounts/abi/bind/base.go +++ b/abi/bind/base.go @@ -23,7 +23,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ethereum/go-ethereum/abi" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" diff --git a/accounts/abi/bind/base_test.go b/abi/bind/base_test.go similarity index 99% rename from accounts/abi/bind/base_test.go rename to abi/bind/base_test.go index 3ae685e00f..9d480ce5d4 100644 --- a/accounts/abi/bind/base_test.go +++ b/abi/bind/base_test.go @@ -24,8 +24,8 @@ import ( "testing" "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/abi" + "github.com/ethereum/go-ethereum/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" diff --git a/accounts/abi/bind/bind.go b/abi/bind/bind.go similarity index 99% rename from accounts/abi/bind/bind.go rename to abi/bind/bind.go index 13ac286b45..0b8b7677c4 100644 --- a/accounts/abi/bind/bind.go +++ b/abi/bind/bind.go @@ -30,7 +30,7 @@ import ( "text/template" "unicode" - "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ethereum/go-ethereum/abi" "github.com/ethereum/go-ethereum/log" ) diff --git a/accounts/abi/bind/bind_test.go b/abi/bind/bind_test.go similarity index 98% rename from accounts/abi/bind/bind_test.go rename to abi/bind/bind_test.go index fa1a7b1ca7..2470085953 100644 --- a/accounts/abi/bind/bind_test.go +++ b/abi/bind/bind_test.go @@ -281,8 +281,8 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" `, @@ -336,8 +336,8 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" `, @@ -382,8 +382,8 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" `, @@ -439,8 +439,8 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" @@ -488,8 +488,8 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" `, @@ -535,8 +535,8 @@ var bindTests = []struct { []string{`6060604052609f8060106000396000f3606060405260e060020a6000350463f97a60058114601a575b005b600060605260c0604052600d60809081527f4920646f6e27742065786973740000000000000000000000000000000000000060a052602060c0908152600d60e081905281906101009060a09080838184600060046012f15050815172ffffffffffffffffffffffffffffffffffffff1916909152505060405161012081900392509050f3`}, []string{`[{"constant":true,"inputs":[],"name":"String","outputs":[{"name":"","type":"string"}],"type":"function"}]`}, ` - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" `, @@ -583,8 +583,8 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" `, @@ -632,8 +632,8 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" @@ -708,8 +708,8 @@ var bindTests = []struct { "fmt" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" `, @@ -801,8 +801,8 @@ var bindTests = []struct { "math/big" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" @@ -992,8 +992,8 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" `, @@ -1045,7 +1045,7 @@ var bindTests = []struct { } //quick check to see if contents were copied - // (See accounts/abi/unpack_test.go for more extensive testing) + // (See abi/unpack_test.go for more extensive testing) if retrievedArr[4][3][2] != testArr[4][3][2] { t.Fatalf("Retrieved value does not match expected value! got: %d, expected: %d. %v", retrievedArr[4][3][2], testArr[4][3][2], err) } @@ -1127,8 +1127,8 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" `, @@ -1269,8 +1269,8 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" `, @@ -1335,8 +1335,8 @@ var bindTests = []struct { "math/big" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" `, @@ -1423,8 +1423,8 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/core" `, @@ -1486,8 +1486,8 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/core" `, @@ -1548,8 +1548,8 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" `, diff --git a/accounts/abi/bind/template.go b/abi/bind/template.go similarity index 99% rename from accounts/abi/bind/template.go rename to abi/bind/template.go index c96dd1b995..6697bbc2e0 100644 --- a/accounts/abi/bind/template.go +++ b/abi/bind/template.go @@ -16,7 +16,7 @@ package bind -import "github.com/ethereum/go-ethereum/accounts/abi" +import "github.com/ethereum/go-ethereum/abi" // tmplData is the data structure required to fill the binding template. type tmplData struct { @@ -89,8 +89,8 @@ import ( "strings" ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/abi" + "github.com/ethereum/go-ethereum/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/event" diff --git a/accounts/abi/bind/topics.go b/abi/bind/topics.go similarity index 99% rename from accounts/abi/bind/topics.go rename to abi/bind/topics.go index c908c92582..e95b1f28f7 100644 --- a/accounts/abi/bind/topics.go +++ b/abi/bind/topics.go @@ -23,7 +23,7 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ethereum/go-ethereum/abi" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" ) diff --git a/accounts/abi/bind/topics_test.go b/abi/bind/topics_test.go similarity index 99% rename from accounts/abi/bind/topics_test.go rename to abi/bind/topics_test.go index c62f5bab32..12fba61945 100644 --- a/accounts/abi/bind/topics_test.go +++ b/abi/bind/topics_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ethereum/go-ethereum/abi" "github.com/ethereum/go-ethereum/common" ) diff --git a/accounts/abi/bind/util.go b/abi/bind/util.go similarity index 100% rename from accounts/abi/bind/util.go rename to abi/bind/util.go diff --git a/accounts/abi/bind/util_test.go b/abi/bind/util_test.go similarity index 96% rename from accounts/abi/bind/util_test.go rename to abi/bind/util_test.go index e0141f46e0..d68afdecc9 100644 --- a/accounts/abi/bind/util_test.go +++ b/abi/bind/util_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" diff --git a/accounts/abi/doc.go b/abi/doc.go similarity index 100% rename from accounts/abi/doc.go rename to abi/doc.go diff --git a/accounts/abi/error.go b/abi/error.go similarity index 100% rename from accounts/abi/error.go rename to abi/error.go diff --git a/accounts/abi/event.go b/abi/event.go similarity index 100% rename from accounts/abi/event.go rename to abi/event.go diff --git a/accounts/abi/event_test.go b/abi/event_test.go similarity index 100% rename from accounts/abi/event_test.go rename to abi/event_test.go diff --git a/accounts/abi/method.go b/abi/method.go similarity index 100% rename from accounts/abi/method.go rename to abi/method.go diff --git a/accounts/abi/method_test.go b/abi/method_test.go similarity index 100% rename from accounts/abi/method_test.go rename to abi/method_test.go diff --git a/accounts/abi/numbers.go b/abi/numbers.go similarity index 100% rename from accounts/abi/numbers.go rename to abi/numbers.go diff --git a/accounts/abi/numbers_test.go b/abi/numbers_test.go similarity index 100% rename from accounts/abi/numbers_test.go rename to abi/numbers_test.go diff --git a/accounts/abi/pack.go b/abi/pack.go similarity index 100% rename from accounts/abi/pack.go rename to abi/pack.go diff --git a/accounts/abi/pack_test.go b/abi/pack_test.go similarity index 100% rename from accounts/abi/pack_test.go rename to abi/pack_test.go diff --git a/accounts/abi/reflect.go b/abi/reflect.go similarity index 100% rename from accounts/abi/reflect.go rename to abi/reflect.go diff --git a/accounts/abi/reflect_test.go b/abi/reflect_test.go similarity index 100% rename from accounts/abi/reflect_test.go rename to abi/reflect_test.go diff --git a/accounts/abi/type.go b/abi/type.go similarity index 100% rename from accounts/abi/type.go rename to abi/type.go diff --git a/accounts/abi/type_test.go b/abi/type_test.go similarity index 100% rename from accounts/abi/type_test.go rename to abi/type_test.go diff --git a/accounts/abi/unpack.go b/abi/unpack.go similarity index 100% rename from accounts/abi/unpack.go rename to abi/unpack.go diff --git a/accounts/abi/unpack_test.go b/abi/unpack_test.go similarity index 100% rename from accounts/abi/unpack_test.go rename to abi/unpack_test.go diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index ed4a3b8870..6c2c1cc81d 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -25,8 +25,8 @@ import ( "regexp" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/abi" + "github.com/ethereum/go-ethereum/abi/bind" "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/common/compiler" "github.com/ethereum/go-ethereum/crypto" diff --git a/cmd/checkpoint-admin/common.go b/cmd/checkpoint-admin/common.go index 05a45dfbf9..8a29fa3d66 100644 --- a/cmd/checkpoint-admin/common.go +++ b/cmd/checkpoint-admin/common.go @@ -19,8 +19,8 @@ package main import ( "strconv" + "github.com/ethereum/go-ethereum/abi/bind" "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/accounts/external" "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/common" diff --git a/contracts/checkpointoracle/contract/oracle.go b/contracts/checkpointoracle/contract/oracle.go index 3bb351792f..4f8166f382 100644 --- a/contracts/checkpointoracle/contract/oracle.go +++ b/contracts/checkpointoracle/contract/oracle.go @@ -8,8 +8,8 @@ import ( "strings" ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/abi" + "github.com/ethereum/go-ethereum/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/event" diff --git a/contracts/checkpointoracle/oracle.go b/contracts/checkpointoracle/oracle.go index 1f273272ab..0cbfd64409 100644 --- a/contracts/checkpointoracle/oracle.go +++ b/contracts/checkpointoracle/oracle.go @@ -23,7 +23,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract" "github.com/ethereum/go-ethereum/core/types" diff --git a/contracts/checkpointoracle/oracle_test.go b/contracts/checkpointoracle/oracle_test.go index 817954d11a..11bdedbd3f 100644 --- a/contracts/checkpointoracle/oracle_test.go +++ b/contracts/checkpointoracle/oracle_test.go @@ -27,8 +27,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract" "github.com/ethereum/go-ethereum/core" diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index 15f545ddca..9221f86903 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ethereum/go-ethereum/abi" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/rawdb" "github.com/ethereum/go-ethereum/core/state" diff --git a/eth/backend.go b/eth/backend.go index adde609de0..52a88a7ea6 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -25,8 +25,8 @@ import ( "sync" "sync/atomic" + "github.com/ethereum/go-ethereum/abi/bind" "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/consensus" diff --git a/les/checkpointoracle/oracle.go b/les/checkpointoracle/oracle.go index c3983e1a95..889f7d41c7 100644 --- a/les/checkpointoracle/oracle.go +++ b/les/checkpointoracle/oracle.go @@ -23,7 +23,7 @@ import ( "encoding/binary" "sync/atomic" - "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/contracts/checkpointoracle" "github.com/ethereum/go-ethereum/crypto" diff --git a/les/client.go b/les/client.go index 36d5a8d2fe..5b688eb4c5 100644 --- a/les/client.go +++ b/les/client.go @@ -20,8 +20,8 @@ package les import ( "fmt" + "github.com/ethereum/go-ethereum/abi/bind" "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/mclock" diff --git a/les/server.go b/les/server.go index 664eba9717..b448b88e68 100644 --- a/les/server.go +++ b/les/server.go @@ -20,7 +20,7 @@ import ( "crypto/ecdsa" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind" "github.com/ethereum/go-ethereum/common/mclock" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/eth" diff --git a/les/sync_test.go b/les/sync_test.go index 1c157b4fbf..94815636a4 100644 --- a/les/sync_test.go +++ b/les/sync_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/light" diff --git a/les/test_helper.go b/les/test_helper.go index fb1965eebe..d275aa58ea 100644 --- a/les/test_helper.go +++ b/les/test_helper.go @@ -26,8 +26,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/abi/bind" + "github.com/ethereum/go-ethereum/abi/bind/backends" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/mclock" "github.com/ethereum/go-ethereum/consensus/ethash" diff --git a/mobile/bind.go b/mobile/bind.go index 90ecdf82c4..8d9b694dd6 100644 --- a/mobile/bind.go +++ b/mobile/bind.go @@ -23,8 +23,8 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/abi" + "github.com/ethereum/go-ethereum/abi/bind" "github.com/ethereum/go-ethereum/accounts/keystore" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" diff --git a/signer/core/signed_data.go b/signer/core/signed_data.go index f512be7cea..daeda493ab 100644 --- a/signer/core/signed_data.go +++ b/signer/core/signed_data.go @@ -30,8 +30,8 @@ import ( "strings" "unicode" + "github.com/ethereum/go-ethereum/abi" "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/math" diff --git a/signer/fourbyte/abi.go b/signer/fourbyte/abi.go index 585eae1cd8..b83e7a806f 100644 --- a/signer/fourbyte/abi.go +++ b/signer/fourbyte/abi.go @@ -23,7 +23,7 @@ import ( "regexp" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ethereum/go-ethereum/abi" "github.com/ethereum/go-ethereum/common" ) diff --git a/signer/fourbyte/abi_test.go b/signer/fourbyte/abi_test.go index 314c12735b..0780294491 100644 --- a/signer/fourbyte/abi_test.go +++ b/signer/fourbyte/abi_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ethereum/go-ethereum/abi" "github.com/ethereum/go-ethereum/common" ) diff --git a/signer/fourbyte/fourbyte_test.go b/signer/fourbyte/fourbyte_test.go index cdbd7ef73d..59b4874968 100644 --- a/signer/fourbyte/fourbyte_test.go +++ b/signer/fourbyte/fourbyte_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ethereum/go-ethereum/abi" "github.com/ethereum/go-ethereum/common" )