From 8f0c453217ae2c031a414fce73c11282fa049976 Mon Sep 17 00:00:00 2001 From: codchen Date: Fri, 20 Oct 2023 16:08:06 +0800 Subject: [PATCH] make internal public --- build/ci.go | 6 +++--- cmd/abigen/main.go | 2 +- cmd/clef/main.go | 4 ++-- cmd/clef/run_test.go | 4 ++-- cmd/devp2p/discv4cmd.go | 2 +- cmd/devp2p/discv5cmd.go | 2 +- cmd/devp2p/internal/ethtest/helpers.go | 2 +- cmd/devp2p/internal/ethtest/snap.go | 2 +- cmd/devp2p/internal/ethtest/suite.go | 2 +- cmd/devp2p/internal/ethtest/suite_test.go | 2 +- cmd/devp2p/internal/ethtest/transaction.go | 2 +- cmd/devp2p/internal/v4test/discv4tests.go | 2 +- cmd/devp2p/internal/v5test/discv5tests.go | 2 +- cmd/devp2p/main.go | 4 ++-- cmd/devp2p/runtest.go | 2 +- cmd/ethkey/main.go | 2 +- cmd/ethkey/run_test.go | 4 ++-- cmd/evm/main.go | 4 ++-- cmd/evm/runner.go | 2 +- cmd/evm/t8n_test.go | 4 ++-- cmd/geth/chaincmd.go | 2 +- cmd/geth/config.go | 6 +++--- cmd/geth/consolecmd.go | 2 +- cmd/geth/dbcmd.go | 2 +- cmd/geth/main.go | 6 +++--- cmd/geth/misccmd.go | 2 +- cmd/geth/run_test.go | 4 ++-- cmd/geth/snapshot.go | 2 +- cmd/geth/verkle.go | 2 +- cmd/p2psim/main.go | 2 +- cmd/utils/cmd.go | 2 +- cmd/utils/flags_legacy.go | 2 +- console/bridge.go | 2 +- console/bridge_test.go | 2 +- console/console.go | 6 +++--- console/console_test.go | 2 +- core/blockchain.go | 4 ++-- core/rawdb/accessors_indexes_test.go | 2 +- core/types/block_test.go | 2 +- eth/api_debug.go | 2 +- eth/backend.go | 4 ++-- eth/filters/api.go | 2 +- eth/filters/filter_system_test.go | 2 +- eth/tracers/api.go | 2 +- eth/tracers/api_test.go | 2 +- graphql/graphql.go | 2 +- graphql/service.go | 2 +- {internal => lib}/blocktest/test_hash.go | 0 {internal => lib}/build/archive.go | 0 {internal => lib}/build/azure.go | 0 {internal => lib}/build/download.go | 0 {internal => lib}/build/env.go | 0 {internal => lib}/build/gotool.go | 0 {internal => lib}/build/pgp.go | 0 {internal => lib}/build/util.go | 0 {internal => lib}/cmdtest/test_cmd.go | 0 {internal => lib}/debug/api.go | 0 {internal => lib}/debug/flags.go | 2 +- {internal => lib}/debug/loudpanic.go | 0 {internal => lib}/debug/trace.go | 0 {internal => lib}/ethapi/addrlock.go | 0 {internal => lib}/ethapi/api.go | 0 {internal => lib}/ethapi/api_test.go | 2 +- {internal => lib}/ethapi/backend.go | 0 {internal => lib}/ethapi/dbapi.go | 0 .../ethapi/testdata/eth_getBlockByHash-hash-1.json | 0 .../testdata/eth_getBlockByHash-hash-empty-fullTx.json | 0 .../ethapi/testdata/eth_getBlockByHash-hash-genesis.json | 0 .../testdata/eth_getBlockByHash-hash-latest-1-fullTx.json | 0 .../ethapi/testdata/eth_getBlockByHash-hash-latest.json | 0 .../testdata/eth_getBlockByHash-hash-pending-fullTx.json | 0 .../ethapi/testdata/eth_getBlockByHash-hash-pending.json | 0 .../ethapi/testdata/eth_getBlockByNumber-number-0.json | 0 .../ethapi/testdata/eth_getBlockByNumber-number-1.json | 0 .../testdata/eth_getBlockByNumber-number-latest+1.json | 0 .../testdata/eth_getBlockByNumber-number-latest-1.json | 0 .../ethapi/testdata/eth_getBlockByNumber-tag-latest.json | 0 .../testdata/eth_getBlockByNumber-tag-pending-fullTx.json | 0 .../ethapi/testdata/eth_getBlockByNumber-tag-pending.json | 0 .../testdata/eth_getBlockReceipts-block-notfound.json | 0 .../testdata/eth_getBlockReceipts-block-with-blob-tx.json | 0 .../eth_getBlockReceipts-block-with-contract-create-tx.json | 0 .../eth_getBlockReceipts-block-with-dynamic-fee-tx.json | 0 ...getBlockReceipts-block-with-legacy-contract-call-tx.json | 0 .../eth_getBlockReceipts-block-with-legacy-transfer-tx.json | 0 .../ethapi/testdata/eth_getBlockReceipts-hash-empty.json | 0 .../ethapi/testdata/eth_getBlockReceipts-hash-notfound.json | 0 .../ethapi/testdata/eth_getBlockReceipts-number-0.json | 0 .../ethapi/testdata/eth_getBlockReceipts-number-1.json | 0 .../ethapi/testdata/eth_getBlockReceipts-tag-earliest.json | 0 .../ethapi/testdata/eth_getBlockReceipts-tag-latest.json | 0 .../ethapi/testdata/eth_getHeaderByHash-hash-0.json | 0 .../ethapi/testdata/eth_getHeaderByHash-hash-1.json | 0 .../ethapi/testdata/eth_getHeaderByHash-hash-empty.json | 0 .../ethapi/testdata/eth_getHeaderByHash-hash-latest-1.json | 0 .../ethapi/testdata/eth_getHeaderByHash-hash-latest.json | 0 .../ethapi/testdata/eth_getHeaderByHash-hash-pending.json | 0 .../ethapi/testdata/eth_getHeaderByNumber-number-0.json | 0 .../ethapi/testdata/eth_getHeaderByNumber-number-1.json | 0 .../testdata/eth_getHeaderByNumber-number-latest+1.json | 0 .../testdata/eth_getHeaderByNumber-number-latest-1.json | 0 .../ethapi/testdata/eth_getHeaderByNumber-tag-latest.json | 0 .../ethapi/testdata/eth_getHeaderByNumber-tag-pending.json | 0 .../ethapi/testdata/eth_getTransactionReceipt-blob-tx.json | 0 .../eth_getTransactionReceipt-create-contract-tx.json | 0 ...TransactionReceipt-create-contract-with-access-list.json | 0 .../eth_getTransactionReceipt-dynamic-tx-with-logs.json | 0 .../eth_getTransactionReceipt-normal-transfer-tx.json | 0 .../testdata/eth_getTransactionReceipt-txhash-empty.json | 0 .../testdata/eth_getTransactionReceipt-txhash-notfound.json | 0 .../testdata/eth_getTransactionReceipt-with-logs.json | 0 {internal => lib}/ethapi/transaction_args.go | 0 {internal => lib}/ethapi/transaction_args_test.go | 0 {internal => lib}/flags/categories.go | 0 {internal => lib}/flags/flags.go | 0 {internal => lib}/flags/flags_test.go | 0 {internal => lib}/flags/helpers.go | 2 +- {internal => lib}/guide/guide.go | 0 {internal => lib}/guide/guide_test.go | 0 {internal => lib}/jsre/completion.go | 0 {internal => lib}/jsre/completion_test.go | 0 {internal => lib}/jsre/deps/bignumber.js | 0 {internal => lib}/jsre/deps/deps.go | 0 {internal => lib}/jsre/deps/web3.js | 0 {internal => lib}/jsre/jsre.go | 0 {internal => lib}/jsre/jsre_test.go | 0 {internal => lib}/jsre/pretty.go | 0 {internal => lib}/reexec/reexec.go | 0 {internal => lib}/reexec/self_linux.go | 0 {internal => lib}/reexec/self_others.go | 0 {internal => lib}/shutdowncheck/shutdown_tracker.go | 0 {internal => lib}/syncx/mutex.go | 0 {internal => lib}/testlog/testlog.go | 0 {internal => lib}/utesting/utesting.go | 0 {internal => lib}/utesting/utesting_test.go | 0 {internal => lib}/version/vcs.go | 0 {internal => lib}/version/version.go | 0 {internal => lib}/web3ext/web3ext.go | 0 node/api.go | 2 +- node/rpcstack_test.go | 2 +- p2p/dial_test.go | 2 +- p2p/discover/v4_udp_test.go | 2 +- p2p/discover/v5_udp_test.go | 2 +- p2p/dnsdisc/client_test.go | 2 +- p2p/server_nat_test.go | 2 +- p2p/server_test.go | 2 +- signer/core/api.go | 2 +- signer/core/api_test.go | 2 +- signer/core/auditlog.go | 2 +- signer/core/cliui.go | 2 +- signer/core/stdioui.go | 2 +- signer/rules/rules.go | 4 ++-- signer/rules/rules_test.go | 2 +- 153 files changed, 83 insertions(+), 83 deletions(-) rename {internal => lib}/blocktest/test_hash.go (100%) rename {internal => lib}/build/archive.go (100%) rename {internal => lib}/build/azure.go (100%) rename {internal => lib}/build/download.go (100%) rename {internal => lib}/build/env.go (100%) rename {internal => lib}/build/gotool.go (100%) rename {internal => lib}/build/pgp.go (100%) rename {internal => lib}/build/util.go (100%) rename {internal => lib}/cmdtest/test_cmd.go (100%) rename {internal => lib}/debug/api.go (100%) rename {internal => lib}/debug/flags.go (99%) rename {internal => lib}/debug/loudpanic.go (100%) rename {internal => lib}/debug/trace.go (100%) rename {internal => lib}/ethapi/addrlock.go (100%) rename {internal => lib}/ethapi/api.go (100%) rename {internal => lib}/ethapi/api_test.go (99%) rename {internal => lib}/ethapi/backend.go (100%) rename {internal => lib}/ethapi/dbapi.go (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockByHash-hash-1.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockByHash-hash-empty-fullTx.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockByHash-hash-genesis.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockByHash-hash-latest-1-fullTx.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockByHash-hash-latest.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockByHash-hash-pending-fullTx.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockByHash-hash-pending.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockByNumber-number-0.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockByNumber-number-1.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockByNumber-number-latest+1.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockByNumber-number-latest-1.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockByNumber-tag-latest.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockByNumber-tag-pending-fullTx.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockByNumber-tag-pending.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockReceipts-block-notfound.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockReceipts-block-with-blob-tx.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockReceipts-block-with-contract-create-tx.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockReceipts-block-with-dynamic-fee-tx.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-contract-call-tx.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-transfer-tx.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockReceipts-hash-empty.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockReceipts-hash-notfound.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockReceipts-number-0.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockReceipts-number-1.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockReceipts-tag-earliest.json (100%) rename {internal => lib}/ethapi/testdata/eth_getBlockReceipts-tag-latest.json (100%) rename {internal => lib}/ethapi/testdata/eth_getHeaderByHash-hash-0.json (100%) rename {internal => lib}/ethapi/testdata/eth_getHeaderByHash-hash-1.json (100%) rename {internal => lib}/ethapi/testdata/eth_getHeaderByHash-hash-empty.json (100%) rename {internal => lib}/ethapi/testdata/eth_getHeaderByHash-hash-latest-1.json (100%) rename {internal => lib}/ethapi/testdata/eth_getHeaderByHash-hash-latest.json (100%) rename {internal => lib}/ethapi/testdata/eth_getHeaderByHash-hash-pending.json (100%) rename {internal => lib}/ethapi/testdata/eth_getHeaderByNumber-number-0.json (100%) rename {internal => lib}/ethapi/testdata/eth_getHeaderByNumber-number-1.json (100%) rename {internal => lib}/ethapi/testdata/eth_getHeaderByNumber-number-latest+1.json (100%) rename {internal => lib}/ethapi/testdata/eth_getHeaderByNumber-number-latest-1.json (100%) rename {internal => lib}/ethapi/testdata/eth_getHeaderByNumber-tag-latest.json (100%) rename {internal => lib}/ethapi/testdata/eth_getHeaderByNumber-tag-pending.json (100%) rename {internal => lib}/ethapi/testdata/eth_getTransactionReceipt-blob-tx.json (100%) rename {internal => lib}/ethapi/testdata/eth_getTransactionReceipt-create-contract-tx.json (100%) rename {internal => lib}/ethapi/testdata/eth_getTransactionReceipt-create-contract-with-access-list.json (100%) rename {internal => lib}/ethapi/testdata/eth_getTransactionReceipt-dynamic-tx-with-logs.json (100%) rename {internal => lib}/ethapi/testdata/eth_getTransactionReceipt-normal-transfer-tx.json (100%) rename {internal => lib}/ethapi/testdata/eth_getTransactionReceipt-txhash-empty.json (100%) rename {internal => lib}/ethapi/testdata/eth_getTransactionReceipt-txhash-notfound.json (100%) rename {internal => lib}/ethapi/testdata/eth_getTransactionReceipt-with-logs.json (100%) rename {internal => lib}/ethapi/transaction_args.go (100%) rename {internal => lib}/ethapi/transaction_args_test.go (100%) rename {internal => lib}/flags/categories.go (100%) rename {internal => lib}/flags/flags.go (100%) rename {internal => lib}/flags/flags_test.go (100%) rename {internal => lib}/flags/helpers.go (99%) rename {internal => lib}/guide/guide.go (100%) rename {internal => lib}/guide/guide_test.go (100%) rename {internal => lib}/jsre/completion.go (100%) rename {internal => lib}/jsre/completion_test.go (100%) rename {internal => lib}/jsre/deps/bignumber.js (100%) rename {internal => lib}/jsre/deps/deps.go (100%) rename {internal => lib}/jsre/deps/web3.js (100%) rename {internal => lib}/jsre/jsre.go (100%) rename {internal => lib}/jsre/jsre_test.go (100%) rename {internal => lib}/jsre/pretty.go (100%) rename {internal => lib}/reexec/reexec.go (100%) rename {internal => lib}/reexec/self_linux.go (100%) rename {internal => lib}/reexec/self_others.go (100%) rename {internal => lib}/shutdowncheck/shutdown_tracker.go (100%) rename {internal => lib}/syncx/mutex.go (100%) rename {internal => lib}/testlog/testlog.go (100%) rename {internal => lib}/utesting/utesting.go (100%) rename {internal => lib}/utesting/utesting_test.go (100%) rename {internal => lib}/version/vcs.go (100%) rename {internal => lib}/version/version.go (100%) rename {internal => lib}/web3ext/web3ext.go (100%) diff --git a/build/ci.go b/build/ci.go index afe1c332b8..39c9149f47 100644 --- a/build/ci.go +++ b/build/ci.go @@ -55,7 +55,7 @@ import ( "github.com/cespare/cp" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto/signify" - "github.com/ethereum/go-ethereum/internal/build" + "github.com/ethereum/go-ethereum/lib/build" "github.com/ethereum/go-ethereum/params" ) @@ -244,8 +244,8 @@ func doInstall(cmdline []string) { func buildFlags(env build.Environment, staticLinking bool, buildTags []string) (flags []string) { var ld []string if env.Commit != "" { - ld = append(ld, "-X", "github.com/ethereum/go-ethereum/internal/version.gitCommit="+env.Commit) - ld = append(ld, "-X", "github.com/ethereum/go-ethereum/internal/version.gitDate="+env.Date) + ld = append(ld, "-X", "github.com/ethereum/go-ethereum/lib/version.gitCommit="+env.Commit) + ld = append(ld, "-X", "github.com/ethereum/go-ethereum/lib/version.gitDate="+env.Date) } // Strip DWARF on darwin. This used to be required for certain things, // and there is no downside to this, so we just keep doing it. diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index 0149dec527..c946e0f608 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -28,7 +28,7 @@ import ( "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/common/compiler" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/ethereum/go-ethereum/log" "github.com/urfave/cli/v2" ) diff --git a/cmd/clef/main.go b/cmd/clef/main.go index 27b7b70771..427ba8ade3 100644 --- a/cmd/clef/main.go +++ b/cmd/clef/main.go @@ -42,8 +42,8 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/ethapi" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/params" diff --git a/cmd/clef/run_test.go b/cmd/clef/run_test.go index 5fa6e02e14..15a9d9bef4 100644 --- a/cmd/clef/run_test.go +++ b/cmd/clef/run_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/internal/reexec" + "github.com/ethereum/go-ethereum/lib/cmdtest" + "github.com/ethereum/go-ethereum/lib/reexec" ) const registeredName = "clef-test" diff --git a/cmd/devp2p/discv4cmd.go b/cmd/devp2p/discv4cmd.go index 45bcdcd367..4f62c622de 100644 --- a/cmd/devp2p/discv4cmd.go +++ b/cmd/devp2p/discv4cmd.go @@ -27,7 +27,7 @@ import ( "github.com/ethereum/go-ethereum/cmd/devp2p/internal/v4test" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/ethereum/go-ethereum/p2p/discover" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/params" diff --git a/cmd/devp2p/discv5cmd.go b/cmd/devp2p/discv5cmd.go index 0dac945269..3ae9722a24 100644 --- a/cmd/devp2p/discv5cmd.go +++ b/cmd/devp2p/discv5cmd.go @@ -23,7 +23,7 @@ import ( "github.com/ethereum/go-ethereum/cmd/devp2p/internal/v5test" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/ethereum/go-ethereum/p2p/discover" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/internal/ethtest/helpers.go b/cmd/devp2p/internal/ethtest/helpers.go index a0339b88cb..2c360b66c6 100644 --- a/cmd/devp2p/internal/ethtest/helpers.go +++ b/cmd/devp2p/internal/ethtest/helpers.go @@ -29,7 +29,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/internal/utesting" + "github.com/ethereum/go-ethereum/lib/utesting" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/rlpx" ) diff --git a/cmd/devp2p/internal/ethtest/snap.go b/cmd/devp2p/internal/ethtest/snap.go index 21a5c8232a..76ba2a627b 100644 --- a/cmd/devp2p/internal/ethtest/snap.go +++ b/cmd/devp2p/internal/ethtest/snap.go @@ -26,7 +26,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/internal/utesting" + "github.com/ethereum/go-ethereum/lib/utesting" "github.com/ethereum/go-ethereum/trie" "github.com/ethereum/go-ethereum/trie/trienode" "golang.org/x/crypto/sha3" diff --git a/cmd/devp2p/internal/ethtest/suite.go b/cmd/devp2p/internal/ethtest/suite.go index 0b56c8cf4b..cd881c0bd0 100644 --- a/cmd/devp2p/internal/ethtest/suite.go +++ b/cmd/devp2p/internal/ethtest/suite.go @@ -21,7 +21,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/internal/utesting" + "github.com/ethereum/go-ethereum/lib/utesting" "github.com/ethereum/go-ethereum/p2p/enode" ) diff --git a/cmd/devp2p/internal/ethtest/suite_test.go b/cmd/devp2p/internal/ethtest/suite_test.go index b11cdb5b88..dc20e2324a 100644 --- a/cmd/devp2p/internal/ethtest/suite_test.go +++ b/cmd/devp2p/internal/ethtest/suite_test.go @@ -23,7 +23,7 @@ import ( "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/internal/utesting" + "github.com/ethereum/go-ethereum/lib/utesting" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" ) diff --git a/cmd/devp2p/internal/ethtest/transaction.go b/cmd/devp2p/internal/ethtest/transaction.go index db5199d334..c840539158 100644 --- a/cmd/devp2p/internal/ethtest/transaction.go +++ b/cmd/devp2p/internal/ethtest/transaction.go @@ -26,7 +26,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/utesting" + "github.com/ethereum/go-ethereum/lib/utesting" "github.com/ethereum/go-ethereum/params" ) diff --git a/cmd/devp2p/internal/v4test/discv4tests.go b/cmd/devp2p/internal/v4test/discv4tests.go index 3afcfd0698..6ca3060259 100644 --- a/cmd/devp2p/internal/v4test/discv4tests.go +++ b/cmd/devp2p/internal/v4test/discv4tests.go @@ -25,7 +25,7 @@ import ( "time" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/utesting" + "github.com/ethereum/go-ethereum/lib/utesting" "github.com/ethereum/go-ethereum/p2p/discover/v4wire" ) diff --git a/cmd/devp2p/internal/v5test/discv5tests.go b/cmd/devp2p/internal/v5test/discv5tests.go index 56624a0ca8..712e88f54e 100644 --- a/cmd/devp2p/internal/v5test/discv5tests.go +++ b/cmd/devp2p/internal/v5test/discv5tests.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/internal/utesting" + "github.com/ethereum/go-ethereum/lib/utesting" "github.com/ethereum/go-ethereum/p2p/discover/v5wire" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/netutil" diff --git a/cmd/devp2p/main.go b/cmd/devp2p/main.go index 8461a8b9b5..1c00f0a1fd 100644 --- a/cmd/devp2p/main.go +++ b/cmd/devp2p/main.go @@ -20,8 +20,8 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/debug" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/runtest.go b/cmd/devp2p/runtest.go index 76af53ee4d..12c61de272 100644 --- a/cmd/devp2p/runtest.go +++ b/cmd/devp2p/runtest.go @@ -20,7 +20,7 @@ import ( "os" "github.com/ethereum/go-ethereum/cmd/devp2p/internal/v4test" - "github.com/ethereum/go-ethereum/internal/utesting" + "github.com/ethereum/go-ethereum/lib/utesting" "github.com/ethereum/go-ethereum/log" "github.com/urfave/cli/v2" ) diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index 25c0d104f6..2a30aa15ca 100644 --- a/cmd/ethkey/main.go +++ b/cmd/ethkey/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/urfave/cli/v2" ) diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go index 73506e5da1..6e74efe600 100644 --- a/cmd/ethkey/run_test.go +++ b/cmd/ethkey/run_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/internal/reexec" + "github.com/ethereum/go-ethereum/lib/cmdtest" + "github.com/ethereum/go-ethereum/lib/reexec" ) type testEthkey struct { diff --git a/cmd/evm/main.go b/cmd/evm/main.go index ef5d25418d..269862d1f2 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -23,8 +23,8 @@ import ( "os" "github.com/ethereum/go-ethereum/cmd/evm/internal/t8ntool" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/debug" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index c9a870022a..0e431dd9a0 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -36,7 +36,7 @@ import ( "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/core/vm/runtime" "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/trie" "github.com/ethereum/go-ethereum/trie/triedb/hashdb" diff --git a/cmd/evm/t8n_test.go b/cmd/evm/t8n_test.go index ad36540de5..be554e3511 100644 --- a/cmd/evm/t8n_test.go +++ b/cmd/evm/t8n_test.go @@ -25,8 +25,8 @@ import ( "testing" "github.com/ethereum/go-ethereum/cmd/evm/internal/t8ntool" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/internal/reexec" + "github.com/ethereum/go-ethereum/lib/cmdtest" + "github.com/ethereum/go-ethereum/lib/reexec" ) func TestMain(m *testing.M) { diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 3b4f516af7..1ce85531d4 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -35,7 +35,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/node" diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 5f52f1df54..df67b39401 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -36,9 +36,9 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/eth/catalyst" "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/internal/version" + "github.com/ethereum/go-ethereum/lib/ethapi" + "github.com/ethereum/go-ethereum/lib/flags" + "github.com/ethereum/go-ethereum/lib/version" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/node" diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index 526ede9619..9295be2d01 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -22,7 +22,7 @@ import ( "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/dbcmd.go b/cmd/geth/dbcmd.go index c60147b862..2070b99f0c 100644 --- a/cmd/geth/dbcmd.go +++ b/cmd/geth/dbcmd.go @@ -35,7 +35,7 @@ import ( "github.com/ethereum/go-ethereum/core/state/snapshot" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/trie" "github.com/olekukonko/tablewriter" diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 0d5939bd20..9e290b75ab 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -33,9 +33,9 @@ import ( "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/eth/downloader" "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/debug" + "github.com/ethereum/go-ethereum/lib/ethapi" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/node" diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index f3530c30fb..5bca3e2dfe 100644 --- a/cmd/geth/misccmd.go +++ b/cmd/geth/misccmd.go @@ -22,7 +22,7 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/internal/version" + "github.com/ethereum/go-ethereum/lib/version" "github.com/ethereum/go-ethereum/params" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/run_test.go b/cmd/geth/run_test.go index 1d32880325..37a33f8442 100644 --- a/cmd/geth/run_test.go +++ b/cmd/geth/run_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/internal/reexec" + "github.com/ethereum/go-ethereum/lib/cmdtest" + "github.com/ethereum/go-ethereum/lib/reexec" "github.com/ethereum/go-ethereum/rpc" ) diff --git a/cmd/geth/snapshot.go b/cmd/geth/snapshot.go index 4284005a02..668105d52d 100644 --- a/cmd/geth/snapshot.go +++ b/cmd/geth/snapshot.go @@ -32,7 +32,7 @@ import ( "github.com/ethereum/go-ethereum/core/state/snapshot" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/trie" diff --git a/cmd/geth/verkle.go b/cmd/geth/verkle.go index 420b063d8b..3e161cb290 100644 --- a/cmd/geth/verkle.go +++ b/cmd/geth/verkle.go @@ -26,7 +26,7 @@ import ( "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/ethereum/go-ethereum/log" "github.com/gballet/go-verkle" cli "github.com/urfave/cli/v2" diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index a0f5f0d288..d9211ace31 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -45,7 +45,7 @@ import ( "text/tabwriter" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/simulations" diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 8b571be1ef..174f39c1fc 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -38,7 +38,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/eth/ethconfig" "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/debug" + "github.com/ethereum/go-ethereum/lib/debug" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/rlp" diff --git a/cmd/utils/flags_legacy.go b/cmd/utils/flags_legacy.go index 243abd8311..0570c7c8a1 100644 --- a/cmd/utils/flags_legacy.go +++ b/cmd/utils/flags_legacy.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/urfave/cli/v2" ) diff --git a/console/bridge.go b/console/bridge.go index 37578041ca..52e6f6339d 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -30,7 +30,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/usbwallet" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/internal/jsre" + "github.com/ethereum/go-ethereum/lib/jsre" "github.com/ethereum/go-ethereum/rpc" ) diff --git a/console/bridge_test.go b/console/bridge_test.go index e57e294fc5..dc2f6743c5 100644 --- a/console/bridge_test.go +++ b/console/bridge_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/internal/jsre" + "github.com/ethereum/go-ethereum/lib/jsre" ) // TestUndefinedAsParam ensures that personal functions can receive diff --git a/console/console.go b/console/console.go index cdee53684e..a94d321964 100644 --- a/console/console.go +++ b/console/console.go @@ -31,9 +31,9 @@ import ( "github.com/dop251/goja" "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/internal/jsre/deps" - "github.com/ethereum/go-ethereum/internal/web3ext" + "github.com/ethereum/go-ethereum/lib/jsre" + "github.com/ethereum/go-ethereum/lib/jsre/deps" + "github.com/ethereum/go-ethereum/lib/web3ext" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rpc" "github.com/mattn/go-colorable" diff --git a/console/console_test.go b/console/console_test.go index a13be6a99d..3b8fa45eff 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -30,7 +30,7 @@ import ( "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/internal/jsre" + "github.com/ethereum/go-ethereum/lib/jsre" "github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/node" ) diff --git a/core/blockchain.go b/core/blockchain.go index 2c572bc9c9..1b30cf2085 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -41,8 +41,8 @@ import ( "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/syncx" - "github.com/ethereum/go-ethereum/internal/version" + "github.com/ethereum/go-ethereum/lib/syncx" + "github.com/ethereum/go-ethereum/lib/version" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/params" diff --git a/core/rawdb/accessors_indexes_test.go b/core/rawdb/accessors_indexes_test.go index 124389ba7a..661655af20 100644 --- a/core/rawdb/accessors_indexes_test.go +++ b/core/rawdb/accessors_indexes_test.go @@ -24,7 +24,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/blocktest" + "github.com/ethereum/go-ethereum/lib/blocktest" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" ) diff --git a/core/types/block_test.go b/core/types/block_test.go index cf0b1dd85c..ed0e709f09 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -25,7 +25,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/blocktest" + "github.com/ethereum/go-ethereum/lib/blocktest" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" ) diff --git a/eth/api_debug.go b/eth/api_debug.go index dfb8182879..61432d2b35 100644 --- a/eth/api_debug.go +++ b/eth/api_debug.go @@ -29,7 +29,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/ethapi" + "github.com/ethereum/go-ethereum/lib/ethapi" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rpc" diff --git a/eth/backend.go b/eth/backend.go index 774ffaf248..82f1405d30 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -46,8 +46,8 @@ import ( "github.com/ethereum/go-ethereum/eth/protocols/snap" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/shutdowncheck" + "github.com/ethereum/go-ethereum/lib/ethapi" + "github.com/ethereum/go-ethereum/lib/shutdowncheck" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/node" diff --git a/eth/filters/api.go b/eth/filters/api.go index a4eaa9cec8..7d81c0f69d 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -29,7 +29,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" + "github.com/ethereum/go-ethereum/lib/ethapi" "github.com/ethereum/go-ethereum/rpc" ) diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index 27cad8826a..09b7661abe 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -37,7 +37,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" + "github.com/ethereum/go-ethereum/lib/ethapi" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rpc" ) diff --git a/eth/tracers/api.go b/eth/tracers/api.go index f2cc5e15e4..39eb9b079b 100644 --- a/eth/tracers/api.go +++ b/eth/tracers/api.go @@ -37,7 +37,7 @@ import ( "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/eth/tracers/logger" "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/ethapi" + "github.com/ethereum/go-ethereum/lib/ethapi" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" diff --git a/eth/tracers/api_test.go b/eth/tracers/api_test.go index c5566cd819..307d4eb927 100644 --- a/eth/tracers/api_test.go +++ b/eth/tracers/api_test.go @@ -39,7 +39,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/eth/tracers/logger" "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/ethapi" + "github.com/ethereum/go-ethereum/lib/ethapi" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rpc" "golang.org/x/exp/slices" diff --git a/graphql/graphql.go b/graphql/graphql.go index 96627db0cb..e6397c2f94 100644 --- a/graphql/graphql.go +++ b/graphql/graphql.go @@ -35,7 +35,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/internal/ethapi" + "github.com/ethereum/go-ethereum/lib/ethapi" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rpc" ) diff --git a/graphql/service.go b/graphql/service.go index 584165bdb8..5764aa1ec5 100644 --- a/graphql/service.go +++ b/graphql/service.go @@ -25,7 +25,7 @@ import ( "time" "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/internal/ethapi" + "github.com/ethereum/go-ethereum/lib/ethapi" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/rpc" "github.com/graph-gophers/graphql-go" diff --git a/internal/blocktest/test_hash.go b/lib/blocktest/test_hash.go similarity index 100% rename from internal/blocktest/test_hash.go rename to lib/blocktest/test_hash.go diff --git a/internal/build/archive.go b/lib/build/archive.go similarity index 100% rename from internal/build/archive.go rename to lib/build/archive.go diff --git a/internal/build/azure.go b/lib/build/azure.go similarity index 100% rename from internal/build/azure.go rename to lib/build/azure.go diff --git a/internal/build/download.go b/lib/build/download.go similarity index 100% rename from internal/build/download.go rename to lib/build/download.go diff --git a/internal/build/env.go b/lib/build/env.go similarity index 100% rename from internal/build/env.go rename to lib/build/env.go diff --git a/internal/build/gotool.go b/lib/build/gotool.go similarity index 100% rename from internal/build/gotool.go rename to lib/build/gotool.go diff --git a/internal/build/pgp.go b/lib/build/pgp.go similarity index 100% rename from internal/build/pgp.go rename to lib/build/pgp.go diff --git a/internal/build/util.go b/lib/build/util.go similarity index 100% rename from internal/build/util.go rename to lib/build/util.go diff --git a/internal/cmdtest/test_cmd.go b/lib/cmdtest/test_cmd.go similarity index 100% rename from internal/cmdtest/test_cmd.go rename to lib/cmdtest/test_cmd.go diff --git a/internal/debug/api.go b/lib/debug/api.go similarity index 100% rename from internal/debug/api.go rename to lib/debug/api.go diff --git a/internal/debug/flags.go b/lib/debug/flags.go similarity index 99% rename from internal/debug/flags.go rename to lib/debug/flags.go index 23e4745e8c..baa675a99e 100644 --- a/internal/debug/flags.go +++ b/lib/debug/flags.go @@ -26,7 +26,7 @@ import ( "path/filepath" "runtime" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/ethereum/go-ethereum/lib/flags" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/metrics/exp" diff --git a/internal/debug/loudpanic.go b/lib/debug/loudpanic.go similarity index 100% rename from internal/debug/loudpanic.go rename to lib/debug/loudpanic.go diff --git a/internal/debug/trace.go b/lib/debug/trace.go similarity index 100% rename from internal/debug/trace.go rename to lib/debug/trace.go diff --git a/internal/ethapi/addrlock.go b/lib/ethapi/addrlock.go similarity index 100% rename from internal/ethapi/addrlock.go rename to lib/ethapi/addrlock.go diff --git a/internal/ethapi/api.go b/lib/ethapi/api.go similarity index 100% rename from internal/ethapi/api.go rename to lib/ethapi/api.go diff --git a/internal/ethapi/api_test.go b/lib/ethapi/api_test.go similarity index 99% rename from internal/ethapi/api_test.go rename to lib/ethapi/api_test.go index d6ec028be2..15a27b0f0b 100644 --- a/internal/ethapi/api_test.go +++ b/lib/ethapi/api_test.go @@ -44,7 +44,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/blocktest" + "github.com/ethereum/go-ethereum/lib/blocktest" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rpc" "github.com/holiman/uint256" diff --git a/internal/ethapi/backend.go b/lib/ethapi/backend.go similarity index 100% rename from internal/ethapi/backend.go rename to lib/ethapi/backend.go diff --git a/internal/ethapi/dbapi.go b/lib/ethapi/dbapi.go similarity index 100% rename from internal/ethapi/dbapi.go rename to lib/ethapi/dbapi.go diff --git a/internal/ethapi/testdata/eth_getBlockByHash-hash-1.json b/lib/ethapi/testdata/eth_getBlockByHash-hash-1.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockByHash-hash-1.json rename to lib/ethapi/testdata/eth_getBlockByHash-hash-1.json diff --git a/internal/ethapi/testdata/eth_getBlockByHash-hash-empty-fullTx.json b/lib/ethapi/testdata/eth_getBlockByHash-hash-empty-fullTx.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockByHash-hash-empty-fullTx.json rename to lib/ethapi/testdata/eth_getBlockByHash-hash-empty-fullTx.json diff --git a/internal/ethapi/testdata/eth_getBlockByHash-hash-genesis.json b/lib/ethapi/testdata/eth_getBlockByHash-hash-genesis.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockByHash-hash-genesis.json rename to lib/ethapi/testdata/eth_getBlockByHash-hash-genesis.json diff --git a/internal/ethapi/testdata/eth_getBlockByHash-hash-latest-1-fullTx.json b/lib/ethapi/testdata/eth_getBlockByHash-hash-latest-1-fullTx.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockByHash-hash-latest-1-fullTx.json rename to lib/ethapi/testdata/eth_getBlockByHash-hash-latest-1-fullTx.json diff --git a/internal/ethapi/testdata/eth_getBlockByHash-hash-latest.json b/lib/ethapi/testdata/eth_getBlockByHash-hash-latest.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockByHash-hash-latest.json rename to lib/ethapi/testdata/eth_getBlockByHash-hash-latest.json diff --git a/internal/ethapi/testdata/eth_getBlockByHash-hash-pending-fullTx.json b/lib/ethapi/testdata/eth_getBlockByHash-hash-pending-fullTx.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockByHash-hash-pending-fullTx.json rename to lib/ethapi/testdata/eth_getBlockByHash-hash-pending-fullTx.json diff --git a/internal/ethapi/testdata/eth_getBlockByHash-hash-pending.json b/lib/ethapi/testdata/eth_getBlockByHash-hash-pending.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockByHash-hash-pending.json rename to lib/ethapi/testdata/eth_getBlockByHash-hash-pending.json diff --git a/internal/ethapi/testdata/eth_getBlockByNumber-number-0.json b/lib/ethapi/testdata/eth_getBlockByNumber-number-0.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockByNumber-number-0.json rename to lib/ethapi/testdata/eth_getBlockByNumber-number-0.json diff --git a/internal/ethapi/testdata/eth_getBlockByNumber-number-1.json b/lib/ethapi/testdata/eth_getBlockByNumber-number-1.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockByNumber-number-1.json rename to lib/ethapi/testdata/eth_getBlockByNumber-number-1.json diff --git a/internal/ethapi/testdata/eth_getBlockByNumber-number-latest+1.json b/lib/ethapi/testdata/eth_getBlockByNumber-number-latest+1.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockByNumber-number-latest+1.json rename to lib/ethapi/testdata/eth_getBlockByNumber-number-latest+1.json diff --git a/internal/ethapi/testdata/eth_getBlockByNumber-number-latest-1.json b/lib/ethapi/testdata/eth_getBlockByNumber-number-latest-1.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockByNumber-number-latest-1.json rename to lib/ethapi/testdata/eth_getBlockByNumber-number-latest-1.json diff --git a/internal/ethapi/testdata/eth_getBlockByNumber-tag-latest.json b/lib/ethapi/testdata/eth_getBlockByNumber-tag-latest.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockByNumber-tag-latest.json rename to lib/ethapi/testdata/eth_getBlockByNumber-tag-latest.json diff --git a/internal/ethapi/testdata/eth_getBlockByNumber-tag-pending-fullTx.json b/lib/ethapi/testdata/eth_getBlockByNumber-tag-pending-fullTx.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockByNumber-tag-pending-fullTx.json rename to lib/ethapi/testdata/eth_getBlockByNumber-tag-pending-fullTx.json diff --git a/internal/ethapi/testdata/eth_getBlockByNumber-tag-pending.json b/lib/ethapi/testdata/eth_getBlockByNumber-tag-pending.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockByNumber-tag-pending.json rename to lib/ethapi/testdata/eth_getBlockByNumber-tag-pending.json diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-block-notfound.json b/lib/ethapi/testdata/eth_getBlockReceipts-block-notfound.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockReceipts-block-notfound.json rename to lib/ethapi/testdata/eth_getBlockReceipts-block-notfound.json diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-block-with-blob-tx.json b/lib/ethapi/testdata/eth_getBlockReceipts-block-with-blob-tx.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockReceipts-block-with-blob-tx.json rename to lib/ethapi/testdata/eth_getBlockReceipts-block-with-blob-tx.json diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-block-with-contract-create-tx.json b/lib/ethapi/testdata/eth_getBlockReceipts-block-with-contract-create-tx.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockReceipts-block-with-contract-create-tx.json rename to lib/ethapi/testdata/eth_getBlockReceipts-block-with-contract-create-tx.json diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-block-with-dynamic-fee-tx.json b/lib/ethapi/testdata/eth_getBlockReceipts-block-with-dynamic-fee-tx.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockReceipts-block-with-dynamic-fee-tx.json rename to lib/ethapi/testdata/eth_getBlockReceipts-block-with-dynamic-fee-tx.json diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-contract-call-tx.json b/lib/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-contract-call-tx.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-contract-call-tx.json rename to lib/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-contract-call-tx.json diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-transfer-tx.json b/lib/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-transfer-tx.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-transfer-tx.json rename to lib/ethapi/testdata/eth_getBlockReceipts-block-with-legacy-transfer-tx.json diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-hash-empty.json b/lib/ethapi/testdata/eth_getBlockReceipts-hash-empty.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockReceipts-hash-empty.json rename to lib/ethapi/testdata/eth_getBlockReceipts-hash-empty.json diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-hash-notfound.json b/lib/ethapi/testdata/eth_getBlockReceipts-hash-notfound.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockReceipts-hash-notfound.json rename to lib/ethapi/testdata/eth_getBlockReceipts-hash-notfound.json diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-number-0.json b/lib/ethapi/testdata/eth_getBlockReceipts-number-0.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockReceipts-number-0.json rename to lib/ethapi/testdata/eth_getBlockReceipts-number-0.json diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-number-1.json b/lib/ethapi/testdata/eth_getBlockReceipts-number-1.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockReceipts-number-1.json rename to lib/ethapi/testdata/eth_getBlockReceipts-number-1.json diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-tag-earliest.json b/lib/ethapi/testdata/eth_getBlockReceipts-tag-earliest.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockReceipts-tag-earliest.json rename to lib/ethapi/testdata/eth_getBlockReceipts-tag-earliest.json diff --git a/internal/ethapi/testdata/eth_getBlockReceipts-tag-latest.json b/lib/ethapi/testdata/eth_getBlockReceipts-tag-latest.json similarity index 100% rename from internal/ethapi/testdata/eth_getBlockReceipts-tag-latest.json rename to lib/ethapi/testdata/eth_getBlockReceipts-tag-latest.json diff --git a/internal/ethapi/testdata/eth_getHeaderByHash-hash-0.json b/lib/ethapi/testdata/eth_getHeaderByHash-hash-0.json similarity index 100% rename from internal/ethapi/testdata/eth_getHeaderByHash-hash-0.json rename to lib/ethapi/testdata/eth_getHeaderByHash-hash-0.json diff --git a/internal/ethapi/testdata/eth_getHeaderByHash-hash-1.json b/lib/ethapi/testdata/eth_getHeaderByHash-hash-1.json similarity index 100% rename from internal/ethapi/testdata/eth_getHeaderByHash-hash-1.json rename to lib/ethapi/testdata/eth_getHeaderByHash-hash-1.json diff --git a/internal/ethapi/testdata/eth_getHeaderByHash-hash-empty.json b/lib/ethapi/testdata/eth_getHeaderByHash-hash-empty.json similarity index 100% rename from internal/ethapi/testdata/eth_getHeaderByHash-hash-empty.json rename to lib/ethapi/testdata/eth_getHeaderByHash-hash-empty.json diff --git a/internal/ethapi/testdata/eth_getHeaderByHash-hash-latest-1.json b/lib/ethapi/testdata/eth_getHeaderByHash-hash-latest-1.json similarity index 100% rename from internal/ethapi/testdata/eth_getHeaderByHash-hash-latest-1.json rename to lib/ethapi/testdata/eth_getHeaderByHash-hash-latest-1.json diff --git a/internal/ethapi/testdata/eth_getHeaderByHash-hash-latest.json b/lib/ethapi/testdata/eth_getHeaderByHash-hash-latest.json similarity index 100% rename from internal/ethapi/testdata/eth_getHeaderByHash-hash-latest.json rename to lib/ethapi/testdata/eth_getHeaderByHash-hash-latest.json diff --git a/internal/ethapi/testdata/eth_getHeaderByHash-hash-pending.json b/lib/ethapi/testdata/eth_getHeaderByHash-hash-pending.json similarity index 100% rename from internal/ethapi/testdata/eth_getHeaderByHash-hash-pending.json rename to lib/ethapi/testdata/eth_getHeaderByHash-hash-pending.json diff --git a/internal/ethapi/testdata/eth_getHeaderByNumber-number-0.json b/lib/ethapi/testdata/eth_getHeaderByNumber-number-0.json similarity index 100% rename from internal/ethapi/testdata/eth_getHeaderByNumber-number-0.json rename to lib/ethapi/testdata/eth_getHeaderByNumber-number-0.json diff --git a/internal/ethapi/testdata/eth_getHeaderByNumber-number-1.json b/lib/ethapi/testdata/eth_getHeaderByNumber-number-1.json similarity index 100% rename from internal/ethapi/testdata/eth_getHeaderByNumber-number-1.json rename to lib/ethapi/testdata/eth_getHeaderByNumber-number-1.json diff --git a/internal/ethapi/testdata/eth_getHeaderByNumber-number-latest+1.json b/lib/ethapi/testdata/eth_getHeaderByNumber-number-latest+1.json similarity index 100% rename from internal/ethapi/testdata/eth_getHeaderByNumber-number-latest+1.json rename to lib/ethapi/testdata/eth_getHeaderByNumber-number-latest+1.json diff --git a/internal/ethapi/testdata/eth_getHeaderByNumber-number-latest-1.json b/lib/ethapi/testdata/eth_getHeaderByNumber-number-latest-1.json similarity index 100% rename from internal/ethapi/testdata/eth_getHeaderByNumber-number-latest-1.json rename to lib/ethapi/testdata/eth_getHeaderByNumber-number-latest-1.json diff --git a/internal/ethapi/testdata/eth_getHeaderByNumber-tag-latest.json b/lib/ethapi/testdata/eth_getHeaderByNumber-tag-latest.json similarity index 100% rename from internal/ethapi/testdata/eth_getHeaderByNumber-tag-latest.json rename to lib/ethapi/testdata/eth_getHeaderByNumber-tag-latest.json diff --git a/internal/ethapi/testdata/eth_getHeaderByNumber-tag-pending.json b/lib/ethapi/testdata/eth_getHeaderByNumber-tag-pending.json similarity index 100% rename from internal/ethapi/testdata/eth_getHeaderByNumber-tag-pending.json rename to lib/ethapi/testdata/eth_getHeaderByNumber-tag-pending.json diff --git a/internal/ethapi/testdata/eth_getTransactionReceipt-blob-tx.json b/lib/ethapi/testdata/eth_getTransactionReceipt-blob-tx.json similarity index 100% rename from internal/ethapi/testdata/eth_getTransactionReceipt-blob-tx.json rename to lib/ethapi/testdata/eth_getTransactionReceipt-blob-tx.json diff --git a/internal/ethapi/testdata/eth_getTransactionReceipt-create-contract-tx.json b/lib/ethapi/testdata/eth_getTransactionReceipt-create-contract-tx.json similarity index 100% rename from internal/ethapi/testdata/eth_getTransactionReceipt-create-contract-tx.json rename to lib/ethapi/testdata/eth_getTransactionReceipt-create-contract-tx.json diff --git a/internal/ethapi/testdata/eth_getTransactionReceipt-create-contract-with-access-list.json b/lib/ethapi/testdata/eth_getTransactionReceipt-create-contract-with-access-list.json similarity index 100% rename from internal/ethapi/testdata/eth_getTransactionReceipt-create-contract-with-access-list.json rename to lib/ethapi/testdata/eth_getTransactionReceipt-create-contract-with-access-list.json diff --git a/internal/ethapi/testdata/eth_getTransactionReceipt-dynamic-tx-with-logs.json b/lib/ethapi/testdata/eth_getTransactionReceipt-dynamic-tx-with-logs.json similarity index 100% rename from internal/ethapi/testdata/eth_getTransactionReceipt-dynamic-tx-with-logs.json rename to lib/ethapi/testdata/eth_getTransactionReceipt-dynamic-tx-with-logs.json diff --git a/internal/ethapi/testdata/eth_getTransactionReceipt-normal-transfer-tx.json b/lib/ethapi/testdata/eth_getTransactionReceipt-normal-transfer-tx.json similarity index 100% rename from internal/ethapi/testdata/eth_getTransactionReceipt-normal-transfer-tx.json rename to lib/ethapi/testdata/eth_getTransactionReceipt-normal-transfer-tx.json diff --git a/internal/ethapi/testdata/eth_getTransactionReceipt-txhash-empty.json b/lib/ethapi/testdata/eth_getTransactionReceipt-txhash-empty.json similarity index 100% rename from internal/ethapi/testdata/eth_getTransactionReceipt-txhash-empty.json rename to lib/ethapi/testdata/eth_getTransactionReceipt-txhash-empty.json diff --git a/internal/ethapi/testdata/eth_getTransactionReceipt-txhash-notfound.json b/lib/ethapi/testdata/eth_getTransactionReceipt-txhash-notfound.json similarity index 100% rename from internal/ethapi/testdata/eth_getTransactionReceipt-txhash-notfound.json rename to lib/ethapi/testdata/eth_getTransactionReceipt-txhash-notfound.json diff --git a/internal/ethapi/testdata/eth_getTransactionReceipt-with-logs.json b/lib/ethapi/testdata/eth_getTransactionReceipt-with-logs.json similarity index 100% rename from internal/ethapi/testdata/eth_getTransactionReceipt-with-logs.json rename to lib/ethapi/testdata/eth_getTransactionReceipt-with-logs.json diff --git a/internal/ethapi/transaction_args.go b/lib/ethapi/transaction_args.go similarity index 100% rename from internal/ethapi/transaction_args.go rename to lib/ethapi/transaction_args.go diff --git a/internal/ethapi/transaction_args_test.go b/lib/ethapi/transaction_args_test.go similarity index 100% rename from internal/ethapi/transaction_args_test.go rename to lib/ethapi/transaction_args_test.go diff --git a/internal/flags/categories.go b/lib/flags/categories.go similarity index 100% rename from internal/flags/categories.go rename to lib/flags/categories.go diff --git a/internal/flags/flags.go b/lib/flags/flags.go similarity index 100% rename from internal/flags/flags.go rename to lib/flags/flags.go diff --git a/internal/flags/flags_test.go b/lib/flags/flags_test.go similarity index 100% rename from internal/flags/flags_test.go rename to lib/flags/flags_test.go diff --git a/internal/flags/helpers.go b/lib/flags/helpers.go similarity index 99% rename from internal/flags/helpers.go rename to lib/flags/helpers.go index d4b8e373cc..26687b9e93 100644 --- a/internal/flags/helpers.go +++ b/lib/flags/helpers.go @@ -23,7 +23,7 @@ import ( "sort" "strings" - "github.com/ethereum/go-ethereum/internal/version" + "github.com/ethereum/go-ethereum/lib/version" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" "github.com/mattn/go-isatty" diff --git a/internal/guide/guide.go b/lib/guide/guide.go similarity index 100% rename from internal/guide/guide.go rename to lib/guide/guide.go diff --git a/internal/guide/guide_test.go b/lib/guide/guide_test.go similarity index 100% rename from internal/guide/guide_test.go rename to lib/guide/guide_test.go diff --git a/internal/jsre/completion.go b/lib/jsre/completion.go similarity index 100% rename from internal/jsre/completion.go rename to lib/jsre/completion.go diff --git a/internal/jsre/completion_test.go b/lib/jsre/completion_test.go similarity index 100% rename from internal/jsre/completion_test.go rename to lib/jsre/completion_test.go diff --git a/internal/jsre/deps/bignumber.js b/lib/jsre/deps/bignumber.js similarity index 100% rename from internal/jsre/deps/bignumber.js rename to lib/jsre/deps/bignumber.js diff --git a/internal/jsre/deps/deps.go b/lib/jsre/deps/deps.go similarity index 100% rename from internal/jsre/deps/deps.go rename to lib/jsre/deps/deps.go diff --git a/internal/jsre/deps/web3.js b/lib/jsre/deps/web3.js similarity index 100% rename from internal/jsre/deps/web3.js rename to lib/jsre/deps/web3.js diff --git a/internal/jsre/jsre.go b/lib/jsre/jsre.go similarity index 100% rename from internal/jsre/jsre.go rename to lib/jsre/jsre.go diff --git a/internal/jsre/jsre_test.go b/lib/jsre/jsre_test.go similarity index 100% rename from internal/jsre/jsre_test.go rename to lib/jsre/jsre_test.go diff --git a/internal/jsre/pretty.go b/lib/jsre/pretty.go similarity index 100% rename from internal/jsre/pretty.go rename to lib/jsre/pretty.go diff --git a/internal/reexec/reexec.go b/lib/reexec/reexec.go similarity index 100% rename from internal/reexec/reexec.go rename to lib/reexec/reexec.go diff --git a/internal/reexec/self_linux.go b/lib/reexec/self_linux.go similarity index 100% rename from internal/reexec/self_linux.go rename to lib/reexec/self_linux.go diff --git a/internal/reexec/self_others.go b/lib/reexec/self_others.go similarity index 100% rename from internal/reexec/self_others.go rename to lib/reexec/self_others.go diff --git a/internal/shutdowncheck/shutdown_tracker.go b/lib/shutdowncheck/shutdown_tracker.go similarity index 100% rename from internal/shutdowncheck/shutdown_tracker.go rename to lib/shutdowncheck/shutdown_tracker.go diff --git a/internal/syncx/mutex.go b/lib/syncx/mutex.go similarity index 100% rename from internal/syncx/mutex.go rename to lib/syncx/mutex.go diff --git a/internal/testlog/testlog.go b/lib/testlog/testlog.go similarity index 100% rename from internal/testlog/testlog.go rename to lib/testlog/testlog.go diff --git a/internal/utesting/utesting.go b/lib/utesting/utesting.go similarity index 100% rename from internal/utesting/utesting.go rename to lib/utesting/utesting.go diff --git a/internal/utesting/utesting_test.go b/lib/utesting/utesting_test.go similarity index 100% rename from internal/utesting/utesting_test.go rename to lib/utesting/utesting_test.go diff --git a/internal/version/vcs.go b/lib/version/vcs.go similarity index 100% rename from internal/version/vcs.go rename to lib/version/vcs.go diff --git a/internal/version/version.go b/lib/version/version.go similarity index 100% rename from internal/version/version.go rename to lib/version/version.go diff --git a/internal/web3ext/web3ext.go b/lib/web3ext/web3ext.go similarity index 100% rename from internal/web3ext/web3ext.go rename to lib/web3ext/web3ext.go diff --git a/node/api.go b/node/api.go index f81f394beb..ee04fcb578 100644 --- a/node/api.go +++ b/node/api.go @@ -23,7 +23,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/debug" + "github.com/ethereum/go-ethereum/lib/debug" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" diff --git a/node/rpcstack_test.go b/node/rpcstack_test.go index e41cc51ad3..f2d4fff518 100644 --- a/node/rpcstack_test.go +++ b/node/rpcstack_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/testlog" + "github.com/ethereum/go-ethereum/lib/testlog" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rpc" "github.com/golang-jwt/jwt/v4" diff --git a/p2p/dial_test.go b/p2p/dial_test.go index 13908f11ea..1e1356d80c 100644 --- a/p2p/dial_test.go +++ b/p2p/dial_test.go @@ -28,7 +28,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/internal/testlog" + "github.com/ethereum/go-ethereum/lib/testlog" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/netutil" diff --git a/p2p/discover/v4_udp_test.go b/p2p/discover/v4_udp_test.go index 53ecb1bc6e..8ef2d746dd 100644 --- a/p2p/discover/v4_udp_test.go +++ b/p2p/discover/v4_udp_test.go @@ -31,7 +31,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/testlog" + "github.com/ethereum/go-ethereum/lib/testlog" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/p2p/discover/v4wire" "github.com/ethereum/go-ethereum/p2p/enode" diff --git a/p2p/discover/v5_udp_test.go b/p2p/discover/v5_udp_test.go index 18d8aeac6d..98007faf2e 100644 --- a/p2p/discover/v5_udp_test.go +++ b/p2p/discover/v5_udp_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/testlog" + "github.com/ethereum/go-ethereum/lib/testlog" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/p2p/discover/v5wire" "github.com/ethereum/go-ethereum/p2p/enode" diff --git a/p2p/dnsdisc/client_test.go b/p2p/dnsdisc/client_test.go index abc35ddbd3..79d86ef76d 100644 --- a/p2p/dnsdisc/client_test.go +++ b/p2p/dnsdisc/client_test.go @@ -28,7 +28,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/mclock" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/testlog" + "github.com/ethereum/go-ethereum/lib/testlog" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enr" diff --git a/p2p/server_nat_test.go b/p2p/server_nat_test.go index de935fcfc5..50a01a5930 100644 --- a/p2p/server_nat_test.go +++ b/p2p/server_nat_test.go @@ -23,7 +23,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/internal/testlog" + "github.com/ethereum/go-ethereum/lib/testlog" "github.com/ethereum/go-ethereum/log" ) diff --git a/p2p/server_test.go b/p2p/server_test.go index a0491e984a..cc9cc3ad1e 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -30,7 +30,7 @@ import ( "time" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/testlog" + "github.com/ethereum/go-ethereum/lib/testlog" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enr" diff --git a/signer/core/api.go b/signer/core/api.go index 43eb89ee00..e8d034ffdb 100644 --- a/signer/core/api.go +++ b/signer/core/api.go @@ -33,7 +33,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/internal/ethapi" + "github.com/ethereum/go-ethereum/lib/ethapi" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/signer/core/apitypes" diff --git a/signer/core/api_test.go b/signer/core/api_test.go index 69229dadaf..66684febdf 100644 --- a/signer/core/api_test.go +++ b/signer/core/api_test.go @@ -31,7 +31,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" + "github.com/ethereum/go-ethereum/lib/ethapi" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/signer/core" "github.com/ethereum/go-ethereum/signer/core/apitypes" diff --git a/signer/core/auditlog.go b/signer/core/auditlog.go index d2207c9eb8..ba59c4a446 100644 --- a/signer/core/auditlog.go +++ b/signer/core/auditlog.go @@ -23,7 +23,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/internal/ethapi" + "github.com/ethereum/go-ethereum/lib/ethapi" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/signer/core/apitypes" "golang.org/x/exp/slog" diff --git a/signer/core/cliui.go b/signer/core/cliui.go index b1bd3206ed..ed4507f604 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -27,7 +27,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/internal/ethapi" + "github.com/ethereum/go-ethereum/lib/ethapi" "github.com/ethereum/go-ethereum/log" ) diff --git a/signer/core/stdioui.go b/signer/core/stdioui.go index a0ce684417..bc5fa404b4 100644 --- a/signer/core/stdioui.go +++ b/signer/core/stdioui.go @@ -19,7 +19,7 @@ package core import ( "context" - "github.com/ethereum/go-ethereum/internal/ethapi" + "github.com/ethereum/go-ethereum/lib/ethapi" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rpc" ) diff --git a/signer/rules/rules.go b/signer/rules/rules.go index c9921e57a9..d1d925e5f5 100644 --- a/signer/rules/rules.go +++ b/signer/rules/rules.go @@ -24,8 +24,8 @@ import ( "strings" "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/jsre/deps" + "github.com/ethereum/go-ethereum/lib/ethapi" + "github.com/ethereum/go-ethereum/lib/jsre/deps" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/signer/core" "github.com/ethereum/go-ethereum/signer/storage" diff --git a/signer/rules/rules_test.go b/signer/rules/rules_test.go index d27de22b29..2c13d8e5b0 100644 --- a/signer/rules/rules_test.go +++ b/signer/rules/rules_test.go @@ -26,7 +26,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" + "github.com/ethereum/go-ethereum/lib/ethapi" "github.com/ethereum/go-ethereum/signer/core" "github.com/ethereum/go-ethereum/signer/core/apitypes" "github.com/ethereum/go-ethereum/signer/storage"