diff --git a/cmd/bee/cmd/cmd.go b/cmd/bee/cmd/cmd.go index 9ca1bb2d90d..7082adf4d19 100644 --- a/cmd/bee/cmd/cmd.go +++ b/cmd/bee/cmd/cmd.go @@ -13,10 +13,10 @@ import ( "strings" "time" - chaincfg "github.com/ethersphere/bee/pkg/config" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/node" - "github.com/ethersphere/bee/pkg/swarm" + chaincfg "github.com/ethersphere/bee/v2/pkg/config" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/node" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/bee/cmd/cmd_test.go b/cmd/bee/cmd/cmd_test.go index 7844e4eb342..e7a8cfdb11d 100644 --- a/cmd/bee/cmd/cmd_test.go +++ b/cmd/bee/cmd/cmd_test.go @@ -9,7 +9,7 @@ import ( "os" "testing" - "github.com/ethersphere/bee/cmd/bee/cmd" + "github.com/ethersphere/bee/v2/cmd/bee/cmd" ) var homeDir string diff --git a/cmd/bee/cmd/db.go b/cmd/bee/cmd/db.go index ec94ff7f6d8..882aa02f3b0 100644 --- a/cmd/bee/cmd/db.go +++ b/cmd/bee/cmd/db.go @@ -18,11 +18,11 @@ import ( "strings" "time" - "github.com/ethersphere/bee/pkg/node" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/node" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/spf13/cobra" ) diff --git a/cmd/bee/cmd/db_test.go b/cmd/bee/cmd/db_test.go index 02dcb66b571..3b07d3bf1ea 100644 --- a/cmd/bee/cmd/db_test.go +++ b/cmd/bee/cmd/db_test.go @@ -12,15 +12,15 @@ import ( "strings" "testing" - "github.com/ethersphere/bee/cmd/bee/cmd" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/node" - "github.com/ethersphere/bee/pkg/postage" - storagetest "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" - kademlia "github.com/ethersphere/bee/pkg/topology/mock" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/cmd/bee/cmd" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/node" + "github.com/ethersphere/bee/v2/pkg/postage" + storagetest "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" + kademlia "github.com/ethersphere/bee/v2/pkg/topology/mock" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) func TestDBExportImport(t *testing.T) { diff --git a/cmd/bee/cmd/deploy.go b/cmd/bee/cmd/deploy.go index 7b3e8e57734..988918bd074 100644 --- a/cmd/bee/cmd/deploy.go +++ b/cmd/bee/cmd/deploy.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" - "github.com/ethersphere/bee/pkg/node" - "github.com/ethersphere/bee/pkg/settlement/swap/erc20" + "github.com/ethersphere/bee/v2/pkg/node" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20" "github.com/spf13/cobra" ) diff --git a/cmd/bee/cmd/init.go b/cmd/bee/cmd/init.go index ea56381eea9..3df6b7aeb18 100644 --- a/cmd/bee/cmd/init.go +++ b/cmd/bee/cmd/init.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/ethersphere/bee/pkg/node" + "github.com/ethersphere/bee/v2/pkg/node" "github.com/spf13/cobra" ) diff --git a/cmd/bee/cmd/split.go b/cmd/bee/cmd/split.go index cee464b0d1a..e5db047a43e 100644 --- a/cmd/bee/cmd/split.go +++ b/cmd/bee/cmd/split.go @@ -13,10 +13,10 @@ import ( "strings" "sync/atomic" - "github.com/ethersphere/bee/pkg/file/pipeline/builder" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/builder" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/spf13/cobra" ) diff --git a/cmd/bee/cmd/split_test.go b/cmd/bee/cmd/split_test.go index 3dde5c386f2..4e819d6f46e 100644 --- a/cmd/bee/cmd/split_test.go +++ b/cmd/bee/cmd/split_test.go @@ -17,12 +17,12 @@ import ( "sync" "testing" - "github.com/ethersphere/bee/cmd/bee/cmd" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/file/pipeline/builder" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/cmd/bee/cmd" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/builder" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestDBSplitRefs(t *testing.T) { diff --git a/cmd/bee/cmd/start.go b/cmd/bee/cmd/start.go index 347597eaf0b..4e967285428 100644 --- a/cmd/bee/cmd/start.go +++ b/cmd/bee/cmd/start.go @@ -23,18 +23,18 @@ import ( "github.com/ethereum/go-ethereum/accounts/external" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/rpc" - "github.com/ethersphere/bee" - chaincfg "github.com/ethersphere/bee/pkg/config" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/crypto/clef" - "github.com/ethersphere/bee/pkg/keystore" - filekeystore "github.com/ethersphere/bee/pkg/keystore/file" - memkeystore "github.com/ethersphere/bee/pkg/keystore/mem" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/node" - "github.com/ethersphere/bee/pkg/resolver/multiresolver" - "github.com/ethersphere/bee/pkg/spinlock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2" + chaincfg "github.com/ethersphere/bee/v2/pkg/config" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/crypto/clef" + "github.com/ethersphere/bee/v2/pkg/keystore" + filekeystore "github.com/ethersphere/bee/v2/pkg/keystore/file" + memkeystore "github.com/ethersphere/bee/v2/pkg/keystore/mem" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/node" + "github.com/ethersphere/bee/v2/pkg/resolver/multiresolver" + "github.com/ethersphere/bee/v2/pkg/spinlock" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/kardianos/service" "github.com/spf13/cobra" ) diff --git a/cmd/bee/cmd/start_dev.go b/cmd/bee/cmd/start_dev.go index 39b9e32d35b..a372094bf20 100644 --- a/cmd/bee/cmd/start_dev.go +++ b/cmd/bee/cmd/start_dev.go @@ -11,7 +11,7 @@ import ( "strings" "syscall" - "github.com/ethersphere/bee/pkg/node" + "github.com/ethersphere/bee/v2/pkg/node" "github.com/kardianos/service" "github.com/spf13/cobra" ) diff --git a/cmd/bee/cmd/start_unix.go b/cmd/bee/cmd/start_unix.go index e50f8e54bfb..19e3d5b7807 100644 --- a/cmd/bee/cmd/start_unix.go +++ b/cmd/bee/cmd/start_unix.go @@ -9,7 +9,7 @@ package cmd import ( "errors" - "github.com/ethersphere/bee/pkg/log" + "github.com/ethersphere/bee/v2/pkg/log" ) func isWindowsService() (bool, error) { diff --git a/cmd/bee/cmd/start_windows.go b/cmd/bee/cmd/start_windows.go index 419cc3f7eb0..3153e80041c 100644 --- a/cmd/bee/cmd/start_windows.go +++ b/cmd/bee/cmd/start_windows.go @@ -13,7 +13,7 @@ import ( "golang.org/x/sys/windows/svc/debug" "golang.org/x/sys/windows/svc/eventlog" - "github.com/ethersphere/bee/pkg/log" + "github.com/ethersphere/bee/v2/pkg/log" ) func isWindowsService() (bool, error) { diff --git a/cmd/bee/cmd/timebomb.go b/cmd/bee/cmd/timebomb.go index c1013795757..f53f74627c3 100644 --- a/cmd/bee/cmd/timebomb.go +++ b/cmd/bee/cmd/timebomb.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - "github.com/ethersphere/bee" - "github.com/ethersphere/bee/pkg/log" + "github.com/ethersphere/bee/v2" + "github.com/ethersphere/bee/v2/pkg/log" ) const ( diff --git a/cmd/bee/cmd/version.go b/cmd/bee/cmd/version.go index c438838f13d..d5ea260d859 100644 --- a/cmd/bee/cmd/version.go +++ b/cmd/bee/cmd/version.go @@ -5,7 +5,7 @@ package cmd import ( - "github.com/ethersphere/bee" + "github.com/ethersphere/bee/v2" "github.com/spf13/cobra" ) diff --git a/cmd/bee/cmd/version_test.go b/cmd/bee/cmd/version_test.go index 9bbc327bf6f..982e5e0edcf 100644 --- a/cmd/bee/cmd/version_test.go +++ b/cmd/bee/cmd/version_test.go @@ -8,8 +8,8 @@ import ( "bytes" "testing" - "github.com/ethersphere/bee" - "github.com/ethersphere/bee/cmd/bee/cmd" + "github.com/ethersphere/bee/v2" + "github.com/ethersphere/bee/v2/cmd/bee/cmd" ) func TestVersionCmd(t *testing.T) { diff --git a/cmd/bee/main.go b/cmd/bee/main.go index 575ffeb4498..a7b953b8cd0 100644 --- a/cmd/bee/main.go +++ b/cmd/bee/main.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "github.com/ethersphere/bee/cmd/bee/cmd" + "github.com/ethersphere/bee/v2/cmd/bee/cmd" ) func main() { diff --git a/go.mod b/go.mod index 16cc62a0a2b..2bb64394f18 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ethersphere/bee +module github.com/ethersphere/bee/v2 go 1.21 diff --git a/pkg/accounting/accounting.go b/pkg/accounting/accounting.go index 787e794b865..5e92596c94f 100644 --- a/pkg/accounting/accounting.go +++ b/pkg/accounting/accounting.go @@ -15,12 +15,12 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/pricing" - "github.com/ethersphere/bee/pkg/settlement/pseudosettle" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/pricing" + "github.com/ethersphere/bee/v2/pkg/settlement/pseudosettle" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // loggerName is the tree path name of the logger for this package. diff --git a/pkg/accounting/accounting_test.go b/pkg/accounting/accounting_test.go index f240325f944..509b5e5e14b 100644 --- a/pkg/accounting/accounting_test.go +++ b/pkg/accounting/accounting_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/accounting" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - p2pmock "github.com/ethersphere/bee/pkg/p2p/mock" - "github.com/ethersphere/bee/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/accounting" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + p2pmock "github.com/ethersphere/bee/v2/pkg/p2p/mock" + "github.com/ethersphere/bee/v2/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const ( diff --git a/pkg/accounting/export_test.go b/pkg/accounting/export_test.go index 85046388c9a..5358b288067 100644 --- a/pkg/accounting/export_test.go +++ b/pkg/accounting/export_test.go @@ -7,7 +7,7 @@ package accounting import ( "time" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func (a *Accounting) SetTimeNow(f func() time.Time) { diff --git a/pkg/accounting/metrics.go b/pkg/accounting/metrics.go index 573bab6ed29..e38bdbbd989 100644 --- a/pkg/accounting/metrics.go +++ b/pkg/accounting/metrics.go @@ -5,7 +5,7 @@ package accounting import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/accounting/mock/accounting.go b/pkg/accounting/mock/accounting.go index 14f0bb9189f..e5e0d98130e 100644 --- a/pkg/accounting/mock/accounting.go +++ b/pkg/accounting/mock/accounting.go @@ -11,8 +11,8 @@ import ( "math/big" "sync" - "github.com/ethersphere/bee/pkg/accounting" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/accounting" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // Service is the mock Accounting service. diff --git a/pkg/addressbook/addressbook.go b/pkg/addressbook/addressbook.go index 3a2eba66493..eafba314d09 100644 --- a/pkg/addressbook/addressbook.go +++ b/pkg/addressbook/addressbook.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - "github.com/ethersphere/bee/pkg/bzz" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bzz" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const keyPrefix = "addressbook_entry_" diff --git a/pkg/addressbook/addressbook_test.go b/pkg/addressbook/addressbook_test.go index 360d7c197f9..1b5c22490b5 100644 --- a/pkg/addressbook/addressbook_test.go +++ b/pkg/addressbook/addressbook_test.go @@ -9,11 +9,11 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/addressbook" - "github.com/ethersphere/bee/pkg/bzz" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/addressbook" + "github.com/ethersphere/bee/v2/pkg/bzz" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" ma "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/api/accounting.go b/pkg/api/accounting.go index ad8b476fc35..fce1056bbb7 100644 --- a/pkg/api/accounting.go +++ b/pkg/api/accounting.go @@ -7,8 +7,8 @@ package api import ( "net/http" - "github.com/ethersphere/bee/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" ) const ( diff --git a/pkg/api/accounting_test.go b/pkg/api/accounting_test.go index a5e8c28aff9..7a807aa811e 100644 --- a/pkg/api/accounting_test.go +++ b/pkg/api/accounting_test.go @@ -11,12 +11,12 @@ import ( "reflect" "testing" - "github.com/ethersphere/bee/pkg/accounting" - "github.com/ethersphere/bee/pkg/accounting/mock" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/accounting" + "github.com/ethersphere/bee/v2/pkg/accounting/mock" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" ) func TestAccountingInfo(t *testing.T) { diff --git a/pkg/api/api.go b/pkg/api/api.go index 25ef0802692..72100cc0d9b 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -27,38 +27,38 @@ import ( "unicode/utf8" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/accounting" - "github.com/ethersphere/bee/pkg/auth" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/feeds" - "github.com/ethersphere/bee/pkg/file/pipeline" - "github.com/ethersphere/bee/pkg/file/pipeline/builder" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/pingpong" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/postage/postagecontract" - "github.com/ethersphere/bee/pkg/pss" - "github.com/ethersphere/bee/pkg/resolver" - "github.com/ethersphere/bee/pkg/resolver/client/ens" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/settlement" - "github.com/ethersphere/bee/pkg/settlement/swap" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" - "github.com/ethersphere/bee/pkg/settlement/swap/erc20" - "github.com/ethersphere/bee/pkg/status" - "github.com/ethersphere/bee/pkg/steward" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storageincentives" - "github.com/ethersphere/bee/pkg/storageincentives/staking" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/topology/lightnode" - "github.com/ethersphere/bee/pkg/tracing" - "github.com/ethersphere/bee/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/accounting" + "github.com/ethersphere/bee/v2/pkg/auth" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/feeds" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/builder" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/pingpong" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage/postagecontract" + "github.com/ethersphere/bee/v2/pkg/pss" + "github.com/ethersphere/bee/v2/pkg/resolver" + "github.com/ethersphere/bee/v2/pkg/resolver/client/ens" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/settlement" + "github.com/ethersphere/bee/v2/pkg/settlement/swap" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20" + "github.com/ethersphere/bee/v2/pkg/status" + "github.com/ethersphere/bee/v2/pkg/steward" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storageincentives" + "github.com/ethersphere/bee/v2/pkg/storageincentives/staking" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/topology/lightnode" + "github.com/ethersphere/bee/v2/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/transaction" "github.com/go-playground/validator/v10" "github.com/gorilla/mux" "github.com/hashicorp/go-multierror" diff --git a/pkg/api/api_test.go b/pkg/api/api_test.go index 9673cb0a25e..164709b7ca9 100644 --- a/pkg/api/api_test.go +++ b/pkg/api/api_test.go @@ -23,53 +23,53 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - accountingmock "github.com/ethersphere/bee/pkg/accounting/mock" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/auth" - mockauth "github.com/ethersphere/bee/pkg/auth/mock" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/feeds" - "github.com/ethersphere/bee/pkg/file/pipeline" - "github.com/ethersphere/bee/pkg/file/pipeline/builder" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/log" - p2pmock "github.com/ethersphere/bee/pkg/p2p/mock" - "github.com/ethersphere/bee/pkg/pingpong" - "github.com/ethersphere/bee/pkg/postage" - mockbatchstore "github.com/ethersphere/bee/pkg/postage/batchstore/mock" - mockpost "github.com/ethersphere/bee/pkg/postage/mock" - "github.com/ethersphere/bee/pkg/postage/postagecontract" - contractMock "github.com/ethersphere/bee/pkg/postage/postagecontract/mock" - "github.com/ethersphere/bee/pkg/pss" - "github.com/ethersphere/bee/pkg/pusher" - "github.com/ethersphere/bee/pkg/resolver" - resolverMock "github.com/ethersphere/bee/pkg/resolver/mock" - "github.com/ethersphere/bee/pkg/settlement/pseudosettle" - chequebookmock "github.com/ethersphere/bee/pkg/settlement/swap/chequebook/mock" - "github.com/ethersphere/bee/pkg/settlement/swap/erc20" - erc20mock "github.com/ethersphere/bee/pkg/settlement/swap/erc20/mock" - swapmock "github.com/ethersphere/bee/pkg/settlement/swap/mock" - "github.com/ethersphere/bee/pkg/spinlock" - statestore "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/status" - "github.com/ethersphere/bee/pkg/steward" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - testingc "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storageincentives" - "github.com/ethersphere/bee/pkg/storageincentives/redistribution" - "github.com/ethersphere/bee/pkg/storageincentives/staking" - mock2 "github.com/ethersphere/bee/pkg/storageincentives/staking/mock" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology/lightnode" - topologymock "github.com/ethersphere/bee/pkg/topology/mock" - "github.com/ethersphere/bee/pkg/tracing" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/transaction/backendmock" - transactionmock "github.com/ethersphere/bee/pkg/transaction/mock" - "github.com/ethersphere/bee/pkg/util/testutil" + accountingmock "github.com/ethersphere/bee/v2/pkg/accounting/mock" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/auth" + mockauth "github.com/ethersphere/bee/v2/pkg/auth/mock" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/feeds" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/builder" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/log" + p2pmock "github.com/ethersphere/bee/v2/pkg/p2p/mock" + "github.com/ethersphere/bee/v2/pkg/pingpong" + "github.com/ethersphere/bee/v2/pkg/postage" + mockbatchstore "github.com/ethersphere/bee/v2/pkg/postage/batchstore/mock" + mockpost "github.com/ethersphere/bee/v2/pkg/postage/mock" + "github.com/ethersphere/bee/v2/pkg/postage/postagecontract" + contractMock "github.com/ethersphere/bee/v2/pkg/postage/postagecontract/mock" + "github.com/ethersphere/bee/v2/pkg/pss" + "github.com/ethersphere/bee/v2/pkg/pusher" + "github.com/ethersphere/bee/v2/pkg/resolver" + resolverMock "github.com/ethersphere/bee/v2/pkg/resolver/mock" + "github.com/ethersphere/bee/v2/pkg/settlement/pseudosettle" + chequebookmock "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook/mock" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20" + erc20mock "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20/mock" + swapmock "github.com/ethersphere/bee/v2/pkg/settlement/swap/mock" + "github.com/ethersphere/bee/v2/pkg/spinlock" + statestore "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/status" + "github.com/ethersphere/bee/v2/pkg/steward" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + testingc "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storageincentives" + "github.com/ethersphere/bee/v2/pkg/storageincentives/redistribution" + "github.com/ethersphere/bee/v2/pkg/storageincentives/staking" + mock2 "github.com/ethersphere/bee/v2/pkg/storageincentives/staking/mock" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology/lightnode" + topologymock "github.com/ethersphere/bee/v2/pkg/topology/mock" + "github.com/ethersphere/bee/v2/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/transaction/backendmock" + transactionmock "github.com/ethersphere/bee/v2/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/util/testutil" "github.com/gorilla/websocket" "resenje.org/web" ) diff --git a/pkg/api/auth_test.go b/pkg/api/auth_test.go index 496d1a8f2dd..f2cb0a99d59 100644 --- a/pkg/api/auth_test.go +++ b/pkg/api/auth_test.go @@ -9,11 +9,11 @@ import ( "net/http" "testing" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/auth/mock" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/log" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/auth/mock" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/log" ) // nolint:paralleltest diff --git a/pkg/api/balances.go b/pkg/api/balances.go index 94400669597..f55b8aeec32 100644 --- a/pkg/api/balances.go +++ b/pkg/api/balances.go @@ -8,10 +8,10 @@ import ( "errors" "net/http" - "github.com/ethersphere/bee/pkg/accounting" - "github.com/ethersphere/bee/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/accounting" + "github.com/ethersphere/bee/v2/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/gorilla/mux" ) diff --git a/pkg/api/balances_test.go b/pkg/api/balances_test.go index 4cb985fefc0..174196d253a 100644 --- a/pkg/api/balances_test.go +++ b/pkg/api/balances_test.go @@ -11,13 +11,13 @@ import ( "reflect" "testing" - "github.com/ethersphere/bee/pkg/accounting" - "github.com/ethersphere/bee/pkg/accounting/mock" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/accounting" + "github.com/ethersphere/bee/v2/pkg/accounting/mock" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestBalances(t *testing.T) { diff --git a/pkg/api/bytes.go b/pkg/api/bytes.go index b5c6e4c6ed2..9b5d9b902d6 100644 --- a/pkg/api/bytes.go +++ b/pkg/api/bytes.go @@ -11,13 +11,13 @@ import ( "net/http" "strconv" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/postage" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/postage" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/tracing" "github.com/gorilla/mux" "github.com/opentracing/opentracing-go/ext" olog "github.com/opentracing/opentracing-go/log" diff --git a/pkg/api/bytes_test.go b/pkg/api/bytes_test.go index abae06bc2c6..e2acc99a9d6 100644 --- a/pkg/api/bytes_test.go +++ b/pkg/api/bytes_test.go @@ -12,14 +12,14 @@ import ( "strconv" "testing" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/log" - mockbatchstore "github.com/ethersphere/bee/pkg/postage/batchstore/mock" - mockpost "github.com/ethersphere/bee/pkg/postage/mock" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/log" + mockbatchstore "github.com/ethersphere/bee/v2/pkg/postage/batchstore/mock" + mockpost "github.com/ethersphere/bee/v2/pkg/postage/mock" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" "gitlab.com/nolash/go-mockbytes" ) diff --git a/pkg/api/bzz.go b/pkg/api/bzz.go index f65ce0365e0..65ded851f12 100644 --- a/pkg/api/bzz.go +++ b/pkg/api/bzz.go @@ -21,20 +21,20 @@ import ( olog "github.com/opentracing/opentracing-go/log" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/feeds" - "github.com/ethersphere/bee/pkg/file/joiner" - "github.com/ethersphere/bee/pkg/file/loadsave" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/file/redundancy/getter" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/manifest" - "github.com/ethersphere/bee/pkg/postage" - storage "github.com/ethersphere/bee/pkg/storage" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/feeds" + "github.com/ethersphere/bee/v2/pkg/file/joiner" + "github.com/ethersphere/bee/v2/pkg/file/loadsave" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/file/redundancy/getter" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/manifest" + "github.com/ethersphere/bee/v2/pkg/postage" + storage "github.com/ethersphere/bee/v2/pkg/storage" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/tracing" "github.com/ethersphere/langos" "github.com/gorilla/mux" ) diff --git a/pkg/api/bzz_test.go b/pkg/api/bzz_test.go index 36ac3441eb2..7d1e1b27bfe 100644 --- a/pkg/api/bzz_test.go +++ b/pkg/api/bzz_test.go @@ -17,19 +17,19 @@ import ( "strings" "testing" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/file/loadsave" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/manifest" - mockbatchstore "github.com/ethersphere/bee/pkg/postage/batchstore/mock" - mockpost "github.com/ethersphere/bee/pkg/postage/mock" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil/pseudorand" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/file/loadsave" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/manifest" + mockbatchstore "github.com/ethersphere/bee/v2/pkg/postage/batchstore/mock" + mockpost "github.com/ethersphere/bee/v2/pkg/postage/mock" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil/pseudorand" ) // nolint:paralleltest,tparallel,thelper diff --git a/pkg/api/chequebook.go b/pkg/api/chequebook.go index b1ee31361ff..33cd75d9767 100644 --- a/pkg/api/chequebook.go +++ b/pkg/api/chequebook.go @@ -10,13 +10,13 @@ import ( "net/http" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/postage/postagecontract" - "github.com/ethersphere/bee/pkg/settlement/swap" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" + "github.com/ethersphere/bee/v2/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/postage/postagecontract" + "github.com/ethersphere/bee/v2/pkg/settlement/swap" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/gorilla/mux" ) diff --git a/pkg/api/chequebook_test.go b/pkg/api/chequebook_test.go index f12d41be999..b9b9cbdef32 100644 --- a/pkg/api/chequebook_test.go +++ b/pkg/api/chequebook_test.go @@ -13,16 +13,16 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook/mock" - swapmock "github.com/ethersphere/bee/pkg/settlement/swap/mock" - - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook/mock" + swapmock "github.com/ethersphere/bee/v2/pkg/settlement/swap/mock" + + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestChequebookBalance(t *testing.T) { diff --git a/pkg/api/chunk.go b/pkg/api/chunk.go index df3ef547318..a572cacdcdf 100644 --- a/pkg/api/chunk.go +++ b/pkg/api/chunk.go @@ -12,13 +12,13 @@ import ( "net/http" "strconv" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/soc" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/gorilla/mux" ) diff --git a/pkg/api/chunk_address.go b/pkg/api/chunk_address.go index 7c99225c078..6f214a0ea03 100644 --- a/pkg/api/chunk_address.go +++ b/pkg/api/chunk_address.go @@ -7,8 +7,8 @@ package api import ( "net/http" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/gorilla/mux" ) diff --git a/pkg/api/chunk_stream.go b/pkg/api/chunk_stream.go index 005ba5020d1..4ae045a9d4f 100644 --- a/pkg/api/chunk_stream.go +++ b/pkg/api/chunk_stream.go @@ -10,13 +10,13 @@ import ( "net/http" "time" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - storage "github.com/ethersphere/bee/pkg/storage" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + storage "github.com/ethersphere/bee/v2/pkg/storage" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/gorilla/websocket" ) diff --git a/pkg/api/chunk_stream_test.go b/pkg/api/chunk_stream_test.go index 24a3bdab841..47c8e860b51 100644 --- a/pkg/api/chunk_stream_test.go +++ b/pkg/api/chunk_stream_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/api" - mockpost "github.com/ethersphere/bee/pkg/postage/mock" - "github.com/ethersphere/bee/pkg/spinlock" - testingc "github.com/ethersphere/bee/pkg/storage/testing" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/api" + mockpost "github.com/ethersphere/bee/v2/pkg/postage/mock" + "github.com/ethersphere/bee/v2/pkg/spinlock" + testingc "github.com/ethersphere/bee/v2/pkg/storage/testing" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/gorilla/websocket" ) diff --git a/pkg/api/chunk_test.go b/pkg/api/chunk_test.go index 21c98a8c011..c0e1fe9de9c 100644 --- a/pkg/api/chunk_test.go +++ b/pkg/api/chunk_test.go @@ -13,17 +13,17 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/log" - mockbatchstore "github.com/ethersphere/bee/pkg/postage/batchstore/mock" - mockpost "github.com/ethersphere/bee/pkg/postage/mock" - "github.com/ethersphere/bee/pkg/spinlock" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - testingc "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + mockbatchstore "github.com/ethersphere/bee/v2/pkg/postage/batchstore/mock" + mockpost "github.com/ethersphere/bee/v2/pkg/postage/mock" + "github.com/ethersphere/bee/v2/pkg/spinlock" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + testingc "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // nolint:paralleltest,tparallel diff --git a/pkg/api/cors_test.go b/pkg/api/cors_test.go index 7163f8f9563..73c3b343414 100644 --- a/pkg/api/cors_test.go +++ b/pkg/api/cors_test.go @@ -9,8 +9,8 @@ import ( "net/http" "testing" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" ) func TestCORSHeaders(t *testing.T) { diff --git a/pkg/api/debugstorage.go b/pkg/api/debugstorage.go index 13325997b19..d3e209b0dc2 100644 --- a/pkg/api/debugstorage.go +++ b/pkg/api/debugstorage.go @@ -7,8 +7,8 @@ package api import ( "net/http" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/tracing" ) func (s *Service) debugStorage(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/debugstorage_test.go b/pkg/api/debugstorage_test.go index 72d8800b882..bb12a5585fd 100644 --- a/pkg/api/debugstorage_test.go +++ b/pkg/api/debugstorage_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/storer" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/storer" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" ) func TestDebugStorage(t *testing.T) { diff --git a/pkg/api/dirs.go b/pkg/api/dirs.go index 05431c61f01..f54a02807c9 100644 --- a/pkg/api/dirs.go +++ b/pkg/api/dirs.go @@ -18,16 +18,16 @@ import ( "strconv" "strings" - "github.com/ethersphere/bee/pkg/file/loadsave" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/manifest" - "github.com/ethersphere/bee/pkg/postage" - storage "github.com/ethersphere/bee/pkg/storage" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/file/loadsave" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/manifest" + "github.com/ethersphere/bee/v2/pkg/postage" + storage "github.com/ethersphere/bee/v2/pkg/storage" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/tracing" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" olog "github.com/opentracing/opentracing-go/log" diff --git a/pkg/api/dirs_test.go b/pkg/api/dirs_test.go index b43e9b3bca4..d49f0d281d6 100644 --- a/pkg/api/dirs_test.go +++ b/pkg/api/dirs_test.go @@ -17,14 +17,14 @@ import ( "strconv" "testing" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/file/loadsave" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/manifest" - mockpost "github.com/ethersphere/bee/pkg/postage/mock" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/file/loadsave" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/manifest" + mockpost "github.com/ethersphere/bee/v2/pkg/postage/mock" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // nolint:paralleltest diff --git a/pkg/api/export_test.go b/pkg/api/export_test.go index 869b00fe5a7..812ce522ba0 100644 --- a/pkg/api/export_test.go +++ b/pkg/api/export_test.go @@ -5,8 +5,8 @@ package api import ( - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type ( diff --git a/pkg/api/feed.go b/pkg/api/feed.go index 23961e6d5fc..09fdf6515ec 100644 --- a/pkg/api/feed.go +++ b/pkg/api/feed.go @@ -13,17 +13,17 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/feeds" - "github.com/ethersphere/bee/pkg/file/loadsave" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/manifest" - "github.com/ethersphere/bee/pkg/manifest/mantaray" - "github.com/ethersphere/bee/pkg/manifest/simple" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/soc" - storage "github.com/ethersphere/bee/pkg/storage" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/feeds" + "github.com/ethersphere/bee/v2/pkg/file/loadsave" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/manifest" + "github.com/ethersphere/bee/v2/pkg/manifest/mantaray" + "github.com/ethersphere/bee/v2/pkg/manifest/simple" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/soc" + storage "github.com/ethersphere/bee/v2/pkg/storage" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/gorilla/mux" ) diff --git a/pkg/api/feed_test.go b/pkg/api/feed_test.go index e71e8d77b04..a35b9ce3423 100644 --- a/pkg/api/feed_test.go +++ b/pkg/api/feed_test.go @@ -14,18 +14,18 @@ import ( "net/http" "testing" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/feeds" - "github.com/ethersphere/bee/pkg/file/loadsave" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/manifest" - "github.com/ethersphere/bee/pkg/postage" - mockpost "github.com/ethersphere/bee/pkg/postage/mock" - testingsoc "github.com/ethersphere/bee/pkg/soc/testing" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/feeds" + "github.com/ethersphere/bee/v2/pkg/file/loadsave" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/manifest" + "github.com/ethersphere/bee/v2/pkg/postage" + mockpost "github.com/ethersphere/bee/v2/pkg/postage/mock" + testingsoc "github.com/ethersphere/bee/v2/pkg/soc/testing" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const ownerString = "8d3766440f0d7b949a5e32995d09619a7f86e632" diff --git a/pkg/api/health.go b/pkg/api/health.go index 3d6e132a015..33b6481b6ee 100644 --- a/pkg/api/health.go +++ b/pkg/api/health.go @@ -7,8 +7,8 @@ package api import ( "net/http" - "github.com/ethersphere/bee" - "github.com/ethersphere/bee/pkg/jsonhttp" + "github.com/ethersphere/bee/v2" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" ) type healthStatusResponse struct { diff --git a/pkg/api/health_test.go b/pkg/api/health_test.go index fb5f49e2b57..3446e167895 100644 --- a/pkg/api/health_test.go +++ b/pkg/api/health_test.go @@ -8,9 +8,9 @@ import ( "net/http" "testing" - "github.com/ethersphere/bee" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" ) func TestHealth(t *testing.T) { diff --git a/pkg/api/integritycheck.go b/pkg/api/integritycheck.go index 5b133d38183..7609c2b1674 100644 --- a/pkg/api/integritycheck.go +++ b/pkg/api/integritycheck.go @@ -7,8 +7,8 @@ import ( "encoding/json" "net/http" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type PinIntegrityResponse struct { diff --git a/pkg/api/integritycheck_test.go b/pkg/api/integritycheck_test.go index 8c6d9c99d44..d9d18502d72 100644 --- a/pkg/api/integritycheck_test.go +++ b/pkg/api/integritycheck_test.go @@ -9,11 +9,11 @@ import ( "net/http" "testing" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/log" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - storer "github.com/ethersphere/bee/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/log" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + storer "github.com/ethersphere/bee/v2/pkg/storer" ) const pinRef = "620fcd78c7ce54da2d1b7cc2274a02e190cbe8fecbc3bd244690ab6517ce8f39" diff --git a/pkg/api/logger.go b/pkg/api/logger.go index cb371d6a851..95efc08e428 100644 --- a/pkg/api/logger.go +++ b/pkg/api/logger.go @@ -11,8 +11,8 @@ import ( "regexp" "strings" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/log" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/log" "github.com/gorilla/mux" ) diff --git a/pkg/api/logger_test.go b/pkg/api/logger_test.go index e29341355a1..b8420b79067 100644 --- a/pkg/api/logger_test.go +++ b/pkg/api/logger_test.go @@ -11,10 +11,10 @@ import ( "net/http" "testing" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/log" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/log" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go index 06e11b31024..7635468f4e3 100644 --- a/pkg/api/metrics.go +++ b/pkg/api/metrics.go @@ -9,8 +9,8 @@ import ( "strconv" "time" - "github.com/ethersphere/bee" - m "github.com/ethersphere/bee/pkg/metrics" + "github.com/ethersphere/bee/v2" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" ) diff --git a/pkg/api/metrics_test.go b/pkg/api/metrics_test.go index eb2f8db0481..299f0321eef 100644 --- a/pkg/api/metrics_test.go +++ b/pkg/api/metrics_test.go @@ -7,7 +7,7 @@ package api_test import ( "testing" - "github.com/ethersphere/bee/pkg/api" + "github.com/ethersphere/bee/v2/pkg/api" ) func TestToFileSizeBucket(t *testing.T) { diff --git a/pkg/api/node.go b/pkg/api/node.go index 9a14da4685b..9a3f6228538 100644 --- a/pkg/api/node.go +++ b/pkg/api/node.go @@ -7,7 +7,7 @@ package api import ( "net/http" - "github.com/ethersphere/bee/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" ) type BeeNodeMode uint diff --git a/pkg/api/node_test.go b/pkg/api/node_test.go index 9cb3c6d8b90..5a076c4685d 100644 --- a/pkg/api/node_test.go +++ b/pkg/api/node_test.go @@ -7,7 +7,7 @@ package api_test import ( "testing" - "github.com/ethersphere/bee/pkg/api" + "github.com/ethersphere/bee/v2/pkg/api" ) func TestBeeNodeMode_String(t *testing.T) { diff --git a/pkg/api/p2p.go b/pkg/api/p2p.go index 3ae0ee4a259..9494b9ccbd0 100644 --- a/pkg/api/p2p.go +++ b/pkg/api/p2p.go @@ -9,9 +9,9 @@ import ( "net/http" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/api/p2p_test.go b/pkg/api/p2p_test.go index e184906734a..5cf9de6124c 100644 --- a/pkg/api/p2p_test.go +++ b/pkg/api/p2p_test.go @@ -11,12 +11,12 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/p2p/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/p2p/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/api/peer.go b/pkg/api/peer.go index a6dfc8f7aeb..3213b55a8ef 100644 --- a/pkg/api/peer.go +++ b/pkg/api/peer.go @@ -8,9 +8,9 @@ import ( "errors" "net/http" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/gorilla/mux" "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/api/peer_test.go b/pkg/api/peer_test.go index eb1ec3ffb6a..0697a6277d2 100644 --- a/pkg/api/peer_test.go +++ b/pkg/api/peer_test.go @@ -11,14 +11,14 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/bzz" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/bzz" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" ma "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/api/pin.go b/pkg/api/pin.go index 7c80e5f196b..21b01a626e8 100644 --- a/pkg/api/pin.go +++ b/pkg/api/pin.go @@ -9,10 +9,10 @@ import ( "net/http" "sync" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/traversal" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/traversal" "github.com/gorilla/mux" "golang.org/x/sync/semaphore" ) diff --git a/pkg/api/pin_test.go b/pkg/api/pin_test.go index 751b93b1d65..1ff60b7e4d2 100644 --- a/pkg/api/pin_test.go +++ b/pkg/api/pin_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - mockpost "github.com/ethersphere/bee/pkg/postage/mock" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + mockpost "github.com/ethersphere/bee/v2/pkg/postage/mock" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func checkPinHandlers(t *testing.T, client *http.Client, rootHash string, createPin bool) { diff --git a/pkg/api/pingpong.go b/pkg/api/pingpong.go index 0c3bbc45323..6cb1c4ae23e 100644 --- a/pkg/api/pingpong.go +++ b/pkg/api/pingpong.go @@ -8,9 +8,9 @@ import ( "errors" "net/http" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/gorilla/mux" ) diff --git a/pkg/api/pingpong_test.go b/pkg/api/pingpong_test.go index b97bdd77413..4dffae5b0e6 100644 --- a/pkg/api/pingpong_test.go +++ b/pkg/api/pingpong_test.go @@ -11,12 +11,12 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/p2p" - pingpongmock "github.com/ethersphere/bee/pkg/pingpong/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/p2p" + pingpongmock "github.com/ethersphere/bee/v2/pkg/pingpong/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestPingpong(t *testing.T) { diff --git a/pkg/api/postage.go b/pkg/api/postage.go index 457b0dc0f63..ba1f1499d9f 100644 --- a/pkg/api/postage.go +++ b/pkg/api/postage.go @@ -13,12 +13,12 @@ import ( "net/http" "time" - "github.com/ethersphere/bee/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/postage/postagecontract" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage/postagecontract" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/tracing" "github.com/gorilla/mux" ) diff --git a/pkg/api/postage_test.go b/pkg/api/postage_test.go index a7055ed098a..ebf808c1c7a 100644 --- a/pkg/api/postage_test.go +++ b/pkg/api/postage_test.go @@ -18,19 +18,19 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/postage/batchstore/mock" - mockpost "github.com/ethersphere/bee/pkg/postage/mock" - "github.com/ethersphere/bee/pkg/postage/postagecontract" - contractMock "github.com/ethersphere/bee/pkg/postage/postagecontract/mock" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - "github.com/ethersphere/bee/pkg/sctx" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/transaction/backendmock" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage/batchstore/mock" + mockpost "github.com/ethersphere/bee/v2/pkg/postage/mock" + "github.com/ethersphere/bee/v2/pkg/postage/postagecontract" + contractMock "github.com/ethersphere/bee/v2/pkg/postage/postagecontract/mock" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + "github.com/ethersphere/bee/v2/pkg/sctx" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/transaction/backendmock" ) func TestPostageCreateStamp(t *testing.T) { diff --git a/pkg/api/pss.go b/pkg/api/pss.go index aa87a6165c8..ef1c3a84d47 100644 --- a/pkg/api/pss.go +++ b/pkg/api/pss.go @@ -14,11 +14,11 @@ import ( "strings" "time" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/pss" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/pss" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/gorilla/mux" "github.com/gorilla/websocket" ) diff --git a/pkg/api/pss_test.go b/pkg/api/pss_test.go index d40a4889d4e..6624e6d8d21 100644 --- a/pkg/api/pss_test.go +++ b/pkg/api/pss_test.go @@ -19,19 +19,19 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - mockpost "github.com/ethersphere/bee/pkg/postage/mock" - "github.com/ethersphere/bee/pkg/pss" - "github.com/ethersphere/bee/pkg/pushsync" - "github.com/ethersphere/bee/pkg/spinlock" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + mockpost "github.com/ethersphere/bee/v2/pkg/postage/mock" + "github.com/ethersphere/bee/v2/pkg/pss" + "github.com/ethersphere/bee/v2/pkg/pushsync" + "github.com/ethersphere/bee/v2/pkg/spinlock" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" "github.com/gorilla/websocket" ) diff --git a/pkg/api/rchash.go b/pkg/api/rchash.go index ad7a25f9992..3aec3e3836a 100644 --- a/pkg/api/rchash.go +++ b/pkg/api/rchash.go @@ -10,9 +10,9 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/storageincentives/redistribution" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/storageincentives/redistribution" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/gorilla/mux" ) diff --git a/pkg/api/readiness_test.go b/pkg/api/readiness_test.go index f91419af8cb..52677214919 100644 --- a/pkg/api/readiness_test.go +++ b/pkg/api/readiness_test.go @@ -8,8 +8,8 @@ import ( "net/http" "testing" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" ) func TestReadiness(t *testing.T) { diff --git a/pkg/api/redistribution.go b/pkg/api/redistribution.go index ba335342a9c..5df3fbf0682 100644 --- a/pkg/api/redistribution.go +++ b/pkg/api/redistribution.go @@ -8,9 +8,9 @@ import ( "net/http" "time" - "github.com/ethersphere/bee/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/tracing" ) type redistributionStatusResponse struct { diff --git a/pkg/api/redistribution_test.go b/pkg/api/redistribution_test.go index b13f4d9af93..88bf00abe51 100644 --- a/pkg/api/redistribution_test.go +++ b/pkg/api/redistribution_test.go @@ -11,13 +11,13 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - statestore "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/storageincentives" - "github.com/ethersphere/bee/pkg/transaction/backendmock" - "github.com/ethersphere/bee/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + statestore "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/storageincentives" + "github.com/ethersphere/bee/v2/pkg/transaction/backendmock" + "github.com/ethersphere/bee/v2/pkg/transaction/mock" ) func TestRedistributionStatus(t *testing.T) { diff --git a/pkg/api/router.go b/pkg/api/router.go index bfc6d9a9f11..872304e85c7 100644 --- a/pkg/api/router.go +++ b/pkg/api/router.go @@ -11,10 +11,10 @@ import ( "net/http/pprof" "strings" - "github.com/ethersphere/bee/pkg/auth" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/log/httpaccess" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/auth" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/log/httpaccess" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/gorilla/handlers" "github.com/gorilla/mux" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/pkg/api/settlements.go b/pkg/api/settlements.go index 83ff7480f51..b6564925d13 100644 --- a/pkg/api/settlements.go +++ b/pkg/api/settlements.go @@ -9,11 +9,11 @@ import ( "math/big" "net/http" - "github.com/ethersphere/bee/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/postage/postagecontract" - "github.com/ethersphere/bee/pkg/settlement" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/postage/postagecontract" + "github.com/ethersphere/bee/v2/pkg/settlement" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/gorilla/mux" ) diff --git a/pkg/api/settlements_test.go b/pkg/api/settlements_test.go index bc06f540452..86f2e2e42e1 100644 --- a/pkg/api/settlements_test.go +++ b/pkg/api/settlements_test.go @@ -11,13 +11,13 @@ import ( "reflect" "testing" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/settlement" - "github.com/ethersphere/bee/pkg/settlement/swap/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/settlement" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestSettlements(t *testing.T) { diff --git a/pkg/api/soc.go b/pkg/api/soc.go index 6dfafadda28..0abf338deb9 100644 --- a/pkg/api/soc.go +++ b/pkg/api/soc.go @@ -9,12 +9,12 @@ import ( "io" "net/http" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/soc" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/soc" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/gorilla/mux" ) diff --git a/pkg/api/soc_test.go b/pkg/api/soc_test.go index 5e9fe93d901..79e72ffb603 100644 --- a/pkg/api/soc_test.go +++ b/pkg/api/soc_test.go @@ -13,13 +13,13 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - testingsoc "github.com/ethersphere/bee/pkg/soc/testing" - "github.com/ethersphere/bee/pkg/spinlock" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + testingsoc "github.com/ethersphere/bee/v2/pkg/soc/testing" + "github.com/ethersphere/bee/v2/pkg/spinlock" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // nolint:paralleltest diff --git a/pkg/api/staking.go b/pkg/api/staking.go index 77e8a7e836c..5ca5b06d409 100644 --- a/pkg/api/staking.go +++ b/pkg/api/staking.go @@ -9,10 +9,10 @@ import ( "math/big" "net/http" - "github.com/ethersphere/bee/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/storageincentives/staking" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/storageincentives/staking" "github.com/gorilla/mux" ) diff --git a/pkg/api/staking_test.go b/pkg/api/staking_test.go index 8f10d4f6e24..e6f4d0b2296 100644 --- a/pkg/api/staking_test.go +++ b/pkg/api/staking_test.go @@ -12,14 +12,14 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/bigint" - - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/storageincentives/staking" - stakingContractMock "github.com/ethersphere/bee/pkg/storageincentives/staking/mock" + "github.com/ethersphere/bee/v2/pkg/bigint" + + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/storageincentives/staking" + stakingContractMock "github.com/ethersphere/bee/v2/pkg/storageincentives/staking/mock" ) func TestDepositStake(t *testing.T) { diff --git a/pkg/api/status.go b/pkg/api/status.go index 4c89e63b0b2..b20cafb15a7 100644 --- a/pkg/api/status.go +++ b/pkg/api/status.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" ) type statusSnapshotResponse struct { diff --git a/pkg/api/status_test.go b/pkg/api/status_test.go index 5526d3734aa..cc2c568abf4 100644 --- a/pkg/api/status_test.go +++ b/pkg/api/status_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/status" - "github.com/ethersphere/bee/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/status" + "github.com/ethersphere/bee/v2/pkg/topology" ) func TestGetStatus(t *testing.T) { diff --git a/pkg/api/stewardship.go b/pkg/api/stewardship.go index e617549d88f..99d330f78cc 100644 --- a/pkg/api/stewardship.go +++ b/pkg/api/stewardship.go @@ -8,11 +8,11 @@ import ( "errors" "net/http" - "github.com/ethersphere/bee/pkg/postage" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/postage" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" - "github.com/ethersphere/bee/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" "github.com/gorilla/mux" ) diff --git a/pkg/api/stewardship_test.go b/pkg/api/stewardship_test.go index 005b0bd66ad..e0f93957de5 100644 --- a/pkg/api/stewardship_test.go +++ b/pkg/api/stewardship_test.go @@ -9,14 +9,14 @@ import ( "net/http" "testing" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/log" - mockpost "github.com/ethersphere/bee/pkg/postage/mock" - "github.com/ethersphere/bee/pkg/steward/mock" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/log" + mockpost "github.com/ethersphere/bee/v2/pkg/postage/mock" + "github.com/ethersphere/bee/v2/pkg/steward/mock" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // nolint:paralleltest diff --git a/pkg/api/subdomain.go b/pkg/api/subdomain.go index 305dbd1bd71..5d5cede467a 100644 --- a/pkg/api/subdomain.go +++ b/pkg/api/subdomain.go @@ -8,8 +8,8 @@ import ( "net/http" "strings" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/tracing" "github.com/gorilla/mux" ) diff --git a/pkg/api/subdomain_test.go b/pkg/api/subdomain_test.go index 9dfd0143bde..6f8efc0b0f2 100644 --- a/pkg/api/subdomain_test.go +++ b/pkg/api/subdomain_test.go @@ -10,13 +10,13 @@ import ( "path" "testing" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/log" - mockpost "github.com/ethersphere/bee/pkg/postage/mock" - resolverMock "github.com/ethersphere/bee/pkg/resolver/mock" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/log" + mockpost "github.com/ethersphere/bee/v2/pkg/postage/mock" + resolverMock "github.com/ethersphere/bee/v2/pkg/resolver/mock" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestSubdomains(t *testing.T) { diff --git a/pkg/api/tag.go b/pkg/api/tag.go index 8241c25d285..6a38fd7a65b 100644 --- a/pkg/api/tag.go +++ b/pkg/api/tag.go @@ -11,10 +11,10 @@ import ( "net/http" "time" - "github.com/ethersphere/bee/pkg/jsonhttp" - storage "github.com/ethersphere/bee/pkg/storage" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + storage "github.com/ethersphere/bee/v2/pkg/storage" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/gorilla/mux" ) diff --git a/pkg/api/tag_test.go b/pkg/api/tag_test.go index dea820e3860..d3b8edeb4dc 100644 --- a/pkg/api/tag_test.go +++ b/pkg/api/tag_test.go @@ -11,14 +11,14 @@ import ( "strconv" "testing" - mockpost "github.com/ethersphere/bee/pkg/postage/mock" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" + mockpost "github.com/ethersphere/bee/v2/pkg/postage/mock" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/google/go-cmp/cmp" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" ) func tagsWithIdResource(id uint64) string { return fmt.Sprintf("/tags/%d", id) } diff --git a/pkg/api/topology.go b/pkg/api/topology.go index 9721454ea44..3cae56313c3 100644 --- a/pkg/api/topology.go +++ b/pkg/api/topology.go @@ -10,7 +10,7 @@ import ( "io" "net/http" - "github.com/ethersphere/bee/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" ) func (s *Service) topologyHandler(w http.ResponseWriter, _ *http.Request) { diff --git a/pkg/api/topology_test.go b/pkg/api/topology_test.go index a7d90994821..ebd22532f3b 100644 --- a/pkg/api/topology_test.go +++ b/pkg/api/topology_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" ) func TestTopologyOK(t *testing.T) { diff --git a/pkg/api/transaction.go b/pkg/api/transaction.go index 71eecdd8c95..6f93be7ca57 100644 --- a/pkg/api/transaction.go +++ b/pkg/api/transaction.go @@ -12,10 +12,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethersphere/bee/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/transaction" "github.com/gorilla/mux" ) diff --git a/pkg/api/transaction_test.go b/pkg/api/transaction_test.go index 7c202aa9def..46e066c4091 100644 --- a/pkg/api/transaction_test.go +++ b/pkg/api/transaction_test.go @@ -14,12 +14,12 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/transaction/mock" ) func TestTransactionStoredTransaction(t *testing.T) { diff --git a/pkg/api/util.go b/pkg/api/util.go index 950be4ab068..a1ad148f6d5 100644 --- a/pkg/api/util.go +++ b/pkg/api/util.go @@ -15,8 +15,8 @@ import ( "strings" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/pss" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/pss" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/hashicorp/go-multierror" "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/api/util_test.go b/pkg/api/util_test.go index 5f8dd3564b4..6aa55fbf891 100644 --- a/pkg/api/util_test.go +++ b/pkg/api/util_test.go @@ -14,8 +14,8 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/api/wallet.go b/pkg/api/wallet.go index ff1f6411f21..5cdd0de087d 100644 --- a/pkg/api/wallet.go +++ b/pkg/api/wallet.go @@ -12,10 +12,10 @@ import ( "slices" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/transaction" "github.com/gorilla/mux" ) diff --git a/pkg/api/wallet_test.go b/pkg/api/wallet_test.go index 80ea932fa19..c6f7449d51a 100644 --- a/pkg/api/wallet_test.go +++ b/pkg/api/wallet_test.go @@ -11,14 +11,14 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/bigint" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - erc20mock "github.com/ethersphere/bee/pkg/settlement/swap/erc20/mock" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/transaction/backendmock" - transactionmock "github.com/ethersphere/bee/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + erc20mock "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20/mock" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/transaction/backendmock" + transactionmock "github.com/ethersphere/bee/v2/pkg/transaction/mock" ) func TestWallet(t *testing.T) { diff --git a/pkg/api/welcome_message.go b/pkg/api/welcome_message.go index 0d51d4977f7..e19b9b01a9b 100644 --- a/pkg/api/welcome_message.go +++ b/pkg/api/welcome_message.go @@ -8,7 +8,7 @@ import ( "encoding/json" "net/http" - "github.com/ethersphere/bee/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" ) const welcomeMessageMaxRequestSize = 512 diff --git a/pkg/api/welcome_message_test.go b/pkg/api/welcome_message_test.go index 8bfc4075302..39d7c19a039 100644 --- a/pkg/api/welcome_message_test.go +++ b/pkg/api/welcome_message_test.go @@ -11,10 +11,10 @@ import ( "net/http" "testing" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" - "github.com/ethersphere/bee/pkg/p2p/mock" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/p2p/mock" ) func TestGetWelcomeMessage(t *testing.T) { diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index a12b883bb83..ee3b8a65290 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -18,7 +18,7 @@ import ( "github.com/casbin/casbin/v2" "github.com/casbin/casbin/v2/model" - "github.com/ethersphere/bee/pkg/log" + "github.com/ethersphere/bee/v2/pkg/log" "golang.org/x/crypto/bcrypt" ) diff --git a/pkg/auth/auth_test.go b/pkg/auth/auth_test.go index 28f16b58e0e..0d107a764a2 100644 --- a/pkg/auth/auth_test.go +++ b/pkg/auth/auth_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/auth" - "github.com/ethersphere/bee/pkg/log" + "github.com/ethersphere/bee/v2/pkg/auth" + "github.com/ethersphere/bee/v2/pkg/log" ) const ( diff --git a/pkg/auth/handler.go b/pkg/auth/handler.go index 2e79ee42e73..6a54b9269be 100644 --- a/pkg/auth/handler.go +++ b/pkg/auth/handler.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/ethersphere/bee/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" ) type auth interface { diff --git a/pkg/bigint/bigint_test.go b/pkg/bigint/bigint_test.go index 4cbde9034f9..f51aff05c46 100644 --- a/pkg/bigint/bigint_test.go +++ b/pkg/bigint/bigint_test.go @@ -11,7 +11,7 @@ import ( "reflect" "testing" - "github.com/ethersphere/bee/pkg/bigint" + "github.com/ethersphere/bee/v2/pkg/bigint" ) func TestMarshaling(t *testing.T) { diff --git a/pkg/blocker/blocker.go b/pkg/blocker/blocker.go index 151d8ad3dfb..5b916c81732 100644 --- a/pkg/blocker/blocker.go +++ b/pkg/blocker/blocker.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/swarm" "go.uber.org/atomic" ) diff --git a/pkg/blocker/blocker_test.go b/pkg/blocker/blocker_test.go index fc5ad1be247..269de291441 100644 --- a/pkg/blocker/blocker_test.go +++ b/pkg/blocker/blocker_test.go @@ -11,11 +11,11 @@ import ( "go.uber.org/goleak" - "github.com/ethersphere/bee/pkg/blocker" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/blocker" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) const ( diff --git a/pkg/bmt/benchmark_test.go b/pkg/bmt/benchmark_test.go index 55416437df1..2f49ce37179 100644 --- a/pkg/bmt/benchmark_test.go +++ b/pkg/bmt/benchmark_test.go @@ -8,10 +8,10 @@ import ( "fmt" "testing" - "github.com/ethersphere/bee/pkg/bmt" - "github.com/ethersphere/bee/pkg/bmt/reference" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/bmt" + "github.com/ethersphere/bee/v2/pkg/bmt/reference" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" "golang.org/x/sync/errgroup" ) diff --git a/pkg/bmt/bmt.go b/pkg/bmt/bmt.go index f314e012776..55091ceb3a5 100644 --- a/pkg/bmt/bmt.go +++ b/pkg/bmt/bmt.go @@ -8,7 +8,7 @@ import ( "encoding/binary" "hash" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var _ Hash = (*Hasher)(nil) diff --git a/pkg/bmt/bmt_test.go b/pkg/bmt/bmt_test.go index c74e5bdf0e8..9bb5589eb6a 100644 --- a/pkg/bmt/bmt_test.go +++ b/pkg/bmt/bmt_test.go @@ -13,10 +13,10 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/bmt" - "github.com/ethersphere/bee/pkg/bmt/reference" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/bmt" + "github.com/ethersphere/bee/v2/pkg/bmt/reference" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" "golang.org/x/sync/errgroup" ) diff --git a/pkg/bmt/proof_test.go b/pkg/bmt/proof_test.go index 1b7f6d3b3dd..d9b4ae19438 100644 --- a/pkg/bmt/proof_test.go +++ b/pkg/bmt/proof_test.go @@ -12,8 +12,8 @@ import ( "io" "testing" - "github.com/ethersphere/bee/pkg/bmt" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bmt" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestProofCorrectness(t *testing.T) { diff --git a/pkg/bmt/reference/reference_test.go b/pkg/bmt/reference/reference_test.go index e2dcc556d83..f11954d522c 100644 --- a/pkg/bmt/reference/reference_test.go +++ b/pkg/bmt/reference/reference_test.go @@ -12,7 +12,7 @@ import ( "io" "testing" - "github.com/ethersphere/bee/pkg/bmt/reference" + "github.com/ethersphere/bee/v2/pkg/bmt/reference" "golang.org/x/crypto/sha3" ) diff --git a/pkg/bmtpool/bmtpool.go b/pkg/bmtpool/bmtpool.go index d5187e49fb8..88c1ad32dba 100644 --- a/pkg/bmtpool/bmtpool.go +++ b/pkg/bmtpool/bmtpool.go @@ -7,8 +7,8 @@ package bmtpool import ( - "github.com/ethersphere/bee/pkg/bmt" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bmt" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const Capacity = 32 diff --git a/pkg/bzz/address.go b/pkg/bzz/address.go index 41a32496ea3..42fa8fd90b4 100644 --- a/pkg/bzz/address.go +++ b/pkg/bzz/address.go @@ -16,8 +16,8 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/swarm" ma "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/bzz/address_test.go b/pkg/bzz/address_test.go index c6ebe850396..969216d29d7 100644 --- a/pkg/bzz/address_test.go +++ b/pkg/bzz/address_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/bzz" - "github.com/ethersphere/bee/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/bzz" + "github.com/ethersphere/bee/v2/pkg/crypto" ma "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/bzz/utilities_test.go b/pkg/bzz/utilities_test.go index dad1110b504..7e4666b66ac 100644 --- a/pkg/bzz/utilities_test.go +++ b/pkg/bzz/utilities_test.go @@ -9,9 +9,9 @@ import ( ma "github.com/multiformats/go-multiaddr" - "github.com/ethersphere/bee/pkg/bzz" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/bzz" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) func Test_ContainsAddress(t *testing.T) { diff --git a/pkg/cac/cac.go b/pkg/cac/cac.go index 44af58d573b..70a20b8baf0 100644 --- a/pkg/cac/cac.go +++ b/pkg/cac/cac.go @@ -9,8 +9,8 @@ import ( "encoding/binary" "fmt" - "github.com/ethersphere/bee/pkg/bmtpool" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bmtpool" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/cac/cac_test.go b/pkg/cac/cac_test.go index 0e70c2b392b..2f1384aa2a0 100644 --- a/pkg/cac/cac_test.go +++ b/pkg/cac/cac_test.go @@ -12,9 +12,9 @@ import ( "math/rand" "testing" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) func TestNew(t *testing.T) { diff --git a/pkg/crypto/clef/clef.go b/pkg/crypto/clef/clef.go index 8c111f88f36..7d30ab6335a 100644 --- a/pkg/crypto/clef/clef.go +++ b/pkg/crypto/clef/clef.go @@ -17,8 +17,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/crypto/eip712" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/crypto/eip712" ) var ( diff --git a/pkg/crypto/clef/clef_test.go b/pkg/crypto/clef/clef_test.go index 79820c6bb8f..34573de4d1c 100644 --- a/pkg/crypto/clef/clef_test.go +++ b/pkg/crypto/clef/clef_test.go @@ -15,9 +15,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/crypto/clef" - "github.com/ethersphere/bee/pkg/crypto/eip712" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/crypto/clef" + "github.com/ethersphere/bee/v2/pkg/crypto/eip712" ) type mockClef struct { diff --git a/pkg/crypto/crypto.go b/pkg/crypto/crypto.go index a2e0ba2e468..d10c14a9991 100644 --- a/pkg/crypto/crypto.go +++ b/pkg/crypto/crypto.go @@ -14,7 +14,7 @@ import ( "fmt" "github.com/btcsuite/btcd/btcec/v2" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" "golang.org/x/crypto/sha3" ) diff --git a/pkg/crypto/crypto_test.go b/pkg/crypto/crypto_test.go index 4911be7032f..8a477730108 100644 --- a/pkg/crypto/crypto_test.go +++ b/pkg/crypto/crypto_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestGenerateSecp256k1Key(t *testing.T) { diff --git a/pkg/crypto/dh_test.go b/pkg/crypto/dh_test.go index 67cb26ebbd2..a1dfbff6487 100644 --- a/pkg/crypto/dh_test.go +++ b/pkg/crypto/dh_test.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/ethersphere/bee/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/crypto" ) func TestECDHCorrect(t *testing.T) { diff --git a/pkg/crypto/mock/signer.go b/pkg/crypto/mock/signer.go index 4cd7d82142a..0f007fd47e3 100644 --- a/pkg/crypto/mock/signer.go +++ b/pkg/crypto/mock/signer.go @@ -10,8 +10,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/crypto/eip712" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/crypto/eip712" ) type signerMock struct { diff --git a/pkg/crypto/signer.go b/pkg/crypto/signer.go index b7d1927aafe..150a05ef953 100644 --- a/pkg/crypto/signer.go +++ b/pkg/crypto/signer.go @@ -14,7 +14,7 @@ import ( btcecdsa "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/crypto/eip712" + "github.com/ethersphere/bee/v2/pkg/crypto/eip712" ) var ( diff --git a/pkg/crypto/signer_test.go b/pkg/crypto/signer_test.go index 4c2294de1ef..b3b09ae04af 100644 --- a/pkg/crypto/signer_test.go +++ b/pkg/crypto/signer_test.go @@ -14,8 +14,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/crypto/eip712" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/crypto/eip712" ) func TestDefaultSigner(t *testing.T) { diff --git a/pkg/discovery/discovery.go b/pkg/discovery/discovery.go index a9dd5254f2e..fe65ba26fea 100644 --- a/pkg/discovery/discovery.go +++ b/pkg/discovery/discovery.go @@ -9,7 +9,7 @@ package discovery import ( "context" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type Driver interface { diff --git a/pkg/discovery/mock/mock.go b/pkg/discovery/mock/mock.go index 48ca1d4ccb3..8fc9b861589 100644 --- a/pkg/discovery/mock/mock.go +++ b/pkg/discovery/mock/mock.go @@ -8,7 +8,7 @@ import ( "context" "sync" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type Discovery struct { diff --git a/pkg/encryption/chunk_encryption.go b/pkg/encryption/chunk_encryption.go index 3c697847824..72f60fcdcd9 100644 --- a/pkg/encryption/chunk_encryption.go +++ b/pkg/encryption/chunk_encryption.go @@ -5,7 +5,7 @@ package encryption import ( - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" "golang.org/x/crypto/sha3" ) diff --git a/pkg/encryption/elgamal/encryption.go b/pkg/encryption/elgamal/encryption.go index 6629bde3188..f3293b5f7ce 100644 --- a/pkg/encryption/elgamal/encryption.go +++ b/pkg/encryption/elgamal/encryption.go @@ -8,8 +8,8 @@ import ( "crypto/ecdsa" "hash" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/encryption" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/encryption" ) // New constructs an encryption interface (the modified blockcipher) with a base key derived from diff --git a/pkg/encryption/elgamal/encryption_test.go b/pkg/encryption/elgamal/encryption_test.go index da00b070701..ea14c77bc9f 100644 --- a/pkg/encryption/elgamal/encryption_test.go +++ b/pkg/encryption/elgamal/encryption_test.go @@ -10,9 +10,9 @@ import ( "io" "testing" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/encryption/elgamal" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/encryption/elgamal" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestElgamalCorrect(t *testing.T) { diff --git a/pkg/encryption/encryption_test.go b/pkg/encryption/encryption_test.go index 9c7f58db591..01d7c70d687 100644 --- a/pkg/encryption/encryption_test.go +++ b/pkg/encryption/encryption_test.go @@ -21,9 +21,9 @@ import ( "encoding/hex" "testing" - "github.com/ethersphere/bee/pkg/encryption" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/encryption" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" "golang.org/x/crypto/sha3" ) diff --git a/pkg/encryption/mock/chunk_encryption.go b/pkg/encryption/mock/chunk_encryption.go index a49f5ba4b6d..48049ab58db 100644 --- a/pkg/encryption/mock/chunk_encryption.go +++ b/pkg/encryption/mock/chunk_encryption.go @@ -5,7 +5,7 @@ package mock import ( - "github.com/ethersphere/bee/pkg/encryption" + "github.com/ethersphere/bee/v2/pkg/encryption" ) type chunkEncrypter struct { diff --git a/pkg/encryption/mock/mock.go b/pkg/encryption/mock/mock.go index 731b86fead3..66420fb2f1b 100644 --- a/pkg/encryption/mock/mock.go +++ b/pkg/encryption/mock/mock.go @@ -7,7 +7,7 @@ package mock import ( "errors" - "github.com/ethersphere/bee/pkg/encryption" + "github.com/ethersphere/bee/v2/pkg/encryption" ) var _ encryption.Interface = (*Encryptor)(nil) diff --git a/pkg/encryption/mock/mock_test.go b/pkg/encryption/mock/mock_test.go index 69b7bf94e1d..97e52b7777c 100644 --- a/pkg/encryption/mock/mock_test.go +++ b/pkg/encryption/mock/mock_test.go @@ -9,7 +9,7 @@ import ( "errors" "testing" - "github.com/ethersphere/bee/pkg/encryption/mock" + "github.com/ethersphere/bee/v2/pkg/encryption/mock" ) var errTest = errors.New("test error") diff --git a/pkg/encryption/store/decrypt_store.go b/pkg/encryption/store/decrypt_store.go index c4a5ef4b319..66a6341ae84 100644 --- a/pkg/encryption/store/decrypt_store.go +++ b/pkg/encryption/store/decrypt_store.go @@ -8,11 +8,11 @@ import ( "context" "encoding/binary" - "github.com/ethersphere/bee/pkg/encryption" - "github.com/ethersphere/bee/pkg/file" - "github.com/ethersphere/bee/pkg/file/redundancy" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/encryption" + "github.com/ethersphere/bee/v2/pkg/file" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type decryptingStore struct { diff --git a/pkg/feeds/epochs/epoch.go b/pkg/feeds/epochs/epoch.go index b59f7ce2e00..dee107c44e6 100644 --- a/pkg/feeds/epochs/epoch.go +++ b/pkg/feeds/epochs/epoch.go @@ -10,8 +10,8 @@ import ( "encoding/binary" "fmt" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/feeds" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/feeds" ) const ( diff --git a/pkg/feeds/epochs/finder.go b/pkg/feeds/epochs/finder.go index ad826ac1c01..a85ab309e76 100644 --- a/pkg/feeds/epochs/finder.go +++ b/pkg/feeds/epochs/finder.go @@ -8,9 +8,9 @@ import ( "context" "errors" - "github.com/ethersphere/bee/pkg/feeds" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/feeds" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var _ feeds.Lookup = (*finder)(nil) diff --git a/pkg/feeds/epochs/lookup_benchmark_test.go b/pkg/feeds/epochs/lookup_benchmark_test.go index 2226e94bbef..8f964bc553b 100644 --- a/pkg/feeds/epochs/lookup_benchmark_test.go +++ b/pkg/feeds/epochs/lookup_benchmark_test.go @@ -9,11 +9,11 @@ import ( "fmt" "testing" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/feeds" - "github.com/ethersphere/bee/pkg/feeds/epochs" - feedstesting "github.com/ethersphere/bee/pkg/feeds/testing" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/feeds" + "github.com/ethersphere/bee/v2/pkg/feeds/epochs" + feedstesting "github.com/ethersphere/bee/v2/pkg/feeds/testing" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" ) func BenchmarkFinder(b *testing.B) { diff --git a/pkg/feeds/epochs/lookup_test.go b/pkg/feeds/epochs/lookup_test.go index 7318940532a..e89d8b62b74 100644 --- a/pkg/feeds/epochs/lookup_test.go +++ b/pkg/feeds/epochs/lookup_test.go @@ -7,11 +7,11 @@ package epochs_test import ( "testing" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/feeds" - "github.com/ethersphere/bee/pkg/feeds/epochs" - feedstesting "github.com/ethersphere/bee/pkg/feeds/testing" - storage "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/feeds" + "github.com/ethersphere/bee/v2/pkg/feeds/epochs" + feedstesting "github.com/ethersphere/bee/v2/pkg/feeds/testing" + storage "github.com/ethersphere/bee/v2/pkg/storage" ) func TestFinder_FLAKY(t *testing.T) { diff --git a/pkg/feeds/epochs/updater.go b/pkg/feeds/epochs/updater.go index 70629d2d18c..b36d77e7d96 100644 --- a/pkg/feeds/epochs/updater.go +++ b/pkg/feeds/epochs/updater.go @@ -7,9 +7,9 @@ package epochs import ( "context" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/feeds" - storage "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/feeds" + storage "github.com/ethersphere/bee/v2/pkg/storage" ) var _ feeds.Updater = (*updater)(nil) diff --git a/pkg/feeds/factory/factory.go b/pkg/feeds/factory/factory.go index ed20a3f1f43..1d555416407 100644 --- a/pkg/feeds/factory/factory.go +++ b/pkg/feeds/factory/factory.go @@ -5,10 +5,10 @@ package factory import ( - "github.com/ethersphere/bee/pkg/feeds" - "github.com/ethersphere/bee/pkg/feeds/epochs" - "github.com/ethersphere/bee/pkg/feeds/sequence" - storage "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/feeds" + "github.com/ethersphere/bee/v2/pkg/feeds/epochs" + "github.com/ethersphere/bee/v2/pkg/feeds/sequence" + storage "github.com/ethersphere/bee/v2/pkg/storage" ) type factory struct { diff --git a/pkg/feeds/feed.go b/pkg/feeds/feed.go index 30a113a78ed..7c9495cdfac 100644 --- a/pkg/feeds/feed.go +++ b/pkg/feeds/feed.go @@ -15,10 +15,10 @@ import ( "strings" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/soc" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ErrFeedTypeNotFound = errors.New("no such feed type") diff --git a/pkg/feeds/getter.go b/pkg/feeds/getter.go index 19c002bee20..77b7599dd9e 100644 --- a/pkg/feeds/getter.go +++ b/pkg/feeds/getter.go @@ -11,9 +11,9 @@ import ( "fmt" "time" - "github.com/ethersphere/bee/pkg/soc" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/soc" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // Lookup is the interface for time based feed lookup diff --git a/pkg/feeds/putter.go b/pkg/feeds/putter.go index 21db4c6a1d7..633276f8f63 100644 --- a/pkg/feeds/putter.go +++ b/pkg/feeds/putter.go @@ -8,11 +8,11 @@ import ( "context" "encoding/binary" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/soc" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/soc" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // Updater is the generic interface f diff --git a/pkg/feeds/sequence/lookup_benchmark_test.go b/pkg/feeds/sequence/lookup_benchmark_test.go index 44da69acd09..e81d8cc9a61 100644 --- a/pkg/feeds/sequence/lookup_benchmark_test.go +++ b/pkg/feeds/sequence/lookup_benchmark_test.go @@ -9,11 +9,11 @@ import ( "fmt" "testing" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/feeds" - "github.com/ethersphere/bee/pkg/feeds/sequence" - feedstesting "github.com/ethersphere/bee/pkg/feeds/testing" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/feeds" + "github.com/ethersphere/bee/v2/pkg/feeds/sequence" + feedstesting "github.com/ethersphere/bee/v2/pkg/feeds/testing" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" ) func BenchmarkFinder(b *testing.B) { diff --git a/pkg/feeds/sequence/lookup_test.go b/pkg/feeds/sequence/lookup_test.go index 8e0d17cc90b..4396736a519 100644 --- a/pkg/feeds/sequence/lookup_test.go +++ b/pkg/feeds/sequence/lookup_test.go @@ -7,11 +7,11 @@ package sequence_test import ( "testing" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/feeds" - "github.com/ethersphere/bee/pkg/feeds/sequence" - feedstesting "github.com/ethersphere/bee/pkg/feeds/testing" - storage "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/feeds" + "github.com/ethersphere/bee/v2/pkg/feeds/sequence" + feedstesting "github.com/ethersphere/bee/v2/pkg/feeds/testing" + storage "github.com/ethersphere/bee/v2/pkg/storage" ) func TestFinder(t *testing.T) { diff --git a/pkg/feeds/sequence/sequence.go b/pkg/feeds/sequence/sequence.go index f01c7a8dd84..5361086de4b 100644 --- a/pkg/feeds/sequence/sequence.go +++ b/pkg/feeds/sequence/sequence.go @@ -18,10 +18,10 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/feeds" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/feeds" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // DefaultLevels is the number of concurrent lookaheads diff --git a/pkg/feeds/testing/lookup.go b/pkg/feeds/testing/lookup.go index 1c70ec1183f..8c71098f5a6 100644 --- a/pkg/feeds/testing/lookup.go +++ b/pkg/feeds/testing/lookup.go @@ -15,11 +15,11 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/feeds" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/feeds" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type Timeout struct { diff --git a/pkg/file/addresses/addresses_getter.go b/pkg/file/addresses/addresses_getter.go index 1ef32a9f4cd..6c9c4af82d9 100644 --- a/pkg/file/addresses/addresses_getter.go +++ b/pkg/file/addresses/addresses_getter.go @@ -7,8 +7,8 @@ package addresses import ( "context" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type addressesGetterStore struct { diff --git a/pkg/file/addresses/addresses_getter_test.go b/pkg/file/addresses/addresses_getter_test.go index a5fe9d00000..b71edbe8314 100644 --- a/pkg/file/addresses/addresses_getter_test.go +++ b/pkg/file/addresses/addresses_getter_test.go @@ -11,12 +11,12 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/file" - "github.com/ethersphere/bee/pkg/file/addresses" - "github.com/ethersphere/bee/pkg/file/joiner" - filetest "github.com/ethersphere/bee/pkg/file/testing" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file" + "github.com/ethersphere/bee/v2/pkg/file/addresses" + "github.com/ethersphere/bee/v2/pkg/file/joiner" + filetest "github.com/ethersphere/bee/v2/pkg/file/testing" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestAddressesGetterIterateChunkAddresses(t *testing.T) { diff --git a/pkg/file/buffer.go b/pkg/file/buffer.go index 57e0381828d..976eca20fa0 100644 --- a/pkg/file/buffer.go +++ b/pkg/file/buffer.go @@ -7,7 +7,7 @@ package file import ( "io" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const ( diff --git a/pkg/file/buffer_test.go b/pkg/file/buffer_test.go index b1760f9948f..3416db1084a 100644 --- a/pkg/file/buffer_test.go +++ b/pkg/file/buffer_test.go @@ -12,9 +12,9 @@ import ( "strconv" "testing" - "github.com/ethersphere/bee/pkg/file" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/file" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) // TestChunkPipe verifies that the reads are correctly buffered for diff --git a/pkg/file/file.go b/pkg/file/file.go index fa613cea218..40241cdabaa 100644 --- a/pkg/file/file.go +++ b/pkg/file/file.go @@ -9,7 +9,7 @@ import ( "context" "io" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type Reader interface { diff --git a/pkg/file/file_test.go b/pkg/file/file_test.go index cc677336b64..f99fb081f0d 100644 --- a/pkg/file/file_test.go +++ b/pkg/file/file_test.go @@ -13,12 +13,12 @@ import ( "strings" "testing" - "github.com/ethersphere/bee/pkg/file" - "github.com/ethersphere/bee/pkg/file/joiner" - "github.com/ethersphere/bee/pkg/file/pipeline/builder" - test "github.com/ethersphere/bee/pkg/file/testing" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file" + "github.com/ethersphere/bee/v2/pkg/file/joiner" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/builder" + test "github.com/ethersphere/bee/v2/pkg/file/testing" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/file/io.go b/pkg/file/io.go index 562b39742f6..8bb7ce54254 100644 --- a/pkg/file/io.go +++ b/pkg/file/io.go @@ -12,7 +12,7 @@ import ( "io" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // simpleReadCloser wraps a byte slice in a io.ReadCloser implementation. diff --git a/pkg/file/joiner/joiner.go b/pkg/file/joiner/joiner.go index 97f5b07c30c..fcd7e790c10 100644 --- a/pkg/file/joiner/joiner.go +++ b/pkg/file/joiner/joiner.go @@ -12,15 +12,15 @@ import ( "sync" "sync/atomic" - "github.com/ethersphere/bee/pkg/bmt" - "github.com/ethersphere/bee/pkg/encryption" - "github.com/ethersphere/bee/pkg/encryption/store" - "github.com/ethersphere/bee/pkg/file" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/file/redundancy/getter" - "github.com/ethersphere/bee/pkg/replicas" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bmt" + "github.com/ethersphere/bee/v2/pkg/encryption" + "github.com/ethersphere/bee/v2/pkg/encryption/store" + "github.com/ethersphere/bee/v2/pkg/file" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/file/redundancy/getter" + "github.com/ethersphere/bee/v2/pkg/replicas" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" "golang.org/x/sync/errgroup" ) diff --git a/pkg/file/joiner/joiner_test.go b/pkg/file/joiner/joiner_test.go index 56fe48c7a72..7938b1260ee 100644 --- a/pkg/file/joiner/joiner_test.go +++ b/pkg/file/joiner/joiner_test.go @@ -17,21 +17,21 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/file/joiner" - "github.com/ethersphere/bee/pkg/file/pipeline/builder" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/file/redundancy/getter" - "github.com/ethersphere/bee/pkg/file/splitter" - filetest "github.com/ethersphere/bee/pkg/file/testing" - "github.com/ethersphere/bee/pkg/log" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - testingc "github.com/ethersphere/bee/pkg/storage/testing" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" - "github.com/ethersphere/bee/pkg/util/testutil/pseudorand" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/file/joiner" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/builder" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/file/redundancy/getter" + "github.com/ethersphere/bee/v2/pkg/file/splitter" + filetest "github.com/ethersphere/bee/v2/pkg/file/testing" + "github.com/ethersphere/bee/v2/pkg/log" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + testingc "github.com/ethersphere/bee/v2/pkg/storage/testing" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/util/testutil/pseudorand" "gitlab.com/nolash/go-mockbytes" "golang.org/x/sync/errgroup" ) diff --git a/pkg/file/loadsave/loadsave.go b/pkg/file/loadsave/loadsave.go index 1d65e45ab6b..6a2a0bbf782 100644 --- a/pkg/file/loadsave/loadsave.go +++ b/pkg/file/loadsave/loadsave.go @@ -11,12 +11,12 @@ import ( "context" "errors" - "github.com/ethersphere/bee/pkg/file" - "github.com/ethersphere/bee/pkg/file/joiner" - "github.com/ethersphere/bee/pkg/file/pipeline" - "github.com/ethersphere/bee/pkg/file/pipeline/builder" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file" + "github.com/ethersphere/bee/v2/pkg/file/joiner" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/builder" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var errReadonlyLoadSave = errors.New("readonly manifest loadsaver") diff --git a/pkg/file/loadsave/loadsave_test.go b/pkg/file/loadsave/loadsave_test.go index 64154859757..f159b7056e6 100644 --- a/pkg/file/loadsave/loadsave_test.go +++ b/pkg/file/loadsave/loadsave_test.go @@ -11,12 +11,12 @@ import ( "errors" "testing" - "github.com/ethersphere/bee/pkg/file/loadsave" - "github.com/ethersphere/bee/pkg/file/pipeline" - "github.com/ethersphere/bee/pkg/file/pipeline/builder" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file/loadsave" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/builder" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/file/pipeline/bmt/bmt.go b/pkg/file/pipeline/bmt/bmt.go index 9f28b976226..669b20b8252 100644 --- a/pkg/file/pipeline/bmt/bmt.go +++ b/pkg/file/pipeline/bmt/bmt.go @@ -7,9 +7,9 @@ package bmt import ( "errors" - "github.com/ethersphere/bee/pkg/bmtpool" - "github.com/ethersphere/bee/pkg/file/pipeline" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bmtpool" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/file/pipeline/bmt/bmt_test.go b/pkg/file/pipeline/bmt/bmt_test.go index fad40e3e3f7..109a9cc9d42 100644 --- a/pkg/file/pipeline/bmt/bmt_test.go +++ b/pkg/file/pipeline/bmt/bmt_test.go @@ -11,9 +11,9 @@ import ( "errors" "testing" - "github.com/ethersphere/bee/pkg/file/pipeline" - "github.com/ethersphere/bee/pkg/file/pipeline/bmt" - mock "github.com/ethersphere/bee/pkg/file/pipeline/mock" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/bmt" + mock "github.com/ethersphere/bee/v2/pkg/file/pipeline/mock" ) // TestStoreWriter tests that store writer stores the provided data and calls the next chain writer. diff --git a/pkg/file/pipeline/builder/builder.go b/pkg/file/pipeline/builder/builder.go index d022ed5724a..50a05e56c4d 100644 --- a/pkg/file/pipeline/builder/builder.go +++ b/pkg/file/pipeline/builder/builder.go @@ -10,16 +10,16 @@ import ( "fmt" "io" - "github.com/ethersphere/bee/pkg/encryption" - "github.com/ethersphere/bee/pkg/file/pipeline" - "github.com/ethersphere/bee/pkg/file/pipeline/bmt" - enc "github.com/ethersphere/bee/pkg/file/pipeline/encryption" - "github.com/ethersphere/bee/pkg/file/pipeline/feeder" - "github.com/ethersphere/bee/pkg/file/pipeline/hashtrie" - "github.com/ethersphere/bee/pkg/file/pipeline/store" - "github.com/ethersphere/bee/pkg/file/redundancy" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/encryption" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/bmt" + enc "github.com/ethersphere/bee/v2/pkg/file/pipeline/encryption" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/feeder" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/hashtrie" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/store" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // NewPipelineBuilder returns the appropriate pipeline according to the specified parameters diff --git a/pkg/file/pipeline/builder/builder_test.go b/pkg/file/pipeline/builder/builder_test.go index 266474d9376..9f8070b1510 100644 --- a/pkg/file/pipeline/builder/builder_test.go +++ b/pkg/file/pipeline/builder/builder_test.go @@ -12,11 +12,11 @@ import ( "strconv" "testing" - "github.com/ethersphere/bee/pkg/file/pipeline/builder" - test "github.com/ethersphere/bee/pkg/file/testing" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/builder" + test "github.com/ethersphere/bee/v2/pkg/file/testing" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) func TestPartialWrites(t *testing.T) { diff --git a/pkg/file/pipeline/encryption/encryption.go b/pkg/file/pipeline/encryption/encryption.go index 0471c4121f0..905b031254e 100644 --- a/pkg/file/pipeline/encryption/encryption.go +++ b/pkg/file/pipeline/encryption/encryption.go @@ -5,8 +5,8 @@ package encryption import ( - "github.com/ethersphere/bee/pkg/encryption" - "github.com/ethersphere/bee/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/encryption" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" ) type encryptionWriter struct { diff --git a/pkg/file/pipeline/encryption/encryption_test.go b/pkg/file/pipeline/encryption/encryption_test.go index 8c0811ee947..49306a7d27b 100644 --- a/pkg/file/pipeline/encryption/encryption_test.go +++ b/pkg/file/pipeline/encryption/encryption_test.go @@ -9,10 +9,10 @@ import ( "encoding/binary" "testing" - mockenc "github.com/ethersphere/bee/pkg/encryption/mock" - "github.com/ethersphere/bee/pkg/file/pipeline" - "github.com/ethersphere/bee/pkg/file/pipeline/encryption" - mock "github.com/ethersphere/bee/pkg/file/pipeline/mock" + mockenc "github.com/ethersphere/bee/v2/pkg/encryption/mock" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/encryption" + mock "github.com/ethersphere/bee/v2/pkg/file/pipeline/mock" ) var ( diff --git a/pkg/file/pipeline/feeder/feeder.go b/pkg/file/pipeline/feeder/feeder.go index 03d77cfb49c..8e5e29617a8 100644 --- a/pkg/file/pipeline/feeder/feeder.go +++ b/pkg/file/pipeline/feeder/feeder.go @@ -7,8 +7,8 @@ package feeder import ( "encoding/binary" - "github.com/ethersphere/bee/pkg/file/pipeline" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const span = swarm.SpanSize diff --git a/pkg/file/pipeline/feeder/feeder_test.go b/pkg/file/pipeline/feeder/feeder_test.go index 470dbd7f032..51c56dd6a3b 100644 --- a/pkg/file/pipeline/feeder/feeder_test.go +++ b/pkg/file/pipeline/feeder/feeder_test.go @@ -10,8 +10,8 @@ import ( "errors" "testing" - "github.com/ethersphere/bee/pkg/file/pipeline" - "github.com/ethersphere/bee/pkg/file/pipeline/feeder" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/feeder" ) // TestFeeder tests that partial writes work correctly. diff --git a/pkg/file/pipeline/hashtrie/hashtrie.go b/pkg/file/pipeline/hashtrie/hashtrie.go index b3c898c76e1..b9fa52b90b8 100644 --- a/pkg/file/pipeline/hashtrie/hashtrie.go +++ b/pkg/file/pipeline/hashtrie/hashtrie.go @@ -10,11 +10,11 @@ import ( "errors" "fmt" - "github.com/ethersphere/bee/pkg/file/pipeline" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/replicas" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/replicas" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/file/pipeline/hashtrie/hashtrie_test.go b/pkg/file/pipeline/hashtrie/hashtrie_test.go index 4a966e265f3..7fb7cd4a542 100644 --- a/pkg/file/pipeline/hashtrie/hashtrie_test.go +++ b/pkg/file/pipeline/hashtrie/hashtrie_test.go @@ -12,21 +12,21 @@ import ( "sync/atomic" "testing" - bmtUtils "github.com/ethersphere/bee/pkg/bmt" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/encryption" - dec "github.com/ethersphere/bee/pkg/encryption/store" - "github.com/ethersphere/bee/pkg/file" - "github.com/ethersphere/bee/pkg/file/pipeline" - "github.com/ethersphere/bee/pkg/file/pipeline/bmt" - enc "github.com/ethersphere/bee/pkg/file/pipeline/encryption" - "github.com/ethersphere/bee/pkg/file/pipeline/hashtrie" - "github.com/ethersphere/bee/pkg/file/pipeline/mock" - "github.com/ethersphere/bee/pkg/file/pipeline/store" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/swarm" + bmtUtils "github.com/ethersphere/bee/v2/pkg/bmt" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/encryption" + dec "github.com/ethersphere/bee/v2/pkg/encryption/store" + "github.com/ethersphere/bee/v2/pkg/file" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/bmt" + enc "github.com/ethersphere/bee/v2/pkg/file/pipeline/encryption" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/hashtrie" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/mock" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/store" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/file/pipeline/mock/writer.go b/pkg/file/pipeline/mock/writer.go index af76e6339d1..19f505123b2 100644 --- a/pkg/file/pipeline/mock/writer.go +++ b/pkg/file/pipeline/mock/writer.go @@ -7,7 +7,7 @@ package mock import ( "sync" - "github.com/ethersphere/bee/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" ) type MockChainWriter struct { diff --git a/pkg/file/pipeline/store/store.go b/pkg/file/pipeline/store/store.go index ec3621900c8..c1d7f4f4949 100644 --- a/pkg/file/pipeline/store/store.go +++ b/pkg/file/pipeline/store/store.go @@ -8,9 +8,9 @@ import ( "context" "errors" - "github.com/ethersphere/bee/pkg/file/pipeline" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var errInvalidData = errors.New("store: invalid data") diff --git a/pkg/file/pipeline/store/store_test.go b/pkg/file/pipeline/store/store_test.go index a3a39bace05..d7db1c885e4 100644 --- a/pkg/file/pipeline/store/store_test.go +++ b/pkg/file/pipeline/store/store_test.go @@ -10,11 +10,11 @@ import ( "errors" "testing" - "github.com/ethersphere/bee/pkg/file/pipeline" - mock "github.com/ethersphere/bee/pkg/file/pipeline/mock" - "github.com/ethersphere/bee/pkg/file/pipeline/store" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + mock "github.com/ethersphere/bee/v2/pkg/file/pipeline/mock" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/store" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // TestStoreWriter tests that store writer stores the provided data and calls the next chain writer. diff --git a/pkg/file/redundancy/getter/getter.go b/pkg/file/redundancy/getter/getter.go index bb51e162132..85bbec34435 100644 --- a/pkg/file/redundancy/getter/getter.go +++ b/pkg/file/redundancy/getter/getter.go @@ -10,9 +10,9 @@ import ( "sync" "sync/atomic" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/klauspost/reedsolomon" ) diff --git a/pkg/file/redundancy/getter/getter_test.go b/pkg/file/redundancy/getter/getter_test.go index 73679659ff3..c229126d904 100644 --- a/pkg/file/redundancy/getter/getter_test.go +++ b/pkg/file/redundancy/getter/getter_test.go @@ -17,12 +17,12 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/file/redundancy/getter" - "github.com/ethersphere/bee/pkg/storage" - inmem "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/file/redundancy/getter" + "github.com/ethersphere/bee/v2/pkg/storage" + inmem "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/klauspost/reedsolomon" "golang.org/x/sync/errgroup" ) diff --git a/pkg/file/redundancy/getter/strategies.go b/pkg/file/redundancy/getter/strategies.go index f61632a5370..e632f95f8c2 100644 --- a/pkg/file/redundancy/getter/strategies.go +++ b/pkg/file/redundancy/getter/strategies.go @@ -9,8 +9,8 @@ import ( "fmt" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/retrieval" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/retrieval" ) const ( diff --git a/pkg/file/redundancy/level.go b/pkg/file/redundancy/level.go index f7b4f5c19f1..45b091da98b 100644 --- a/pkg/file/redundancy/level.go +++ b/pkg/file/redundancy/level.go @@ -9,7 +9,7 @@ import ( "errors" "fmt" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // Level is the redundancy level diff --git a/pkg/file/redundancy/redundancy.go b/pkg/file/redundancy/redundancy.go index 443dc0637b3..20ee7552d39 100644 --- a/pkg/file/redundancy/redundancy.go +++ b/pkg/file/redundancy/redundancy.go @@ -7,8 +7,8 @@ package redundancy import ( "fmt" - "github.com/ethersphere/bee/pkg/file/pipeline" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/klauspost/reedsolomon" ) diff --git a/pkg/file/redundancy/redundancy_test.go b/pkg/file/redundancy/redundancy_test.go index bb7aa35ba75..e6ad81a16a7 100644 --- a/pkg/file/redundancy/redundancy_test.go +++ b/pkg/file/redundancy/redundancy_test.go @@ -11,10 +11,10 @@ import ( "sync" "testing" - "github.com/ethersphere/bee/pkg/file/pipeline" - "github.com/ethersphere/bee/pkg/file/pipeline/bmt" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/bmt" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type mockEncoder struct { diff --git a/pkg/file/redundancy/span.go b/pkg/file/redundancy/span.go index eb71286fa43..9817729d3ae 100644 --- a/pkg/file/redundancy/span.go +++ b/pkg/file/redundancy/span.go @@ -5,7 +5,7 @@ package redundancy import ( - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // EncodeLevel encodes used redundancy level for uploading into span keeping the real byte count for the chunk. diff --git a/pkg/file/span.go b/pkg/file/span.go index 33c1ad66dc4..b8366233bd2 100644 --- a/pkg/file/span.go +++ b/pkg/file/span.go @@ -7,7 +7,7 @@ package file import ( "math" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var Spans []int64 diff --git a/pkg/file/splitter/internal/job.go b/pkg/file/splitter/internal/job.go index e4b20663058..db34e5764c1 100644 --- a/pkg/file/splitter/internal/job.go +++ b/pkg/file/splitter/internal/job.go @@ -10,11 +10,11 @@ import ( "errors" "fmt" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/encryption" - "github.com/ethersphere/bee/pkg/file" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/encryption" + "github.com/ethersphere/bee/v2/pkg/file" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // maximum amount of file tree levels this file hasher component can handle diff --git a/pkg/file/splitter/internal/job_test.go b/pkg/file/splitter/internal/job_test.go index 757fb2fc028..bc7945c4b42 100644 --- a/pkg/file/splitter/internal/job_test.go +++ b/pkg/file/splitter/internal/job_test.go @@ -10,10 +10,10 @@ import ( "strings" "testing" - "github.com/ethersphere/bee/pkg/file/splitter/internal" - test "github.com/ethersphere/bee/pkg/file/testing" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file/splitter/internal" + test "github.com/ethersphere/bee/v2/pkg/file/testing" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/file/splitter/splitter.go b/pkg/file/splitter/splitter.go index 8e74713b130..62015e5e666 100644 --- a/pkg/file/splitter/splitter.go +++ b/pkg/file/splitter/splitter.go @@ -11,10 +11,10 @@ import ( "fmt" "io" - "github.com/ethersphere/bee/pkg/file" - "github.com/ethersphere/bee/pkg/file/splitter/internal" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file" + "github.com/ethersphere/bee/v2/pkg/file/splitter/internal" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // simpleSplitter wraps a non-optimized implementation of file.Splitter diff --git a/pkg/file/splitter/splitter_test.go b/pkg/file/splitter/splitter_test.go index 45bf804f542..c37d6d1f496 100644 --- a/pkg/file/splitter/splitter_test.go +++ b/pkg/file/splitter/splitter_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/file" - "github.com/ethersphere/bee/pkg/file/splitter" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/file" + "github.com/ethersphere/bee/v2/pkg/file/splitter" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" mockbytes "gitlab.com/nolash/go-mockbytes" ) diff --git a/pkg/file/testing/chunk.go b/pkg/file/testing/chunk.go index f178dd99063..2f19164b0db 100644 --- a/pkg/file/testing/chunk.go +++ b/pkg/file/testing/chunk.go @@ -8,7 +8,7 @@ import ( "crypto/rand" "encoding/binary" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // GenerateTestRandomFileChunk generates one single chunk with arbitrary content and address diff --git a/pkg/file/testing/vector.go b/pkg/file/testing/vector.go index 076e064fafc..028f7eff2ce 100644 --- a/pkg/file/testing/vector.go +++ b/pkg/file/testing/vector.go @@ -7,7 +7,7 @@ package testing import ( "testing" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" mockbytes "gitlab.com/nolash/go-mockbytes" ) diff --git a/pkg/file/utils.go b/pkg/file/utils.go index 35f21414b82..ce1f94d372a 100644 --- a/pkg/file/utils.go +++ b/pkg/file/utils.go @@ -8,8 +8,8 @@ import ( "bytes" "errors" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/hive/hive.go b/pkg/hive/hive.go index 7d129446754..a84c841f89e 100644 --- a/pkg/hive/hive.go +++ b/pkg/hive/hive.go @@ -20,14 +20,14 @@ import ( "golang.org/x/sync/semaphore" - "github.com/ethersphere/bee/pkg/addressbook" - "github.com/ethersphere/bee/pkg/bzz" - "github.com/ethersphere/bee/pkg/hive/pb" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/ratelimit" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/addressbook" + "github.com/ethersphere/bee/v2/pkg/bzz" + "github.com/ethersphere/bee/v2/pkg/hive/pb" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/ratelimit" + "github.com/ethersphere/bee/v2/pkg/swarm" ma "github.com/multiformats/go-multiaddr" manet "github.com/multiformats/go-multiaddr/net" ) diff --git a/pkg/hive/hive_test.go b/pkg/hive/hive_test.go index b3b0d55305d..324bac45895 100644 --- a/pkg/hive/hive_test.go +++ b/pkg/hive/hive_test.go @@ -16,18 +16,18 @@ import ( "github.com/ethereum/go-ethereum/common" ma "github.com/multiformats/go-multiaddr" - ab "github.com/ethersphere/bee/pkg/addressbook" - "github.com/ethersphere/bee/pkg/bzz" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/hive" - "github.com/ethersphere/bee/pkg/hive/pb" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/p2p/streamtest" - "github.com/ethersphere/bee/pkg/spinlock" - "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + ab "github.com/ethersphere/bee/v2/pkg/addressbook" + "github.com/ethersphere/bee/v2/pkg/bzz" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/hive" + "github.com/ethersphere/bee/v2/pkg/hive/pb" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/p2p/streamtest" + "github.com/ethersphere/bee/v2/pkg/spinlock" + "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) var ( diff --git a/pkg/hive/metrics.go b/pkg/hive/metrics.go index c9a256f87b0..a09bcc09ffd 100644 --- a/pkg/hive/metrics.go +++ b/pkg/hive/metrics.go @@ -5,7 +5,7 @@ package hive import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/jsonhttp/handlers_test.go b/pkg/jsonhttp/handlers_test.go index 424d6ebfb29..7ede319580c 100644 --- a/pkg/jsonhttp/handlers_test.go +++ b/pkg/jsonhttp/handlers_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - "github.com/ethersphere/bee/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" ) func TestMethodHandler(t *testing.T) { diff --git a/pkg/jsonhttp/jsonhttp_test.go b/pkg/jsonhttp/jsonhttp_test.go index 6b107ffe8ee..cd6a378d5c5 100644 --- a/pkg/jsonhttp/jsonhttp_test.go +++ b/pkg/jsonhttp/jsonhttp_test.go @@ -13,7 +13,7 @@ import ( "reflect" "testing" - "github.com/ethersphere/bee/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" ) func TestRespond_defaults(t *testing.T) { diff --git a/pkg/jsonhttp/jsonhttptest/jsonhttptest.go b/pkg/jsonhttp/jsonhttptest/jsonhttptest.go index 7f5cabf35d2..1c436ec9373 100644 --- a/pkg/jsonhttp/jsonhttptest/jsonhttptest.go +++ b/pkg/jsonhttp/jsonhttptest/jsonhttptest.go @@ -18,7 +18,7 @@ import ( "strconv" "testing" - "github.com/ethersphere/bee/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" ) // Request is a testing helper function that makes an HTTP request using diff --git a/pkg/jsonhttp/jsonhttptest/jsonhttptest_test.go b/pkg/jsonhttp/jsonhttptest/jsonhttptest_test.go index 9f3a77a3f39..63b48556f37 100644 --- a/pkg/jsonhttp/jsonhttptest/jsonhttptest_test.go +++ b/pkg/jsonhttp/jsonhttptest/jsonhttptest_test.go @@ -19,8 +19,8 @@ import ( "strings" "testing" - "github.com/ethersphere/bee/pkg/jsonhttp" - "github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest" + "github.com/ethersphere/bee/v2/pkg/jsonhttp" + "github.com/ethersphere/bee/v2/pkg/jsonhttp/jsonhttptest" ) func TestRequest_statusCode(t *testing.T) { diff --git a/pkg/keystore/file/key.go b/pkg/keystore/file/key.go index fbec230f942..68e6a2e2edf 100644 --- a/pkg/keystore/file/key.go +++ b/pkg/keystore/file/key.go @@ -17,8 +17,8 @@ import ( "io" "github.com/btcsuite/btcd/btcec/v2" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/keystore" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/keystore" "github.com/google/uuid" "golang.org/x/crypto/scrypt" "golang.org/x/crypto/sha3" diff --git a/pkg/keystore/file/service.go b/pkg/keystore/file/service.go index 199de659406..01a5db72aeb 100644 --- a/pkg/keystore/file/service.go +++ b/pkg/keystore/file/service.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - "github.com/ethersphere/bee/pkg/keystore" + "github.com/ethersphere/bee/v2/pkg/keystore" ) // Service is the file-based keystore.Service implementation. diff --git a/pkg/keystore/file/service_test.go b/pkg/keystore/file/service_test.go index 70205afbaa9..4c115c7f79e 100644 --- a/pkg/keystore/file/service_test.go +++ b/pkg/keystore/file/service_test.go @@ -7,8 +7,8 @@ package file_test import ( "testing" - "github.com/ethersphere/bee/pkg/keystore/file" - "github.com/ethersphere/bee/pkg/keystore/test" + "github.com/ethersphere/bee/v2/pkg/keystore/file" + "github.com/ethersphere/bee/v2/pkg/keystore/test" ) func TestService(t *testing.T) { diff --git a/pkg/keystore/mem/service.go b/pkg/keystore/mem/service.go index 5d8d5ab0a7f..46868957d1e 100644 --- a/pkg/keystore/mem/service.go +++ b/pkg/keystore/mem/service.go @@ -9,7 +9,7 @@ import ( "fmt" "sync" - "github.com/ethersphere/bee/pkg/keystore" + "github.com/ethersphere/bee/v2/pkg/keystore" ) var _ keystore.Service = (*Service)(nil) diff --git a/pkg/keystore/mem/service_test.go b/pkg/keystore/mem/service_test.go index fcf5ec88381..ae3d4640cc0 100644 --- a/pkg/keystore/mem/service_test.go +++ b/pkg/keystore/mem/service_test.go @@ -7,8 +7,8 @@ package mem_test import ( "testing" - "github.com/ethersphere/bee/pkg/keystore/mem" - "github.com/ethersphere/bee/pkg/keystore/test" + "github.com/ethersphere/bee/v2/pkg/keystore/mem" + "github.com/ethersphere/bee/v2/pkg/keystore/test" ) func TestService(t *testing.T) { diff --git a/pkg/keystore/test/test.go b/pkg/keystore/test/test.go index c9cf9a4245d..5eb4a4c1b26 100644 --- a/pkg/keystore/test/test.go +++ b/pkg/keystore/test/test.go @@ -9,8 +9,8 @@ import ( "errors" "testing" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/keystore" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/keystore" ) // Service is a utility testing function that can be used to test diff --git a/pkg/log/example_test.go b/pkg/log/example_test.go index 8cbc3e8b920..bae4790b966 100644 --- a/pkg/log/example_test.go +++ b/pkg/log/example_test.go @@ -9,7 +9,7 @@ import ( "fmt" "os" - "github.com/ethersphere/bee/pkg/log" + "github.com/ethersphere/bee/v2/pkg/log" ) func Example() { diff --git a/pkg/log/formatter_test.go b/pkg/log/formatter_test.go index 4ba6d920242..1db5697ce98 100644 --- a/pkg/log/formatter_test.go +++ b/pkg/log/formatter_test.go @@ -383,7 +383,7 @@ func TestPretty(t *testing.T) { exp: `{"Inner":"I am a log.Marshaler"}`, }, { val: (*marshalerTest)(nil), - exp: `""`, + exp: `""`, }, { val: marshalerPanicTest{"foobar"}, exp: `""`, @@ -395,7 +395,7 @@ func TestPretty(t *testing.T) { exp: `"I am a fmt.Stringer"`, }, { val: (*stringerTest)(nil), - exp: `""`, + exp: `""`, }, { val: stringerPanicTest{"foobar"}, exp: `""`, @@ -407,7 +407,7 @@ func TestPretty(t *testing.T) { exp: `"I am an error"`, }, { val: (*errorTest)(nil), - exp: `""`, + exp: `""`, }, { val: errorPanicTest{"foobar"}, exp: `""`, diff --git a/pkg/log/httpaccess/http_access.go b/pkg/log/httpaccess/http_access.go index 4b240534716..ab57f9d3b14 100644 --- a/pkg/log/httpaccess/http_access.go +++ b/pkg/log/httpaccess/http_access.go @@ -10,8 +10,8 @@ import ( "net/http" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/tracing" ) // NewHTTPAccessSuppressLogHandler creates a diff --git a/pkg/log/logger.go b/pkg/log/logger.go index 98b554bc2a4..f40ffd59916 100644 --- a/pkg/log/logger.go +++ b/pkg/log/logger.go @@ -13,7 +13,7 @@ import ( "strings" "time" - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/hashicorp/go-multierror" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/log/logger_test.go b/pkg/log/logger_test.go index 6a92f92ef00..f7c23308808 100644 --- a/pkg/log/logger_test.go +++ b/pkg/log/logger_test.go @@ -381,7 +381,7 @@ func TestLoggerWithCaller(t *testing.T) { } }) t.Run("caller=CategoryAll, logCallerFunc=true", func(t *testing.T) { - const thisFunc = "github.com/ethersphere/bee/pkg/log.TestLoggerWithCaller.func3" + const thisFunc = "github.com/ethersphere/bee/v2/pkg/log.TestLoggerWithCaller.func3" logger, bb := newLogger(WithCaller(CategoryAll), WithCallerFunc()) diff --git a/pkg/log/metrics.go b/pkg/log/metrics.go index 85a12fa1bf6..2691868921a 100644 --- a/pkg/log/metrics.go +++ b/pkg/log/metrics.go @@ -5,7 +5,7 @@ package log import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/manifest/manifest.go b/pkg/manifest/manifest.go index 6ebee2eacdb..70d8c76db51 100644 --- a/pkg/manifest/manifest.go +++ b/pkg/manifest/manifest.go @@ -10,8 +10,8 @@ import ( "context" "errors" - "github.com/ethersphere/bee/pkg/file" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const DefaultManifestType = ManifestMantarayContentType diff --git a/pkg/manifest/mantaray.go b/pkg/manifest/mantaray.go index 908d7b4ad6d..f3b86e06b66 100644 --- a/pkg/manifest/mantaray.go +++ b/pkg/manifest/mantaray.go @@ -9,9 +9,9 @@ import ( "errors" "fmt" - "github.com/ethersphere/bee/pkg/file" - "github.com/ethersphere/bee/pkg/manifest/mantaray" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file" + "github.com/ethersphere/bee/v2/pkg/manifest/mantaray" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const ( diff --git a/pkg/manifest/mantaray/node_test.go b/pkg/manifest/mantaray/node_test.go index a0647d085d0..aa2e2f5c355 100644 --- a/pkg/manifest/mantaray/node_test.go +++ b/pkg/manifest/mantaray/node_test.go @@ -11,7 +11,7 @@ import ( "strconv" "testing" - "github.com/ethersphere/bee/pkg/manifest/mantaray" + "github.com/ethersphere/bee/v2/pkg/manifest/mantaray" ) func TestNilPath(t *testing.T) { diff --git a/pkg/manifest/mantaray/persist_test.go b/pkg/manifest/mantaray/persist_test.go index e6feaee79aa..b6a6c47e699 100644 --- a/pkg/manifest/mantaray/persist_test.go +++ b/pkg/manifest/mantaray/persist_test.go @@ -11,7 +11,7 @@ import ( "sync" "testing" - "github.com/ethersphere/bee/pkg/manifest/mantaray" + "github.com/ethersphere/bee/v2/pkg/manifest/mantaray" ) func TestPersistIdempotence(t *testing.T) { diff --git a/pkg/manifest/mantaray/walker_test.go b/pkg/manifest/mantaray/walker_test.go index ad6553eef6c..67ab9c7d18c 100644 --- a/pkg/manifest/mantaray/walker_test.go +++ b/pkg/manifest/mantaray/walker_test.go @@ -10,7 +10,7 @@ import ( "fmt" "testing" - "github.com/ethersphere/bee/pkg/manifest/mantaray" + "github.com/ethersphere/bee/v2/pkg/manifest/mantaray" ) func TestWalkNode(t *testing.T) { diff --git a/pkg/manifest/simple.go b/pkg/manifest/simple.go index d6ae3828212..5bc9927bc1d 100644 --- a/pkg/manifest/simple.go +++ b/pkg/manifest/simple.go @@ -9,9 +9,9 @@ import ( "errors" "fmt" - "github.com/ethersphere/bee/pkg/file" - "github.com/ethersphere/bee/pkg/manifest/simple" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file" + "github.com/ethersphere/bee/v2/pkg/manifest/simple" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const ( diff --git a/pkg/manifest/simple/manifest_test.go b/pkg/manifest/simple/manifest_test.go index a8693b5ca8a..aa1345acd3d 100644 --- a/pkg/manifest/simple/manifest_test.go +++ b/pkg/manifest/simple/manifest_test.go @@ -9,8 +9,8 @@ import ( "reflect" "testing" - "github.com/ethersphere/bee/pkg/manifest/simple" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/manifest/simple" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestNilPath(t *testing.T) { diff --git a/pkg/manifest/simple/walker_test.go b/pkg/manifest/simple/walker_test.go index d6f2bac8170..c3877ce664e 100644 --- a/pkg/manifest/simple/walker_test.go +++ b/pkg/manifest/simple/walker_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/ethersphere/bee/pkg/manifest/simple" + "github.com/ethersphere/bee/v2/pkg/manifest/simple" ) func TestWalkEntry(t *testing.T) { diff --git a/pkg/metrics/metrics_test.go b/pkg/metrics/metrics_test.go index 42522cd40db..65029836e69 100644 --- a/pkg/metrics/metrics_test.go +++ b/pkg/metrics/metrics_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/ethersphere/bee/pkg/metrics" + "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/node/bootstrap.go b/pkg/node/bootstrap.go index a1e48228da7..a0aa07bcd72 100644 --- a/pkg/node/bootstrap.go +++ b/pkg/node/bootstrap.go @@ -16,33 +16,33 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/accounting" - "github.com/ethersphere/bee/pkg/addressbook" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/feeds" - "github.com/ethersphere/bee/pkg/feeds/factory" - "github.com/ethersphere/bee/pkg/file" - "github.com/ethersphere/bee/pkg/file/joiner" - "github.com/ethersphere/bee/pkg/file/loadsave" - "github.com/ethersphere/bee/pkg/hive" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/manifest" - "github.com/ethersphere/bee/pkg/p2p/libp2p" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/pricer" - "github.com/ethersphere/bee/pkg/pricing" - "github.com/ethersphere/bee/pkg/retrieval" - "github.com/ethersphere/bee/pkg/settlement/pseudosettle" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" - "github.com/ethersphere/bee/pkg/spinlock" - "github.com/ethersphere/bee/pkg/storage" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/topology/kademlia" - "github.com/ethersphere/bee/pkg/topology/lightnode" - "github.com/ethersphere/bee/pkg/tracing" - "github.com/ethersphere/bee/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/accounting" + "github.com/ethersphere/bee/v2/pkg/addressbook" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/feeds" + "github.com/ethersphere/bee/v2/pkg/feeds/factory" + "github.com/ethersphere/bee/v2/pkg/file" + "github.com/ethersphere/bee/v2/pkg/file/joiner" + "github.com/ethersphere/bee/v2/pkg/file/loadsave" + "github.com/ethersphere/bee/v2/pkg/hive" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/manifest" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/pricer" + "github.com/ethersphere/bee/v2/pkg/pricing" + "github.com/ethersphere/bee/v2/pkg/retrieval" + "github.com/ethersphere/bee/v2/pkg/settlement/pseudosettle" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" + "github.com/ethersphere/bee/v2/pkg/spinlock" + "github.com/ethersphere/bee/v2/pkg/storage" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/topology/kademlia" + "github.com/ethersphere/bee/v2/pkg/topology/lightnode" + "github.com/ethersphere/bee/v2/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/transaction" "github.com/hashicorp/go-multierror" ma "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/node/chain.go b/pkg/node/chain.go index c4cab943207..463c3d5c649 100644 --- a/pkg/node/chain.go +++ b/pkg/node/chain.go @@ -18,21 +18,21 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/rpc" - "github.com/ethersphere/bee/pkg/config" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p/libp2p" - "github.com/ethersphere/bee/pkg/postage/postagecontract" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/settlement" - "github.com/ethersphere/bee/pkg/settlement/swap" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" - "github.com/ethersphere/bee/pkg/settlement/swap/erc20" - "github.com/ethersphere/bee/pkg/settlement/swap/priceoracle" - "github.com/ethersphere/bee/pkg/settlement/swap/swapprotocol" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/transaction/wrapped" + "github.com/ethersphere/bee/v2/pkg/config" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p" + "github.com/ethersphere/bee/v2/pkg/postage/postagecontract" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/settlement" + "github.com/ethersphere/bee/v2/pkg/settlement/swap" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/priceoracle" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/swapprotocol" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/transaction/wrapped" "github.com/ethersphere/go-sw3-abi/sw3abi" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/node/devnode.go b/pkg/node/devnode.go index cff06b2d711..b45715bd152 100644 --- a/pkg/node/devnode.go +++ b/pkg/node/devnode.go @@ -17,44 +17,44 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - mockAccounting "github.com/ethersphere/bee/pkg/accounting/mock" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/auth" - "github.com/ethersphere/bee/pkg/bzz" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/feeds/factory" - "github.com/ethersphere/bee/pkg/log" - mockP2P "github.com/ethersphere/bee/pkg/p2p/mock" - mockPingPong "github.com/ethersphere/bee/pkg/pingpong/mock" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/postage/batchstore" - mockPost "github.com/ethersphere/bee/pkg/postage/mock" - "github.com/ethersphere/bee/pkg/postage/postagecontract" - mockPostContract "github.com/ethersphere/bee/pkg/postage/postagecontract/mock" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - "github.com/ethersphere/bee/pkg/pss" - "github.com/ethersphere/bee/pkg/pushsync" - mockPushsync "github.com/ethersphere/bee/pkg/pushsync/mock" - resolverMock "github.com/ethersphere/bee/pkg/resolver/mock" - "github.com/ethersphere/bee/pkg/settlement/pseudosettle" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" - mockchequebook "github.com/ethersphere/bee/pkg/settlement/swap/chequebook/mock" - erc20mock "github.com/ethersphere/bee/pkg/settlement/swap/erc20/mock" - swapmock "github.com/ethersphere/bee/pkg/settlement/swap/mock" - "github.com/ethersphere/bee/pkg/statestore/leveldb" - mockSteward "github.com/ethersphere/bee/pkg/steward/mock" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - "github.com/ethersphere/bee/pkg/storageincentives/staking" - stakingContractMock "github.com/ethersphere/bee/pkg/storageincentives/staking/mock" - "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology/lightnode" - mockTopology "github.com/ethersphere/bee/pkg/topology/mock" - "github.com/ethersphere/bee/pkg/tracing" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/transaction/backendmock" - transactionmock "github.com/ethersphere/bee/pkg/transaction/mock" - "github.com/ethersphere/bee/pkg/util/ioutil" + mockAccounting "github.com/ethersphere/bee/v2/pkg/accounting/mock" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/auth" + "github.com/ethersphere/bee/v2/pkg/bzz" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/feeds/factory" + "github.com/ethersphere/bee/v2/pkg/log" + mockP2P "github.com/ethersphere/bee/v2/pkg/p2p/mock" + mockPingPong "github.com/ethersphere/bee/v2/pkg/pingpong/mock" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage/batchstore" + mockPost "github.com/ethersphere/bee/v2/pkg/postage/mock" + "github.com/ethersphere/bee/v2/pkg/postage/postagecontract" + mockPostContract "github.com/ethersphere/bee/v2/pkg/postage/postagecontract/mock" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + "github.com/ethersphere/bee/v2/pkg/pss" + "github.com/ethersphere/bee/v2/pkg/pushsync" + mockPushsync "github.com/ethersphere/bee/v2/pkg/pushsync/mock" + resolverMock "github.com/ethersphere/bee/v2/pkg/resolver/mock" + "github.com/ethersphere/bee/v2/pkg/settlement/pseudosettle" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" + mockchequebook "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook/mock" + erc20mock "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20/mock" + swapmock "github.com/ethersphere/bee/v2/pkg/settlement/swap/mock" + "github.com/ethersphere/bee/v2/pkg/statestore/leveldb" + mockSteward "github.com/ethersphere/bee/v2/pkg/steward/mock" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + "github.com/ethersphere/bee/v2/pkg/storageincentives/staking" + stakingContractMock "github.com/ethersphere/bee/v2/pkg/storageincentives/staking/mock" + "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology/lightnode" + mockTopology "github.com/ethersphere/bee/v2/pkg/topology/mock" + "github.com/ethersphere/bee/v2/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/transaction/backendmock" + transactionmock "github.com/ethersphere/bee/v2/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/util/ioutil" "github.com/hashicorp/go-multierror" "github.com/multiformats/go-multiaddr" "golang.org/x/sync/errgroup" diff --git a/pkg/node/node.go b/pkg/node/node.go index ba8b98c5d20..2996b8d77d5 100644 --- a/pkg/node/node.go +++ b/pkg/node/node.go @@ -24,55 +24,55 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/accounting" - "github.com/ethersphere/bee/pkg/addressbook" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/auth" - "github.com/ethersphere/bee/pkg/config" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/feeds/factory" - "github.com/ethersphere/bee/pkg/hive" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/metrics" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/libp2p" - "github.com/ethersphere/bee/pkg/pingpong" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/postage/batchservice" - "github.com/ethersphere/bee/pkg/postage/batchstore" - "github.com/ethersphere/bee/pkg/postage/listener" - "github.com/ethersphere/bee/pkg/postage/postagecontract" - "github.com/ethersphere/bee/pkg/pricer" - "github.com/ethersphere/bee/pkg/pricing" - "github.com/ethersphere/bee/pkg/pss" - "github.com/ethersphere/bee/pkg/puller" - "github.com/ethersphere/bee/pkg/pullsync" - "github.com/ethersphere/bee/pkg/pusher" - "github.com/ethersphere/bee/pkg/pushsync" - "github.com/ethersphere/bee/pkg/resolver/multiresolver" - "github.com/ethersphere/bee/pkg/retrieval" - "github.com/ethersphere/bee/pkg/salud" - "github.com/ethersphere/bee/pkg/settlement/pseudosettle" - "github.com/ethersphere/bee/pkg/settlement/swap" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" - "github.com/ethersphere/bee/pkg/settlement/swap/erc20" - "github.com/ethersphere/bee/pkg/settlement/swap/priceoracle" - "github.com/ethersphere/bee/pkg/status" - "github.com/ethersphere/bee/pkg/steward" - "github.com/ethersphere/bee/pkg/storageincentives" - "github.com/ethersphere/bee/pkg/storageincentives/redistribution" - "github.com/ethersphere/bee/pkg/storageincentives/staking" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/topology/kademlia" - "github.com/ethersphere/bee/pkg/topology/lightnode" - "github.com/ethersphere/bee/pkg/tracing" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/util/abiutil" - "github.com/ethersphere/bee/pkg/util/ioutil" - "github.com/ethersphere/bee/pkg/util/nbhdutil" - "github.com/ethersphere/bee/pkg/util/syncutil" + "github.com/ethersphere/bee/v2/pkg/accounting" + "github.com/ethersphere/bee/v2/pkg/addressbook" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/auth" + "github.com/ethersphere/bee/v2/pkg/config" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/feeds/factory" + "github.com/ethersphere/bee/v2/pkg/hive" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/metrics" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p" + "github.com/ethersphere/bee/v2/pkg/pingpong" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage/batchservice" + "github.com/ethersphere/bee/v2/pkg/postage/batchstore" + "github.com/ethersphere/bee/v2/pkg/postage/listener" + "github.com/ethersphere/bee/v2/pkg/postage/postagecontract" + "github.com/ethersphere/bee/v2/pkg/pricer" + "github.com/ethersphere/bee/v2/pkg/pricing" + "github.com/ethersphere/bee/v2/pkg/pss" + "github.com/ethersphere/bee/v2/pkg/puller" + "github.com/ethersphere/bee/v2/pkg/pullsync" + "github.com/ethersphere/bee/v2/pkg/pusher" + "github.com/ethersphere/bee/v2/pkg/pushsync" + "github.com/ethersphere/bee/v2/pkg/resolver/multiresolver" + "github.com/ethersphere/bee/v2/pkg/retrieval" + "github.com/ethersphere/bee/v2/pkg/salud" + "github.com/ethersphere/bee/v2/pkg/settlement/pseudosettle" + "github.com/ethersphere/bee/v2/pkg/settlement/swap" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/priceoracle" + "github.com/ethersphere/bee/v2/pkg/status" + "github.com/ethersphere/bee/v2/pkg/steward" + "github.com/ethersphere/bee/v2/pkg/storageincentives" + "github.com/ethersphere/bee/v2/pkg/storageincentives/redistribution" + "github.com/ethersphere/bee/v2/pkg/storageincentives/staking" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/topology/kademlia" + "github.com/ethersphere/bee/v2/pkg/topology/lightnode" + "github.com/ethersphere/bee/v2/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" + "github.com/ethersphere/bee/v2/pkg/util/ioutil" + "github.com/ethersphere/bee/v2/pkg/util/nbhdutil" + "github.com/ethersphere/bee/v2/pkg/util/syncutil" "github.com/hashicorp/go-multierror" ma "github.com/multiformats/go-multiaddr" promc "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/node/statestore.go b/pkg/node/statestore.go index 9579e1487ef..958ce5f01e1 100644 --- a/pkg/node/statestore.go +++ b/pkg/node/statestore.go @@ -9,13 +9,13 @@ import ( "fmt" "path/filepath" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/metrics" - "github.com/ethersphere/bee/pkg/statestore/storeadapter" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/cache" - "github.com/ethersphere/bee/pkg/storage/leveldbstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/metrics" + "github.com/ethersphere/bee/v2/pkg/statestore/storeadapter" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/cache" + "github.com/ethersphere/bee/v2/pkg/storage/leveldbstore" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // InitStateStore will initialize the stateStore with the given path to the diff --git a/pkg/p2p/libp2p/connections_test.go b/pkg/p2p/libp2p/connections_test.go index 6f560e3ed7d..ae81ad481d0 100644 --- a/pkg/p2p/libp2p/connections_test.go +++ b/pkg/p2p/libp2p/connections_test.go @@ -16,15 +16,15 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/addressbook" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/libp2p" - "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/handshake" - "github.com/ethersphere/bee/pkg/spinlock" - "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology/lightnode" + "github.com/ethersphere/bee/v2/pkg/addressbook" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p/internal/handshake" + "github.com/ethersphere/bee/v2/pkg/spinlock" + "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology/lightnode" "github.com/libp2p/go-libp2p/p2p/host/eventbus" libp2pm "github.com/libp2p/go-libp2p" diff --git a/pkg/p2p/libp2p/export_test.go b/pkg/p2p/libp2p/export_test.go index 468d5bdbef8..f78b9f21275 100644 --- a/pkg/p2p/libp2p/export_test.go +++ b/pkg/p2p/libp2p/export_test.go @@ -7,7 +7,7 @@ package libp2p import ( "context" - handshake "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/handshake" + handshake "github.com/ethersphere/bee/v2/pkg/p2p/libp2p/internal/handshake" libp2pm "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p/core/host" "github.com/libp2p/go-libp2p/core/network" diff --git a/pkg/p2p/libp2p/headers.go b/pkg/p2p/libp2p/headers.go index 10d81d094e0..af658073d82 100644 --- a/pkg/p2p/libp2p/headers.go +++ b/pkg/p2p/libp2p/headers.go @@ -8,10 +8,10 @@ import ( "context" "fmt" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/headers/pb" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p/internal/headers/pb" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func sendHeaders(ctx context.Context, headers p2p.Headers, stream *stream) error { diff --git a/pkg/p2p/libp2p/headers_test.go b/pkg/p2p/libp2p/headers_test.go index 62b9b62925e..5805dafa0d4 100644 --- a/pkg/p2p/libp2p/headers_test.go +++ b/pkg/p2p/libp2p/headers_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/libp2p" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestHeaders(t *testing.T) { diff --git a/pkg/p2p/libp2p/internal/blocklist/blocklist.go b/pkg/p2p/libp2p/internal/blocklist/blocklist.go index 683d43bbeae..d5ecee4d24d 100644 --- a/pkg/p2p/libp2p/internal/blocklist/blocklist.go +++ b/pkg/p2p/libp2p/internal/blocklist/blocklist.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var keyPrefix = "blocklist-" diff --git a/pkg/p2p/libp2p/internal/blocklist/blocklist_test.go b/pkg/p2p/libp2p/internal/blocklist/blocklist_test.go index d0bc3e4108f..dd932fc6acf 100644 --- a/pkg/p2p/libp2p/internal/blocklist/blocklist_test.go +++ b/pkg/p2p/libp2p/internal/blocklist/blocklist_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/blocklist" - "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p/internal/blocklist" + "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestExist(t *testing.T) { diff --git a/pkg/p2p/libp2p/internal/blocklist/export_test.go b/pkg/p2p/libp2p/internal/blocklist/export_test.go index bf70482c379..76c7599ffa4 100644 --- a/pkg/p2p/libp2p/internal/blocklist/export_test.go +++ b/pkg/p2p/libp2p/internal/blocklist/export_test.go @@ -5,7 +5,7 @@ package blocklist import ( - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage" ) func NewBlocklistWithCurrentTimeFn(store storage.StateStorer, currentTimeFn currentTimeFn) *Blocklist { diff --git a/pkg/p2p/libp2p/internal/breaker/breaker_test.go b/pkg/p2p/libp2p/internal/breaker/breaker_test.go index df02ab647de..2693037abbf 100644 --- a/pkg/p2p/libp2p/internal/breaker/breaker_test.go +++ b/pkg/p2p/libp2p/internal/breaker/breaker_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/breaker" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p/internal/breaker" ) func TestExecute(t *testing.T) { diff --git a/pkg/p2p/libp2p/internal/handshake/handshake.go b/pkg/p2p/libp2p/internal/handshake/handshake.go index badfcd31568..fb605073253 100644 --- a/pkg/p2p/libp2p/internal/handshake/handshake.go +++ b/pkg/p2p/libp2p/internal/handshake/handshake.go @@ -11,13 +11,13 @@ import ( "sync/atomic" "time" - "github.com/ethersphere/bee/pkg/bzz" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/handshake/pb" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bzz" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p/internal/handshake/pb" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/swarm" libp2ppeer "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" diff --git a/pkg/p2p/libp2p/internal/handshake/handshake_test.go b/pkg/p2p/libp2p/internal/handshake/handshake_test.go index 5dc37116028..e0afcc56d70 100644 --- a/pkg/p2p/libp2p/internal/handshake/handshake_test.go +++ b/pkg/p2p/libp2p/internal/handshake/handshake_test.go @@ -12,14 +12,14 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/bzz" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/handshake" - "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/handshake/mock" - "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/handshake/pb" - "github.com/ethersphere/bee/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/bzz" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p/internal/handshake" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p/internal/handshake/mock" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p/internal/handshake/pb" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" libp2ppeer "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" diff --git a/pkg/p2p/libp2p/internal/handshake/metrics.go b/pkg/p2p/libp2p/internal/handshake/metrics.go index e0313dd17cd..c8177d3f93e 100644 --- a/pkg/p2p/libp2p/internal/handshake/metrics.go +++ b/pkg/p2p/libp2p/internal/handshake/metrics.go @@ -5,7 +5,7 @@ package handshake import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/p2p/libp2p/internal/handshake/mock/stream.go b/pkg/p2p/libp2p/internal/handshake/mock/stream.go index 69ffcb7ce59..bebe17fe30a 100644 --- a/pkg/p2p/libp2p/internal/handshake/mock/stream.go +++ b/pkg/p2p/libp2p/internal/handshake/mock/stream.go @@ -7,7 +7,7 @@ package mock import ( "bytes" - "github.com/ethersphere/bee/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p" ) type Stream struct { diff --git a/pkg/p2p/libp2p/internal/reacher/metrics.go b/pkg/p2p/libp2p/internal/reacher/metrics.go index ab745943b2c..d3d90837a6f 100644 --- a/pkg/p2p/libp2p/internal/reacher/metrics.go +++ b/pkg/p2p/libp2p/internal/reacher/metrics.go @@ -5,7 +5,7 @@ package reacher import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/p2p/libp2p/internal/reacher/reacher.go b/pkg/p2p/libp2p/internal/reacher/reacher.go index da87d6049b1..ad888df4d0f 100644 --- a/pkg/p2p/libp2p/internal/reacher/reacher.go +++ b/pkg/p2p/libp2p/internal/reacher/reacher.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/swarm" ma "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/p2p/libp2p/internal/reacher/reacher_test.go b/pkg/p2p/libp2p/internal/reacher/reacher_test.go index a842103115a..d60bb2cc9cc 100644 --- a/pkg/p2p/libp2p/internal/reacher/reacher_test.go +++ b/pkg/p2p/libp2p/internal/reacher/reacher_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/reacher" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p/internal/reacher" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ma "github.com/multiformats/go-multiaddr" "go.uber.org/atomic" ) diff --git a/pkg/p2p/libp2p/libp2p.go b/pkg/p2p/libp2p/libp2p.go index d7250a517fb..4671f4cde36 100644 --- a/pkg/p2p/libp2p/libp2p.go +++ b/pkg/p2p/libp2p/libp2p.go @@ -17,21 +17,21 @@ import ( "sync" "time" - "github.com/ethersphere/bee" - "github.com/ethersphere/bee/pkg/addressbook" - "github.com/ethersphere/bee/pkg/bzz" - beecrypto "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/blocklist" - "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/breaker" - handshake "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/handshake" - "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/reacher" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/topology/lightnode" - "github.com/ethersphere/bee/pkg/tracing" + "github.com/ethersphere/bee/v2" + "github.com/ethersphere/bee/v2/pkg/addressbook" + "github.com/ethersphere/bee/v2/pkg/bzz" + beecrypto "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p/internal/blocklist" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p/internal/breaker" + handshake "github.com/ethersphere/bee/v2/pkg/p2p/libp2p/internal/handshake" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p/internal/reacher" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/topology/lightnode" + "github.com/ethersphere/bee/v2/pkg/tracing" libp2p "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/event" @@ -54,7 +54,7 @@ import ( "go.uber.org/atomic" ocprom "contrib.go.opencensus.io/exporter/prometheus" - m2 "github.com/ethersphere/bee/pkg/metrics" + m2 "github.com/ethersphere/bee/v2/pkg/metrics" rcmgrObs "github.com/libp2p/go-libp2p/p2p/host/resource-manager" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/p2p/libp2p/libp2p_test.go b/pkg/p2p/libp2p/libp2p_test.go index 378d4dbc9d3..c467247547e 100644 --- a/pkg/p2p/libp2p/libp2p_test.go +++ b/pkg/p2p/libp2p/libp2p_test.go @@ -13,16 +13,16 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/addressbook" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/libp2p" - "github.com/ethersphere/bee/pkg/spinlock" - "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology/lightnode" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/addressbook" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p" + "github.com/ethersphere/bee/v2/pkg/spinlock" + "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology/lightnode" + "github.com/ethersphere/bee/v2/pkg/util/testutil" "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/p2p/libp2p/metrics.go b/pkg/p2p/libp2p/metrics.go index b7f6e79a665..003970856d2 100644 --- a/pkg/p2p/libp2p/metrics.go +++ b/pkg/p2p/libp2p/metrics.go @@ -5,7 +5,7 @@ package libp2p import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/p2p/libp2p/peer.go b/pkg/p2p/libp2p/peer.go index c8eeb1578c2..5aa0f75713a 100644 --- a/pkg/p2p/libp2p/peer.go +++ b/pkg/p2p/libp2p/peer.go @@ -10,8 +10,8 @@ import ( "sort" "sync" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/libp2p/go-libp2p/core/network" libp2ppeer "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" diff --git a/pkg/p2p/libp2p/protocols_test.go b/pkg/p2p/libp2p/protocols_test.go index b4f2fab91f8..ef2acf0d82b 100644 --- a/pkg/p2p/libp2p/protocols_test.go +++ b/pkg/p2p/libp2p/protocols_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/libp2p" - "github.com/ethersphere/bee/pkg/spinlock" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p" + "github.com/ethersphere/bee/v2/pkg/spinlock" libp2pm "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p/core/host" protocol "github.com/libp2p/go-libp2p/core/protocol" diff --git a/pkg/p2p/libp2p/static_resolver_test.go b/pkg/p2p/libp2p/static_resolver_test.go index 992d7500004..4aff2ca41c6 100644 --- a/pkg/p2p/libp2p/static_resolver_test.go +++ b/pkg/p2p/libp2p/static_resolver_test.go @@ -8,7 +8,7 @@ import ( "net" "testing" - "github.com/ethersphere/bee/pkg/p2p/libp2p" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p" ma "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/p2p/libp2p/stream.go b/pkg/p2p/libp2p/stream.go index 8535da7e82e..93e7ce6181a 100644 --- a/pkg/p2p/libp2p/stream.go +++ b/pkg/p2p/libp2p/stream.go @@ -9,7 +9,7 @@ import ( "io" "time" - "github.com/ethersphere/bee/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p" "github.com/libp2p/go-libp2p/core/network" ) diff --git a/pkg/p2p/libp2p/tracing_test.go b/pkg/p2p/libp2p/tracing_test.go index 5b54911ec3e..7e02f8e2d7c 100644 --- a/pkg/p2p/libp2p/tracing_test.go +++ b/pkg/p2p/libp2p/tracing_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/libp2p" - "github.com/ethersphere/bee/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p" + "github.com/ethersphere/bee/v2/pkg/tracing" ) func TestTracing(t *testing.T) { diff --git a/pkg/p2p/libp2p/welcome_message_test.go b/pkg/p2p/libp2p/welcome_message_test.go index 839a8fb3f30..5e6ac7a2f2d 100644 --- a/pkg/p2p/libp2p/welcome_message_test.go +++ b/pkg/p2p/libp2p/welcome_message_test.go @@ -7,8 +7,8 @@ import ( "errors" "testing" - "github.com/ethersphere/bee/pkg/p2p/libp2p" - "github.com/ethersphere/bee/pkg/p2p/libp2p/internal/handshake" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p" + "github.com/ethersphere/bee/v2/pkg/p2p/libp2p/internal/handshake" ) func TestDynamicWelcomeMessage(t *testing.T) { diff --git a/pkg/p2p/mock/mock.go b/pkg/p2p/mock/mock.go index 092824da555..eacefd6846b 100644 --- a/pkg/p2p/mock/mock.go +++ b/pkg/p2p/mock/mock.go @@ -9,9 +9,9 @@ import ( "errors" "time" - "github.com/ethersphere/bee/pkg/bzz" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bzz" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/swarm" ma "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/p2p/p2p.go b/pkg/p2p/p2p.go index 4f7897be592..a85b3d9d04b 100644 --- a/pkg/p2p/p2p.go +++ b/pkg/p2p/p2p.go @@ -13,8 +13,8 @@ import ( "io" "time" - "github.com/ethersphere/bee/pkg/bzz" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bzz" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/libp2p/go-libp2p/core/network" ma "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/p2p/p2p_test.go b/pkg/p2p/p2p_test.go index ce01cac2b0a..3c6ce22ca22 100644 --- a/pkg/p2p/p2p_test.go +++ b/pkg/p2p/p2p_test.go @@ -7,7 +7,7 @@ package p2p_test import ( "testing" - "github.com/ethersphere/bee/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p" "github.com/libp2p/go-libp2p/core/network" ) diff --git a/pkg/p2p/protobuf/main_test.go b/pkg/p2p/protobuf/main_test.go index 82148f77600..68f9fc720bb 100644 --- a/pkg/p2p/protobuf/main_test.go +++ b/pkg/p2p/protobuf/main_test.go @@ -16,6 +16,6 @@ func TestMain(m *testing.M) { goleak.IgnoreTopFunction("time.Sleep"), goleak.IgnoreTopFunction("io.(*pipe).read"), goleak.IgnoreTopFunction("io.(*pipe).write"), - goleak.IgnoreTopFunction("github.com/ethersphere/bee/pkg/p2p/protobuf_test.newMessageWriter.func1"), + goleak.IgnoreTopFunction("github.com/ethersphere/bee/v2/pkg/p2p/protobuf_test.newMessageWriter.func1"), ) } diff --git a/pkg/p2p/protobuf/protobuf.go b/pkg/p2p/protobuf/protobuf.go index 7cd02832fc1..3153a6e0302 100644 --- a/pkg/p2p/protobuf/protobuf.go +++ b/pkg/p2p/protobuf/protobuf.go @@ -9,7 +9,7 @@ import ( "errors" "io" - "github.com/ethersphere/bee/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p" ggio "github.com/gogo/protobuf/io" "github.com/gogo/protobuf/proto" ) diff --git a/pkg/p2p/protobuf/protobuf_test.go b/pkg/p2p/protobuf/protobuf_test.go index f161852ab10..5dd675b0687 100644 --- a/pkg/p2p/protobuf/protobuf_test.go +++ b/pkg/p2p/protobuf/protobuf_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/p2p/protobuf/internal/pb" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf/internal/pb" ) func TestReader_ReadMsg(t *testing.T) { diff --git a/pkg/p2p/specwrapper_test.go b/pkg/p2p/specwrapper_test.go index 36f5951849e..2275d2004e5 100644 --- a/pkg/p2p/specwrapper_test.go +++ b/pkg/p2p/specwrapper_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p" ) func newTestProtocol(h p2p.HandlerFunc) p2p.ProtocolSpec { diff --git a/pkg/p2p/streamtest/streamtest.go b/pkg/p2p/streamtest/streamtest.go index 4acab84db25..a9892687240 100644 --- a/pkg/p2p/streamtest/streamtest.go +++ b/pkg/p2p/streamtest/streamtest.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/spinlock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/spinlock" + "github.com/ethersphere/bee/v2/pkg/swarm" ma "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/p2p/streamtest/streamtest_test.go b/pkg/p2p/streamtest/streamtest_test.go index 924cdfcc0e9..0b26d2da7ce 100644 --- a/pkg/p2p/streamtest/streamtest_test.go +++ b/pkg/p2p/streamtest/streamtest_test.go @@ -14,9 +14,9 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/streamtest" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/streamtest" + "github.com/ethersphere/bee/v2/pkg/swarm" ma "github.com/multiformats/go-multiaddr" ) diff --git a/pkg/pingpong/metrics.go b/pkg/pingpong/metrics.go index 9b177c0461d..155b3abdb8e 100644 --- a/pkg/pingpong/metrics.go +++ b/pkg/pingpong/metrics.go @@ -5,7 +5,7 @@ package pingpong import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/pingpong/mock/mock.go b/pkg/pingpong/mock/mock.go index 033e75a6943..66d5be1a521 100644 --- a/pkg/pingpong/mock/mock.go +++ b/pkg/pingpong/mock/mock.go @@ -8,7 +8,7 @@ import ( "context" "time" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type Service struct { diff --git a/pkg/pingpong/pingpong.go b/pkg/pingpong/pingpong.go index 252d84dc6eb..ba09d7eaab1 100644 --- a/pkg/pingpong/pingpong.go +++ b/pkg/pingpong/pingpong.go @@ -13,12 +13,12 @@ import ( "io" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/pingpong/pb" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/pingpong/pb" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/tracing" ) // loggerName is the tree path name of the logger for this package. diff --git a/pkg/pingpong/pingpong_test.go b/pkg/pingpong/pingpong_test.go index 662b6684ddd..6e0298b7cb9 100644 --- a/pkg/pingpong/pingpong_test.go +++ b/pkg/pingpong/pingpong_test.go @@ -12,14 +12,14 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/p2p/streamtest" - "github.com/ethersphere/bee/pkg/pingpong" - "github.com/ethersphere/bee/pkg/pingpong/pb" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/p2p/streamtest" + "github.com/ethersphere/bee/v2/pkg/pingpong" + "github.com/ethersphere/bee/v2/pkg/pingpong/pb" ) func TestPing(t *testing.T) { diff --git a/pkg/postage/batch_test.go b/pkg/postage/batch_test.go index e735639449e..e7b419d6e02 100644 --- a/pkg/postage/batch_test.go +++ b/pkg/postage/batch_test.go @@ -8,8 +8,8 @@ import ( "bytes" "testing" - "github.com/ethersphere/bee/pkg/postage" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" + "github.com/ethersphere/bee/v2/pkg/postage" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" ) // TestBatchMarshalling tests the idempotence of binary marshal/unmarshal for a diff --git a/pkg/postage/batchservice/batchservice.go b/pkg/postage/batchservice/batchservice.go index ad7b26a6e93..4ec2611aa26 100644 --- a/pkg/postage/batchservice/batchservice.go +++ b/pkg/postage/batchservice/batchservice.go @@ -14,9 +14,9 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/storage" "golang.org/x/crypto/sha3" ) diff --git a/pkg/postage/batchservice/batchservice_test.go b/pkg/postage/batchservice/batchservice_test.go index 9be023ff726..0fd2bfe4c14 100644 --- a/pkg/postage/batchservice/batchservice_test.go +++ b/pkg/postage/batchservice/batchservice_test.go @@ -13,14 +13,14 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/postage/batchservice" - "github.com/ethersphere/bee/pkg/postage/batchstore/mock" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - mocks "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage/batchservice" + "github.com/ethersphere/bee/v2/pkg/postage/batchstore/mock" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + mocks "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) var ( diff --git a/pkg/postage/batchstore/metrics.go b/pkg/postage/batchstore/metrics.go index 30aca0fcd1f..518b18ae79b 100644 --- a/pkg/postage/batchstore/metrics.go +++ b/pkg/postage/batchstore/metrics.go @@ -5,7 +5,7 @@ package batchstore import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/postage/batchstore/mock/store.go b/pkg/postage/batchstore/mock/store.go index f3c10bf236d..f7d2d5aa847 100644 --- a/pkg/postage/batchstore/mock/store.go +++ b/pkg/postage/batchstore/mock/store.go @@ -10,9 +10,9 @@ import ( "math/big" "sync" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/postage/batchstore" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage/batchstore" + "github.com/ethersphere/bee/v2/pkg/storage" ) var _ postage.Storer = (*BatchStore)(nil) diff --git a/pkg/postage/batchstore/mock/store_test.go b/pkg/postage/batchstore/mock/store_test.go index 9ba544fafbd..824988f38f0 100644 --- a/pkg/postage/batchstore/mock/store_test.go +++ b/pkg/postage/batchstore/mock/store_test.go @@ -9,8 +9,8 @@ import ( "math/big" "testing" - "github.com/ethersphere/bee/pkg/postage/batchstore/mock" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" + "github.com/ethersphere/bee/v2/pkg/postage/batchstore/mock" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" ) func TestBatchStore(t *testing.T) { diff --git a/pkg/postage/batchstore/store.go b/pkg/postage/batchstore/store.go index a3cac65d5be..abad6987ac6 100644 --- a/pkg/postage/batchstore/store.go +++ b/pkg/postage/batchstore/store.go @@ -13,9 +13,9 @@ import ( "math/big" "sync/atomic" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/storage" ) // loggerName is the tree path name of the logger for this package. diff --git a/pkg/postage/batchstore/store_test.go b/pkg/postage/batchstore/store_test.go index 836bb1fb855..090c77c3287 100644 --- a/pkg/postage/batchstore/store_test.go +++ b/pkg/postage/batchstore/store_test.go @@ -10,16 +10,16 @@ import ( "math/rand" "testing" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/postage/batchstore" - mockpost "github.com/ethersphere/bee/pkg/postage/mock" - postagetest "github.com/ethersphere/bee/pkg/postage/testing" - "github.com/ethersphere/bee/pkg/statestore/leveldb" - "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage/batchstore" + mockpost "github.com/ethersphere/bee/v2/pkg/postage/mock" + postagetest "github.com/ethersphere/bee/v2/pkg/postage/testing" + "github.com/ethersphere/bee/v2/pkg/statestore/leveldb" + "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) var noopEvictFn = func([]byte) error { return nil } diff --git a/pkg/postage/export_test.go b/pkg/postage/export_test.go index f453d8eadb8..b26f6415010 100644 --- a/pkg/postage/export_test.go +++ b/pkg/postage/export_test.go @@ -5,7 +5,7 @@ package postage import ( - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/postage/listener/listener.go b/pkg/postage/listener/listener.go index a7764fcd077..30b3b2ad81d 100644 --- a/pkg/postage/listener/listener.go +++ b/pkg/postage/listener/listener.go @@ -16,11 +16,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/postage/batchservice" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/util/syncutil" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage/batchservice" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/util/syncutil" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/postage/listener/listener_test.go b/pkg/postage/listener/listener_test.go index 7080d33cbdb..43c8675883d 100644 --- a/pkg/postage/listener/listener_test.go +++ b/pkg/postage/listener/listener_test.go @@ -16,13 +16,13 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - chaincfg "github.com/ethersphere/bee/pkg/config" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/postage/listener" - "github.com/ethersphere/bee/pkg/util/abiutil" - "github.com/ethersphere/bee/pkg/util/syncutil" - "github.com/ethersphere/bee/pkg/util/testutil" + chaincfg "github.com/ethersphere/bee/v2/pkg/config" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage/listener" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" + "github.com/ethersphere/bee/v2/pkg/util/syncutil" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) var ( diff --git a/pkg/postage/listener/metrics.go b/pkg/postage/listener/metrics.go index 99c22aeea16..8fb7b639884 100644 --- a/pkg/postage/listener/metrics.go +++ b/pkg/postage/listener/metrics.go @@ -5,7 +5,7 @@ package listener import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/postage/mock/service.go b/pkg/postage/mock/service.go index 84b2358dd27..b4fffd07761 100644 --- a/pkg/postage/mock/service.go +++ b/pkg/postage/mock/service.go @@ -9,7 +9,7 @@ import ( "math/big" "sync" - "github.com/ethersphere/bee/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage" ) type optionFunc func(*mockPostage) diff --git a/pkg/postage/mock/stamper.go b/pkg/postage/mock/stamper.go index 2c5b0a543f7..f95700eb5e5 100644 --- a/pkg/postage/mock/stamper.go +++ b/pkg/postage/mock/stamper.go @@ -5,8 +5,8 @@ package mock import ( - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type mockStamper struct{} diff --git a/pkg/postage/noop.go b/pkg/postage/noop.go index ea8387deee8..bf58dab9940 100644 --- a/pkg/postage/noop.go +++ b/pkg/postage/noop.go @@ -8,7 +8,7 @@ import ( "errors" "math/big" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var _ Storer = (*NoOpBatchStore)(nil) diff --git a/pkg/postage/postagecontract/contract.go b/pkg/postage/postagecontract/contract.go index 035d7a18f75..d66939b3d42 100644 --- a/pkg/postage/postagecontract/contract.go +++ b/pkg/postage/postagecontract/contract.go @@ -14,10 +14,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/util/abiutil" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" "github.com/ethersphere/go-sw3-abi/sw3abi" ) diff --git a/pkg/postage/postagecontract/contract_test.go b/pkg/postage/postagecontract/contract_test.go index cd95342fcb2..dd47d44affe 100644 --- a/pkg/postage/postagecontract/contract_test.go +++ b/pkg/postage/postagecontract/contract_test.go @@ -14,15 +14,15 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - chaincfg "github.com/ethersphere/bee/pkg/config" - "github.com/ethersphere/bee/pkg/postage" - postagestoreMock "github.com/ethersphere/bee/pkg/postage/batchstore/mock" - postageMock "github.com/ethersphere/bee/pkg/postage/mock" - "github.com/ethersphere/bee/pkg/postage/postagecontract" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - "github.com/ethersphere/bee/pkg/transaction" - transactionMock "github.com/ethersphere/bee/pkg/transaction/mock" - "github.com/ethersphere/bee/pkg/util/abiutil" + chaincfg "github.com/ethersphere/bee/v2/pkg/config" + "github.com/ethersphere/bee/v2/pkg/postage" + postagestoreMock "github.com/ethersphere/bee/v2/pkg/postage/batchstore/mock" + postageMock "github.com/ethersphere/bee/v2/pkg/postage/mock" + "github.com/ethersphere/bee/v2/pkg/postage/postagecontract" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + "github.com/ethersphere/bee/v2/pkg/transaction" + transactionMock "github.com/ethersphere/bee/v2/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" ) var postageStampContractABI = abiutil.MustParseABI(chaincfg.Testnet.PostageStampABI) diff --git a/pkg/postage/postagecontract/mock/contract.go b/pkg/postage/postagecontract/mock/contract.go index ff5b3a8220a..e9547622dae 100644 --- a/pkg/postage/postagecontract/mock/contract.go +++ b/pkg/postage/postagecontract/mock/contract.go @@ -9,7 +9,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/postage/postagecontract" + "github.com/ethersphere/bee/v2/pkg/postage/postagecontract" ) type contractMock struct { diff --git a/pkg/postage/service.go b/pkg/postage/service.go index 803daa3a66b..f14e506370a 100644 --- a/pkg/postage/service.go +++ b/pkg/postage/service.go @@ -14,8 +14,8 @@ import ( "math/big" "sync" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/storage" ) // loggerName is the tree path name of the logger for this package. diff --git a/pkg/postage/service_test.go b/pkg/postage/service_test.go index c637b8e2630..f432565fb4a 100644 --- a/pkg/postage/service_test.go +++ b/pkg/postage/service_test.go @@ -13,14 +13,14 @@ import ( "math/big" "testing" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - pstoremock "github.com/ethersphere/bee/pkg/postage/batchstore/mock" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + pstoremock "github.com/ethersphere/bee/v2/pkg/postage/batchstore/mock" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) // TestSaveLoad tests the idempotence of saving and loading the postage.Service diff --git a/pkg/postage/stamp.go b/pkg/postage/stamp.go index 4fff65797ad..dbe6fd5b2d7 100644 --- a/pkg/postage/stamp.go +++ b/pkg/postage/stamp.go @@ -10,9 +10,9 @@ import ( "errors" "fmt" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // StampSize is the number of bytes in the serialisation of a stamp diff --git a/pkg/postage/stamp_test.go b/pkg/postage/stamp_test.go index ab98a197349..4fb9412f724 100644 --- a/pkg/postage/stamp_test.go +++ b/pkg/postage/stamp_test.go @@ -10,12 +10,12 @@ import ( "math/big" "testing" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/postage/batchstore/mock" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - chunktesting "github.com/ethersphere/bee/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage/batchstore/mock" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + chunktesting "github.com/ethersphere/bee/v2/pkg/storage/testing" ) // TestStampMarshalling tests the idempotence of binary marshal/unmarshals for Stamps. diff --git a/pkg/postage/stamper.go b/pkg/postage/stamper.go index a5f4107e375..ca063196546 100644 --- a/pkg/postage/stamper.go +++ b/pkg/postage/stamper.go @@ -8,9 +8,9 @@ import ( "errors" "fmt" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/postage/stamper_test.go b/pkg/postage/stamper_test.go index 520d6da0faf..a1c589b145c 100644 --- a/pkg/postage/stamper_test.go +++ b/pkg/postage/stamper_test.go @@ -10,11 +10,11 @@ import ( "math/big" "testing" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // TestStamperStamping tests if the stamp created by the stamper is valid. diff --git a/pkg/postage/stampissuer.go b/pkg/postage/stampissuer.go index bc3064580c0..77b632cf0f4 100644 --- a/pkg/postage/stampissuer.go +++ b/pkg/postage/stampissuer.go @@ -13,8 +13,8 @@ import ( "sync" "time" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/vmihailenco/msgpack/v5" ) diff --git a/pkg/postage/stampissuer_test.go b/pkg/postage/stampissuer_test.go index 9d99b7087ca..3a72b57f3d6 100644 --- a/pkg/postage/stampissuer_test.go +++ b/pkg/postage/stampissuer_test.go @@ -16,10 +16,10 @@ import ( "sync/atomic" "testing" - "github.com/ethersphere/bee/pkg/postage" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storagetest" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/postage" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "golang.org/x/sync/errgroup" diff --git a/pkg/postage/testing/batch.go b/pkg/postage/testing/batch.go index a9c21c355ec..2e8349da220 100644 --- a/pkg/postage/testing/batch.go +++ b/pkg/postage/testing/batch.go @@ -12,7 +12,7 @@ import ( "math/rand" "testing" - "github.com/ethersphere/bee/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage" ) const ( diff --git a/pkg/postage/testing/chainstate.go b/pkg/postage/testing/chainstate.go index dff5e07d490..edd1dc554b8 100644 --- a/pkg/postage/testing/chainstate.go +++ b/pkg/postage/testing/chainstate.go @@ -8,7 +8,7 @@ import ( "math/rand" "testing" - "github.com/ethersphere/bee/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage" ) // NewChainState will create a new ChainState with random values. diff --git a/pkg/postage/testing/stamp.go b/pkg/postage/testing/stamp.go index def77bf582b..80ba4317e2a 100644 --- a/pkg/postage/testing/stamp.go +++ b/pkg/postage/testing/stamp.go @@ -9,9 +9,9 @@ import ( "encoding/binary" "io" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const signatureSize = 65 diff --git a/pkg/pricer/headerutils/utilities.go b/pkg/pricer/headerutils/utilities.go index f67b71b6de5..a85e56990b4 100644 --- a/pkg/pricer/headerutils/utilities.go +++ b/pkg/pricer/headerutils/utilities.go @@ -7,8 +7,8 @@ package headerutils import ( "encoding/binary" "errors" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const ( diff --git a/pkg/pricer/headerutils/utilities_test.go b/pkg/pricer/headerutils/utilities_test.go index 55ec77e500e..b2c62ee68d1 100644 --- a/pkg/pricer/headerutils/utilities_test.go +++ b/pkg/pricer/headerutils/utilities_test.go @@ -8,9 +8,9 @@ import ( "reflect" "testing" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/pricer/headerutils" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/pricer/headerutils" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestMakePricingHeaders(t *testing.T) { diff --git a/pkg/pricer/mock/pricer.go b/pkg/pricer/mock/pricer.go index 49bc87b6923..5daf93debc7 100644 --- a/pkg/pricer/mock/pricer.go +++ b/pkg/pricer/mock/pricer.go @@ -5,7 +5,7 @@ package mock import ( - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type MockPricer struct { diff --git a/pkg/pricer/pricer.go b/pkg/pricer/pricer.go index a060c4a5a21..21cbde9a4b3 100644 --- a/pkg/pricer/pricer.go +++ b/pkg/pricer/pricer.go @@ -5,7 +5,7 @@ package pricer import ( - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // Pricer returns pricing information for chunk hashes. diff --git a/pkg/pricing/export_test.go b/pkg/pricing/export_test.go index 30b2ad2b2b8..90d8a7e6ed4 100644 --- a/pkg/pricing/export_test.go +++ b/pkg/pricing/export_test.go @@ -7,7 +7,7 @@ package pricing import ( "context" - "github.com/ethersphere/bee/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p" ) func (s *Service) Init(ctx context.Context, p p2p.Peer) error { diff --git a/pkg/pricing/pricing.go b/pkg/pricing/pricing.go index bb105e87e68..32ec1515936 100644 --- a/pkg/pricing/pricing.go +++ b/pkg/pricing/pricing.go @@ -11,11 +11,11 @@ import ( "math/big" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/pricing/pb" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/pricing/pb" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // loggerName is the tree path name of the logger for this package. diff --git a/pkg/pricing/pricing_test.go b/pkg/pricing/pricing_test.go index 1a721216562..70f758353d1 100644 --- a/pkg/pricing/pricing_test.go +++ b/pkg/pricing/pricing_test.go @@ -11,13 +11,13 @@ import ( "math/big" "testing" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/p2p/streamtest" - "github.com/ethersphere/bee/pkg/pricing" - "github.com/ethersphere/bee/pkg/pricing/pb" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/p2p/streamtest" + "github.com/ethersphere/bee/v2/pkg/pricing" + "github.com/ethersphere/bee/v2/pkg/pricing/pb" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type testThresholdObserver struct { diff --git a/pkg/pss/metrics.go b/pkg/pss/metrics.go index ebf6ccbb14a..108f516215f 100644 --- a/pkg/pss/metrics.go +++ b/pkg/pss/metrics.go @@ -5,7 +5,7 @@ package pss import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/pss/mining_test.go b/pkg/pss/mining_test.go index 6c205a8c9df..4dd94e45bb2 100644 --- a/pkg/pss/mining_test.go +++ b/pkg/pss/mining_test.go @@ -10,8 +10,8 @@ import ( "fmt" "testing" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/pss" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/pss" ) func newTargets(length, depth int) pss.Targets { diff --git a/pkg/pss/pss.go b/pkg/pss/pss.go index b8758f82a5e..3a09db0b633 100644 --- a/pkg/pss/pss.go +++ b/pkg/pss/pss.go @@ -17,11 +17,11 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/pushsync" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/pushsync" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" ) // loggerName is the tree path name of the logger for this package. diff --git a/pkg/pss/pss_test.go b/pkg/pss/pss_test.go index d211b763117..1d04237bbaa 100644 --- a/pkg/pss/pss_test.go +++ b/pkg/pss/pss_test.go @@ -10,14 +10,14 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - "github.com/ethersphere/bee/pkg/pss" - "github.com/ethersphere/bee/pkg/pushsync" - pushsyncmock "github.com/ethersphere/bee/pkg/pushsync/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + "github.com/ethersphere/bee/v2/pkg/pss" + "github.com/ethersphere/bee/v2/pkg/pushsync" + pushsyncmock "github.com/ethersphere/bee/v2/pkg/pushsync/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // TestSend creates a trojan chunk and sends it using push sync diff --git a/pkg/pss/trojan.go b/pkg/pss/trojan.go index 4e742875333..b6b404f2389 100644 --- a/pkg/pss/trojan.go +++ b/pkg/pss/trojan.go @@ -16,11 +16,11 @@ import ( "io" "github.com/btcsuite/btcd/btcec/v2" - "github.com/ethersphere/bee/pkg/bmtpool" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/encryption" - "github.com/ethersphere/bee/pkg/encryption/elgamal" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bmtpool" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/encryption" + "github.com/ethersphere/bee/v2/pkg/encryption/elgamal" + "github.com/ethersphere/bee/v2/pkg/swarm" "golang.org/x/sync/errgroup" ) diff --git a/pkg/pss/trojan_test.go b/pkg/pss/trojan_test.go index 134ff2837b6..1d78b56c3aa 100644 --- a/pkg/pss/trojan_test.go +++ b/pkg/pss/trojan_test.go @@ -9,9 +9,9 @@ import ( "context" "testing" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/pss" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/pss" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestWrap(t *testing.T) { diff --git a/pkg/puller/export_test.go b/pkg/puller/export_test.go index 7d7b7b5b47a..b57ae396b3f 100644 --- a/pkg/puller/export_test.go +++ b/pkg/puller/export_test.go @@ -4,7 +4,7 @@ package puller -import "github.com/ethersphere/bee/pkg/swarm" +import "github.com/ethersphere/bee/v2/pkg/swarm" var PeerIntervalKey = peerIntervalKey diff --git a/pkg/puller/intervalstore/store_test.go b/pkg/puller/intervalstore/store_test.go index 5e1a5e0ef23..b4e2be192db 100644 --- a/pkg/puller/intervalstore/store_test.go +++ b/pkg/puller/intervalstore/store_test.go @@ -20,11 +20,11 @@ import ( "errors" "testing" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/statestore/leveldb" - "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/statestore/leveldb" + "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) // TestInmemoryStore tests basic functionality of InmemoryStore. diff --git a/pkg/puller/metrics.go b/pkg/puller/metrics.go index 715a285be63..2b77ad5e016 100644 --- a/pkg/puller/metrics.go +++ b/pkg/puller/metrics.go @@ -5,7 +5,7 @@ package puller import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/puller/puller.go b/pkg/puller/puller.go index f2cfd15eee0..0523f9c8141 100644 --- a/pkg/puller/puller.go +++ b/pkg/puller/puller.go @@ -15,15 +15,15 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/puller/intervalstore" - "github.com/ethersphere/bee/pkg/pullsync" - "github.com/ethersphere/bee/pkg/rate" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/puller/intervalstore" + "github.com/ethersphere/bee/v2/pkg/pullsync" + "github.com/ethersphere/bee/v2/pkg/rate" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" ratelimit "golang.org/x/time/rate" ) diff --git a/pkg/puller/puller_test.go b/pkg/puller/puller_test.go index f76fe292432..2be411f370f 100644 --- a/pkg/puller/puller_test.go +++ b/pkg/puller/puller_test.go @@ -11,17 +11,17 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/puller" - "github.com/ethersphere/bee/pkg/puller/intervalstore" - mockps "github.com/ethersphere/bee/pkg/pullsync/mock" - "github.com/ethersphere/bee/pkg/spinlock" - "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/storage" - resMock "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" - kadMock "github.com/ethersphere/bee/pkg/topology/kademlia/mock" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/puller" + "github.com/ethersphere/bee/v2/pkg/puller/intervalstore" + mockps "github.com/ethersphere/bee/v2/pkg/pullsync/mock" + "github.com/ethersphere/bee/v2/pkg/spinlock" + "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/storage" + resMock "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" + kadMock "github.com/ethersphere/bee/v2/pkg/topology/kademlia/mock" + "github.com/ethersphere/bee/v2/pkg/util/testutil" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/pullsync/metrics.go b/pkg/pullsync/metrics.go index 24d11cf892f..340732f2114 100644 --- a/pkg/pullsync/metrics.go +++ b/pkg/pullsync/metrics.go @@ -5,7 +5,7 @@ package pullsync import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/pullsync/mock/pullsync.go b/pkg/pullsync/mock/pullsync.go index acd54b51ebf..bb77934924f 100644 --- a/pkg/pullsync/mock/pullsync.go +++ b/pkg/pullsync/mock/pullsync.go @@ -9,8 +9,8 @@ import ( "fmt" "sync" - "github.com/ethersphere/bee/pkg/pullsync" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/pullsync" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var _ pullsync.Interface = (*PullSyncMock)(nil) diff --git a/pkg/pullsync/pullsync.go b/pkg/pullsync/pullsync.go index 42691cbbe0c..5caa6e050a6 100644 --- a/pkg/pullsync/pullsync.go +++ b/pkg/pullsync/pullsync.go @@ -16,17 +16,17 @@ import ( "sync/atomic" "time" - "github.com/ethersphere/bee/pkg/bitvector" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/pullsync/pb" - "github.com/ethersphere/bee/pkg/soc" - "github.com/ethersphere/bee/pkg/storage" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bitvector" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/pullsync/pb" + "github.com/ethersphere/bee/v2/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/storage" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" "resenje.org/multex" "resenje.org/singleflight" ) diff --git a/pkg/pullsync/pullsync_test.go b/pkg/pullsync/pullsync_test.go index 70f958e63dd..bf25216519e 100644 --- a/pkg/pullsync/pullsync_test.go +++ b/pkg/pullsync/pullsync_test.go @@ -11,17 +11,17 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/streamtest" - "github.com/ethersphere/bee/pkg/postage" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - "github.com/ethersphere/bee/pkg/pullsync" - "github.com/ethersphere/bee/pkg/storage" - testingc "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer" - mock "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/streamtest" + "github.com/ethersphere/bee/v2/pkg/postage" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + "github.com/ethersphere/bee/v2/pkg/pullsync" + "github.com/ethersphere/bee/v2/pkg/storage" + testingc "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer" + mock "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/pusher/inflight.go b/pkg/pusher/inflight.go index 075dfe7e2fa..788872d2652 100644 --- a/pkg/pusher/inflight.go +++ b/pkg/pusher/inflight.go @@ -7,7 +7,7 @@ package pusher import ( "sync" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type inflight struct { diff --git a/pkg/pusher/metrics.go b/pkg/pusher/metrics.go index 093c6ca036e..03e55bad2b8 100644 --- a/pkg/pusher/metrics.go +++ b/pkg/pusher/metrics.go @@ -5,7 +5,7 @@ package pusher import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/pusher/pusher.go b/pkg/pusher/pusher.go index 457af2f58a3..c570d5ca1c6 100644 --- a/pkg/pusher/pusher.go +++ b/pkg/pusher/pusher.go @@ -17,14 +17,14 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/pushsync" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/pushsync" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/tracing" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" olog "github.com/opentracing/opentracing-go/log" diff --git a/pkg/pusher/pusher_test.go b/pkg/pusher/pusher_test.go index 6f361b93e6b..39132c624bf 100644 --- a/pkg/pusher/pusher_test.go +++ b/pkg/pusher/pusher_test.go @@ -14,18 +14,18 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/pusher" - "github.com/ethersphere/bee/pkg/pushsync" - pushsyncmock "github.com/ethersphere/bee/pkg/pushsync/mock" - "github.com/ethersphere/bee/pkg/spinlock" - storage "github.com/ethersphere/bee/pkg/storage" - testingc "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/pusher" + "github.com/ethersphere/bee/v2/pkg/pushsync" + pushsyncmock "github.com/ethersphere/bee/v2/pkg/pushsync/mock" + "github.com/ethersphere/bee/v2/pkg/spinlock" + storage "github.com/ethersphere/bee/v2/pkg/storage" + testingc "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) // time to wait for received response from pushsync diff --git a/pkg/pushsync/metrics.go b/pkg/pushsync/metrics.go index 96161162df2..d182cbffc20 100644 --- a/pkg/pushsync/metrics.go +++ b/pkg/pushsync/metrics.go @@ -5,7 +5,7 @@ package pushsync import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/pushsync/mock/mock.go b/pkg/pushsync/mock/mock.go index 3d74f7f62c5..6afac9f493f 100644 --- a/pkg/pushsync/mock/mock.go +++ b/pkg/pushsync/mock/mock.go @@ -7,8 +7,8 @@ package mock import ( "context" - "github.com/ethersphere/bee/pkg/pushsync" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/pushsync" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type mock struct { diff --git a/pkg/pushsync/pushsync.go b/pkg/pushsync/pushsync.go index 32425448d9d..6a74b159e0d 100644 --- a/pkg/pushsync/pushsync.go +++ b/pkg/pushsync/pushsync.go @@ -12,21 +12,21 @@ import ( "fmt" "time" - "github.com/ethersphere/bee/pkg/accounting" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/pricer" - "github.com/ethersphere/bee/pkg/pushsync/pb" - "github.com/ethersphere/bee/pkg/skippeers" - "github.com/ethersphere/bee/pkg/soc" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/accounting" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/pricer" + "github.com/ethersphere/bee/v2/pkg/pushsync/pb" + "github.com/ethersphere/bee/v2/pkg/skippeers" + "github.com/ethersphere/bee/v2/pkg/soc" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/tracing" opentracing "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" olog "github.com/opentracing/opentracing-go/log" diff --git a/pkg/pushsync/pushsync_test.go b/pkg/pushsync/pushsync_test.go index 7b6c958ef7b..24e9fb45c9b 100644 --- a/pkg/pushsync/pushsync_test.go +++ b/pkg/pushsync/pushsync_test.go @@ -14,22 +14,22 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/accounting" - accountingmock "github.com/ethersphere/bee/pkg/accounting/mock" - "github.com/ethersphere/bee/pkg/crypto" - cryptomock "github.com/ethersphere/bee/pkg/crypto/mock" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/p2p/streamtest" - pricermock "github.com/ethersphere/bee/pkg/pricer/mock" - "github.com/ethersphere/bee/pkg/pushsync" - "github.com/ethersphere/bee/pkg/pushsync/pb" - storage "github.com/ethersphere/bee/pkg/storage" - testingc "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/topology/mock" + "github.com/ethersphere/bee/v2/pkg/accounting" + accountingmock "github.com/ethersphere/bee/v2/pkg/accounting/mock" + "github.com/ethersphere/bee/v2/pkg/crypto" + cryptomock "github.com/ethersphere/bee/v2/pkg/crypto/mock" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/p2p/streamtest" + pricermock "github.com/ethersphere/bee/v2/pkg/pricer/mock" + "github.com/ethersphere/bee/v2/pkg/pushsync" + "github.com/ethersphere/bee/v2/pkg/pushsync/pb" + storage "github.com/ethersphere/bee/v2/pkg/storage" + testingc "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/topology/mock" ) const ( diff --git a/pkg/rate/rate_test.go b/pkg/rate/rate_test.go index 6c9ac2b28c7..55df75daff1 100644 --- a/pkg/rate/rate_test.go +++ b/pkg/rate/rate_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/rate" + "github.com/ethersphere/bee/v2/pkg/rate" ) func TestRateFirstBucket(t *testing.T) { diff --git a/pkg/ratelimit/ratelimit_test.go b/pkg/ratelimit/ratelimit_test.go index 8f87bfd8fc5..e31fe5722bc 100644 --- a/pkg/ratelimit/ratelimit_test.go +++ b/pkg/ratelimit/ratelimit_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/ratelimit" + "github.com/ethersphere/bee/v2/pkg/ratelimit" ) func TestRateLimit(t *testing.T) { diff --git a/pkg/replicas/export_test.go b/pkg/replicas/export_test.go index 6e029f302c6..271ad71ed0b 100644 --- a/pkg/replicas/export_test.go +++ b/pkg/replicas/export_test.go @@ -4,7 +4,7 @@ package replicas -import "github.com/ethersphere/bee/pkg/storage" +import "github.com/ethersphere/bee/v2/pkg/storage" var ( Signer = signer diff --git a/pkg/replicas/getter.go b/pkg/replicas/getter.go index 26345919958..5dc42cb7c82 100644 --- a/pkg/replicas/getter.go +++ b/pkg/replicas/getter.go @@ -12,10 +12,10 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/soc" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // ErrSwarmageddon is returned in case of a vis mayor called Swarmageddon. diff --git a/pkg/replicas/getter_test.go b/pkg/replicas/getter_test.go index 7435b0574fd..057daa8e300 100644 --- a/pkg/replicas/getter_test.go +++ b/pkg/replicas/getter_test.go @@ -14,12 +14,12 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/replicas" - "github.com/ethersphere/bee/pkg/soc" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/replicas" + "github.com/ethersphere/bee/v2/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type testGetter struct { diff --git a/pkg/replicas/putter.go b/pkg/replicas/putter.go index 4aa55b638f0..e62478119a3 100644 --- a/pkg/replicas/putter.go +++ b/pkg/replicas/putter.go @@ -11,10 +11,10 @@ import ( "errors" "sync" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/soc" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // putter is the private implementation of the public storage.Putter interface diff --git a/pkg/replicas/putter_test.go b/pkg/replicas/putter_test.go index 7d05624ebca..b4e379352bb 100644 --- a/pkg/replicas/putter_test.go +++ b/pkg/replicas/putter_test.go @@ -14,12 +14,12 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/replicas" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/replicas" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/replicas/replica_test.go b/pkg/replicas/replica_test.go index ce56401d987..3a253f24f5b 100644 --- a/pkg/replicas/replica_test.go +++ b/pkg/replicas/replica_test.go @@ -10,10 +10,10 @@ import ( "errors" "fmt" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/soc" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // dispersed verifies that a set of addresses are maximally dispersed without repetition diff --git a/pkg/replicas/replicas.go b/pkg/replicas/replicas.go index fd45b28a3b1..01b326b76c8 100644 --- a/pkg/replicas/replicas.go +++ b/pkg/replicas/replicas.go @@ -13,9 +13,9 @@ package replicas import ( "time" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/file/redundancy" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/resolver/cidv1/cidv1.go b/pkg/resolver/cidv1/cidv1.go index ded3b701ffe..097f06d28aa 100644 --- a/pkg/resolver/cidv1/cidv1.go +++ b/pkg/resolver/cidv1/cidv1.go @@ -7,8 +7,8 @@ package cidv1 import ( "fmt" - "github.com/ethersphere/bee/pkg/resolver" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/resolver" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/ipfs/go-cid" "github.com/multiformats/go-multihash" ) diff --git a/pkg/resolver/cidv1/cidv1_test.go b/pkg/resolver/cidv1/cidv1_test.go index 92100f73903..a0bcc675bc0 100644 --- a/pkg/resolver/cidv1/cidv1_test.go +++ b/pkg/resolver/cidv1/cidv1_test.go @@ -8,9 +8,9 @@ import ( "errors" "testing" - "github.com/ethersphere/bee/pkg/resolver" - "github.com/ethersphere/bee/pkg/resolver/cidv1" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/resolver" + "github.com/ethersphere/bee/v2/pkg/resolver/cidv1" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) func TestCIDResolver(t *testing.T) { diff --git a/pkg/resolver/client/client.go b/pkg/resolver/client/client.go index 988606135d8..71d301fa74b 100644 --- a/pkg/resolver/client/client.go +++ b/pkg/resolver/client/client.go @@ -5,7 +5,7 @@ package client import ( - "github.com/ethersphere/bee/pkg/resolver" + "github.com/ethersphere/bee/v2/pkg/resolver" ) // Interface is a resolver client that can connect/disconnect to an external diff --git a/pkg/resolver/client/ens/ens.go b/pkg/resolver/client/ens/ens.go index bd190fba7fb..38c7432e979 100644 --- a/pkg/resolver/client/ens/ens.go +++ b/pkg/resolver/client/ens/ens.go @@ -14,9 +14,9 @@ import ( "github.com/ethereum/go-ethereum/ethclient" goens "github.com/wealdtech/go-ens/v3" - "github.com/ethersphere/bee/pkg/resolver" - "github.com/ethersphere/bee/pkg/resolver/client" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/resolver" + "github.com/ethersphere/bee/v2/pkg/resolver/client" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const ( diff --git a/pkg/resolver/client/ens/ens_integration_test.go b/pkg/resolver/client/ens/ens_integration_test.go index 139347c2db8..f5aa9b1d9d7 100644 --- a/pkg/resolver/client/ens/ens_integration_test.go +++ b/pkg/resolver/client/ens/ens_integration_test.go @@ -10,8 +10,8 @@ import ( "errors" "testing" - "github.com/ethersphere/bee/pkg/resolver/client/ens" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/resolver/client/ens" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestENSIntegration(t *testing.T) { diff --git a/pkg/resolver/client/ens/ens_test.go b/pkg/resolver/client/ens/ens_test.go index 3ecd67be4ae..aa0d0c0cb64 100644 --- a/pkg/resolver/client/ens/ens_test.go +++ b/pkg/resolver/client/ens/ens_test.go @@ -13,9 +13,9 @@ import ( "github.com/ethereum/go-ethereum/rpc" goens "github.com/wealdtech/go-ens/v3" - "github.com/ethersphere/bee/pkg/resolver" - "github.com/ethersphere/bee/pkg/resolver/client/ens" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/resolver" + "github.com/ethersphere/bee/v2/pkg/resolver/client/ens" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestNewENSClient(t *testing.T) { diff --git a/pkg/resolver/client/mock/mock.go b/pkg/resolver/client/mock/mock.go index d3b24fd8559..01bbdf0cf99 100644 --- a/pkg/resolver/client/mock/mock.go +++ b/pkg/resolver/client/mock/mock.go @@ -5,8 +5,8 @@ package mock import ( - "github.com/ethersphere/bee/pkg/resolver/client" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/resolver/client" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // Ensure mock Client implements the Client interface. diff --git a/pkg/resolver/mock/resolver.go b/pkg/resolver/mock/resolver.go index 547abd6270b..bbae8ff2702 100644 --- a/pkg/resolver/mock/resolver.go +++ b/pkg/resolver/mock/resolver.go @@ -7,8 +7,8 @@ package mock import ( "fmt" - "github.com/ethersphere/bee/pkg/resolver" - "github.com/ethersphere/bee/pkg/resolver/client/ens" + "github.com/ethersphere/bee/v2/pkg/resolver" + "github.com/ethersphere/bee/v2/pkg/resolver/client/ens" ) // Assure mock Resolver implements the Resolver interface. diff --git a/pkg/resolver/multiresolver/config_test.go b/pkg/resolver/multiresolver/config_test.go index 9ee417f6d3d..9b4c2d502c2 100644 --- a/pkg/resolver/multiresolver/config_test.go +++ b/pkg/resolver/multiresolver/config_test.go @@ -8,7 +8,7 @@ import ( "errors" "testing" - "github.com/ethersphere/bee/pkg/resolver/multiresolver" + "github.com/ethersphere/bee/v2/pkg/resolver/multiresolver" ) func TestParseConnectionStrings(t *testing.T) { diff --git a/pkg/resolver/multiresolver/export_test.go b/pkg/resolver/multiresolver/export_test.go index 5e2624774c8..e3d260f74f9 100644 --- a/pkg/resolver/multiresolver/export_test.go +++ b/pkg/resolver/multiresolver/export_test.go @@ -4,7 +4,7 @@ package multiresolver -import "github.com/ethersphere/bee/pkg/log" +import "github.com/ethersphere/bee/v2/pkg/log" func GetLogger(mr *MultiResolver) log.Logger { return mr.logger diff --git a/pkg/resolver/multiresolver/multiresolver.go b/pkg/resolver/multiresolver/multiresolver.go index 97472d47807..31111931bb2 100644 --- a/pkg/resolver/multiresolver/multiresolver.go +++ b/pkg/resolver/multiresolver/multiresolver.go @@ -10,10 +10,10 @@ import ( "path" "strings" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/resolver" - "github.com/ethersphere/bee/pkg/resolver/cidv1" - "github.com/ethersphere/bee/pkg/resolver/client/ens" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/resolver" + "github.com/ethersphere/bee/v2/pkg/resolver/cidv1" + "github.com/ethersphere/bee/v2/pkg/resolver/client/ens" "github.com/hashicorp/go-multierror" ) diff --git a/pkg/resolver/multiresolver/multiresolver_test.go b/pkg/resolver/multiresolver/multiresolver_test.go index a6d31f796e7..326cbb69a04 100644 --- a/pkg/resolver/multiresolver/multiresolver_test.go +++ b/pkg/resolver/multiresolver/multiresolver_test.go @@ -10,11 +10,11 @@ import ( "reflect" "testing" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/resolver" - "github.com/ethersphere/bee/pkg/resolver/mock" - "github.com/ethersphere/bee/pkg/resolver/multiresolver" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/resolver" + "github.com/ethersphere/bee/v2/pkg/resolver/mock" + "github.com/ethersphere/bee/v2/pkg/resolver/multiresolver" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type Address = swarm.Address diff --git a/pkg/resolver/resolver.go b/pkg/resolver/resolver.go index 1d38e987165..043dcaf87e0 100644 --- a/pkg/resolver/resolver.go +++ b/pkg/resolver/resolver.go @@ -8,7 +8,7 @@ import ( "errors" "io" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // Address is the swarm bzz address. diff --git a/pkg/retrieval/export_test.go b/pkg/retrieval/export_test.go index 4ba5bc1fdac..cc53399f636 100644 --- a/pkg/retrieval/export_test.go +++ b/pkg/retrieval/export_test.go @@ -7,8 +7,8 @@ package retrieval import ( "context" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func (s *Service) Handler(ctx context.Context, p p2p.Peer, stream p2p.Stream) error { diff --git a/pkg/retrieval/main_test.go b/pkg/retrieval/main_test.go index eec426389d0..8be3983b65d 100644 --- a/pkg/retrieval/main_test.go +++ b/pkg/retrieval/main_test.go @@ -14,7 +14,7 @@ func TestMain(m *testing.M) { goleak.VerifyTestMain( m, // pkg/p2p package has some leak issues, we ignore them here as they are not in current scope - goleak.IgnoreTopFunction("github.com/ethersphere/bee/pkg/p2p/protobuf.Reader.ReadMsgWithContext"), - goleak.IgnoreTopFunction("github.com/ethersphere/bee/pkg/p2p/streamtest.(*record).Read"), + goleak.IgnoreTopFunction("github.com/ethersphere/bee/v2/pkg/p2p/protobuf.Reader.ReadMsgWithContext"), + goleak.IgnoreTopFunction("github.com/ethersphere/bee/v2/pkg/p2p/streamtest.(*record).Read"), ) } diff --git a/pkg/retrieval/metrics.go b/pkg/retrieval/metrics.go index 30881b77361..f88f11d6c06 100644 --- a/pkg/retrieval/metrics.go +++ b/pkg/retrieval/metrics.go @@ -7,7 +7,7 @@ package retrieval import ( "github.com/prometheus/client_golang/prometheus" - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" ) type metrics struct { diff --git a/pkg/retrieval/retrieval.go b/pkg/retrieval/retrieval.go index 69a04355ee9..fc3a0092c69 100644 --- a/pkg/retrieval/retrieval.go +++ b/pkg/retrieval/retrieval.go @@ -14,19 +14,19 @@ import ( "fmt" "time" - "github.com/ethersphere/bee/pkg/accounting" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/pricer" - pb "github.com/ethersphere/bee/pkg/retrieval/pb" - "github.com/ethersphere/bee/pkg/skippeers" - "github.com/ethersphere/bee/pkg/soc" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/accounting" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/pricer" + pb "github.com/ethersphere/bee/v2/pkg/retrieval/pb" + "github.com/ethersphere/bee/v2/pkg/skippeers" + "github.com/ethersphere/bee/v2/pkg/soc" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/tracing" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" olog "github.com/opentracing/opentracing-go/log" diff --git a/pkg/retrieval/retrieval_test.go b/pkg/retrieval/retrieval_test.go index c4156583cb2..05f44abeef8 100644 --- a/pkg/retrieval/retrieval_test.go +++ b/pkg/retrieval/retrieval_test.go @@ -15,26 +15,26 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/accounting" - accountingmock "github.com/ethersphere/bee/pkg/accounting/mock" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/p2p/streamtest" - "github.com/ethersphere/bee/pkg/pricer" - pricermock "github.com/ethersphere/bee/pkg/pricer/mock" - "github.com/ethersphere/bee/pkg/retrieval" - pb "github.com/ethersphere/bee/pkg/retrieval/pb" - "github.com/ethersphere/bee/pkg/spinlock" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - testingc "github.com/ethersphere/bee/pkg/storage/testing" - storemock "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/tracing" - - topologymock "github.com/ethersphere/bee/pkg/topology/mock" + "github.com/ethersphere/bee/v2/pkg/accounting" + accountingmock "github.com/ethersphere/bee/v2/pkg/accounting/mock" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/p2p/streamtest" + "github.com/ethersphere/bee/v2/pkg/pricer" + pricermock "github.com/ethersphere/bee/v2/pkg/pricer/mock" + "github.com/ethersphere/bee/v2/pkg/retrieval" + pb "github.com/ethersphere/bee/v2/pkg/retrieval/pb" + "github.com/ethersphere/bee/v2/pkg/spinlock" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + testingc "github.com/ethersphere/bee/v2/pkg/storage/testing" + storemock "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/tracing" + + topologymock "github.com/ethersphere/bee/v2/pkg/topology/mock" ) var ( diff --git a/pkg/salud/metrics.go b/pkg/salud/metrics.go index db5309b9dad..c9a3b68a17f 100644 --- a/pkg/salud/metrics.go +++ b/pkg/salud/metrics.go @@ -5,7 +5,7 @@ package salud import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/salud/salud.go b/pkg/salud/salud.go index d9a661c40af..c6a46500cb0 100644 --- a/pkg/salud/salud.go +++ b/pkg/salud/salud.go @@ -12,11 +12,11 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/status" - "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/status" + "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" "go.uber.org/atomic" ) diff --git a/pkg/salud/salud_test.go b/pkg/salud/salud_test.go index 58a5ae38bb6..b408f06b95c 100644 --- a/pkg/salud/salud_test.go +++ b/pkg/salud/salud_test.go @@ -10,13 +10,13 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/salud" - "github.com/ethersphere/bee/pkg/spinlock" - "github.com/ethersphere/bee/pkg/status" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" - topMock "github.com/ethersphere/bee/pkg/topology/mock" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/salud" + "github.com/ethersphere/bee/v2/pkg/spinlock" + "github.com/ethersphere/bee/v2/pkg/status" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" + topMock "github.com/ethersphere/bee/v2/pkg/topology/mock" ) type peer struct { diff --git a/pkg/settlement/interface.go b/pkg/settlement/interface.go index 85daae6c212..f24ec60ce69 100644 --- a/pkg/settlement/interface.go +++ b/pkg/settlement/interface.go @@ -8,7 +8,7 @@ import ( "errors" "math/big" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/settlement/pseudosettle/export_test.go b/pkg/settlement/pseudosettle/export_test.go index 24cac963405..3748cbf03f6 100644 --- a/pkg/settlement/pseudosettle/export_test.go +++ b/pkg/settlement/pseudosettle/export_test.go @@ -8,7 +8,7 @@ import ( "context" "time" - "github.com/ethersphere/bee/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p" ) func (s *Service) SetTimeNow(f func() time.Time) { diff --git a/pkg/settlement/pseudosettle/metrics.go b/pkg/settlement/pseudosettle/metrics.go index b3530500be0..971795cb6a8 100644 --- a/pkg/settlement/pseudosettle/metrics.go +++ b/pkg/settlement/pseudosettle/metrics.go @@ -5,7 +5,7 @@ package pseudosettle import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/settlement/pseudosettle/pseudosettle.go b/pkg/settlement/pseudosettle/pseudosettle.go index 75fe647968f..24531b84641 100644 --- a/pkg/settlement/pseudosettle/pseudosettle.go +++ b/pkg/settlement/pseudosettle/pseudosettle.go @@ -13,13 +13,13 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/settlement" - pb "github.com/ethersphere/bee/pkg/settlement/pseudosettle/pb" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/settlement" + pb "github.com/ethersphere/bee/v2/pkg/settlement/pseudosettle/pb" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // loggerName is the tree path name of the logger for this package. diff --git a/pkg/settlement/pseudosettle/pseudosettle_test.go b/pkg/settlement/pseudosettle/pseudosettle_test.go index c12144623e3..397592e9d96 100644 --- a/pkg/settlement/pseudosettle/pseudosettle_test.go +++ b/pkg/settlement/pseudosettle/pseudosettle_test.go @@ -13,17 +13,17 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - mockp2p "github.com/ethersphere/bee/pkg/p2p/mock" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/p2p/streamtest" - "github.com/ethersphere/bee/pkg/settlement/pseudosettle" - "github.com/ethersphere/bee/pkg/settlement/pseudosettle/pb" - "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + mockp2p "github.com/ethersphere/bee/v2/pkg/p2p/mock" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/p2p/streamtest" + "github.com/ethersphere/bee/v2/pkg/settlement/pseudosettle" + "github.com/ethersphere/bee/v2/pkg/settlement/pseudosettle/pb" + "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) type testObserver struct { diff --git a/pkg/settlement/swap/addressbook.go b/pkg/settlement/swap/addressbook.go index 08d6c4ed778..5cf0aad45f8 100644 --- a/pkg/settlement/swap/addressbook.go +++ b/pkg/settlement/swap/addressbook.go @@ -9,8 +9,8 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/settlement/swap/chequebook/cashout.go b/pkg/settlement/swap/chequebook/cashout.go index 157af01ad56..245b16ca6aa 100644 --- a/pkg/settlement/swap/chequebook/cashout.go +++ b/pkg/settlement/swap/chequebook/cashout.go @@ -14,9 +14,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/transaction" ) var ( diff --git a/pkg/settlement/swap/chequebook/cashout_test.go b/pkg/settlement/swap/chequebook/cashout_test.go index 2aa3dc992c5..dc195e6a465 100644 --- a/pkg/settlement/swap/chequebook/cashout_test.go +++ b/pkg/settlement/swap/chequebook/cashout_test.go @@ -11,12 +11,12 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" - chequestoremock "github.com/ethersphere/bee/pkg/settlement/swap/chequestore/mock" - storemock "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/transaction/backendmock" - transactionmock "github.com/ethersphere/bee/pkg/transaction/mock" - "github.com/ethersphere/bee/pkg/util/abiutil" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" + chequestoremock "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequestore/mock" + storemock "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/transaction/backendmock" + transactionmock "github.com/ethersphere/bee/v2/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" "github.com/ethersphere/go-sw3-abi/sw3abi" ) diff --git a/pkg/settlement/swap/chequebook/cheque.go b/pkg/settlement/swap/chequebook/cheque.go index 01e282d5e1c..4ff118c22ec 100644 --- a/pkg/settlement/swap/chequebook/cheque.go +++ b/pkg/settlement/swap/chequebook/cheque.go @@ -11,8 +11,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/math" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/crypto/eip712" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/crypto/eip712" ) // Cheque represents a cheque for a SimpleSwap chequebook diff --git a/pkg/settlement/swap/chequebook/cheque_test.go b/pkg/settlement/swap/chequebook/cheque_test.go index dedcd055d14..f0aac83a43c 100644 --- a/pkg/settlement/swap/chequebook/cheque_test.go +++ b/pkg/settlement/swap/chequebook/cheque_test.go @@ -12,10 +12,10 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/crypto/eip712" - signermock "github.com/ethersphere/bee/pkg/crypto/mock" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/crypto/eip712" + signermock "github.com/ethersphere/bee/v2/pkg/crypto/mock" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" ) func TestSignCheque(t *testing.T) { diff --git a/pkg/settlement/swap/chequebook/chequebook.go b/pkg/settlement/swap/chequebook/chequebook.go index 75d8e7876ca..ee04a818f93 100644 --- a/pkg/settlement/swap/chequebook/chequebook.go +++ b/pkg/settlement/swap/chequebook/chequebook.go @@ -13,11 +13,11 @@ import ( "sync" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/settlement/swap/erc20" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/util/abiutil" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" "github.com/ethersphere/go-sw3-abi/sw3abi" ) diff --git a/pkg/settlement/swap/chequebook/chequebook_test.go b/pkg/settlement/swap/chequebook/chequebook_test.go index ca3f705e80e..f9e656cd323 100644 --- a/pkg/settlement/swap/chequebook/chequebook_test.go +++ b/pkg/settlement/swap/chequebook/chequebook_test.go @@ -13,11 +13,11 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" - erc20mock "github.com/ethersphere/bee/pkg/settlement/swap/erc20/mock" - storemock "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/transaction" - transactionmock "github.com/ethersphere/bee/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" + erc20mock "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20/mock" + storemock "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/transaction" + transactionmock "github.com/ethersphere/bee/v2/pkg/transaction/mock" ) func TestChequebookAddress(t *testing.T) { diff --git a/pkg/settlement/swap/chequebook/chequestore.go b/pkg/settlement/swap/chequebook/chequestore.go index 100e60774fb..8db2e6e3a28 100644 --- a/pkg/settlement/swap/chequebook/chequestore.go +++ b/pkg/settlement/swap/chequebook/chequestore.go @@ -13,9 +13,9 @@ import ( "sync" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/transaction" ) const ( diff --git a/pkg/settlement/swap/chequebook/chequestore_test.go b/pkg/settlement/swap/chequebook/chequestore_test.go index be636e67356..57cd138a4f1 100644 --- a/pkg/settlement/swap/chequebook/chequestore_test.go +++ b/pkg/settlement/swap/chequebook/chequestore_test.go @@ -11,9 +11,9 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" - storemock "github.com/ethersphere/bee/pkg/statestore/mock" - transactionmock "github.com/ethersphere/bee/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" + storemock "github.com/ethersphere/bee/v2/pkg/statestore/mock" + transactionmock "github.com/ethersphere/bee/v2/pkg/transaction/mock" ) func TestReceiveCheque(t *testing.T) { diff --git a/pkg/settlement/swap/chequebook/common_test.go b/pkg/settlement/swap/chequebook/common_test.go index ef3b6988c25..717d205819f 100644 --- a/pkg/settlement/swap/chequebook/common_test.go +++ b/pkg/settlement/swap/chequebook/common_test.go @@ -9,7 +9,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" ) type chequeSignerMock struct { diff --git a/pkg/settlement/swap/chequebook/contract.go b/pkg/settlement/swap/chequebook/contract.go index 32ef2eba128..b655c511b84 100644 --- a/pkg/settlement/swap/chequebook/contract.go +++ b/pkg/settlement/swap/chequebook/contract.go @@ -10,7 +10,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/transaction" ) type chequebookContract struct { diff --git a/pkg/settlement/swap/chequebook/factory.go b/pkg/settlement/swap/chequebook/factory.go index 0f8bf3aea2f..27bd38db3b4 100644 --- a/pkg/settlement/swap/chequebook/factory.go +++ b/pkg/settlement/swap/chequebook/factory.go @@ -11,9 +11,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/util/abiutil" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" "github.com/ethersphere/go-sw3-abi/sw3abi" "golang.org/x/net/context" ) diff --git a/pkg/settlement/swap/chequebook/factory_test.go b/pkg/settlement/swap/chequebook/factory_test.go index d7223330ea4..16667ec303c 100644 --- a/pkg/settlement/swap/chequebook/factory_test.go +++ b/pkg/settlement/swap/chequebook/factory_test.go @@ -12,11 +12,11 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/transaction/backendmock" - transactionmock "github.com/ethersphere/bee/pkg/transaction/mock" - "github.com/ethersphere/bee/pkg/util/abiutil" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/transaction/backendmock" + transactionmock "github.com/ethersphere/bee/v2/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" "github.com/ethersphere/go-sw3-abi/sw3abi" ) diff --git a/pkg/settlement/swap/chequebook/init.go b/pkg/settlement/swap/chequebook/init.go index 19bfc3c56b0..de643ecaaf2 100644 --- a/pkg/settlement/swap/chequebook/init.go +++ b/pkg/settlement/swap/chequebook/init.go @@ -13,12 +13,12 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - chaincfg "github.com/ethersphere/bee/pkg/config" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/settlement/swap/erc20" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/transaction" + chaincfg "github.com/ethersphere/bee/v2/pkg/config" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/transaction" ) const ( diff --git a/pkg/settlement/swap/chequebook/mock/chequebook.go b/pkg/settlement/swap/chequebook/mock/chequebook.go index 79ce70a9a57..8950046c022 100644 --- a/pkg/settlement/swap/chequebook/mock/chequebook.go +++ b/pkg/settlement/swap/chequebook/mock/chequebook.go @@ -10,7 +10,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" ) // Service is the mock chequebook service. diff --git a/pkg/settlement/swap/chequestore/mock/chequestore.go b/pkg/settlement/swap/chequestore/mock/chequestore.go index 616063053aa..08215cecaf0 100644 --- a/pkg/settlement/swap/chequestore/mock/chequestore.go +++ b/pkg/settlement/swap/chequestore/mock/chequestore.go @@ -9,7 +9,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" ) // Service is the mock chequeStore service. diff --git a/pkg/settlement/swap/erc20/erc20.go b/pkg/settlement/swap/erc20/erc20.go index 510cc43769b..2733fa51887 100644 --- a/pkg/settlement/swap/erc20/erc20.go +++ b/pkg/settlement/swap/erc20/erc20.go @@ -11,9 +11,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/util/abiutil" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" "github.com/ethersphere/go-sw3-abi/sw3abi" ) diff --git a/pkg/settlement/swap/erc20/erc20_test.go b/pkg/settlement/swap/erc20/erc20_test.go index a51652ccdd0..e5752aca5df 100644 --- a/pkg/settlement/swap/erc20/erc20_test.go +++ b/pkg/settlement/swap/erc20/erc20_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/settlement/swap/erc20" - transactionmock "github.com/ethersphere/bee/pkg/transaction/mock" - "github.com/ethersphere/bee/pkg/util/abiutil" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20" + transactionmock "github.com/ethersphere/bee/v2/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" "github.com/ethersphere/go-sw3-abi/sw3abi" ) diff --git a/pkg/settlement/swap/erc20/mock/erc20.go b/pkg/settlement/swap/erc20/mock/erc20.go index 8d7652d2fb3..d4f2ac1a5e5 100644 --- a/pkg/settlement/swap/erc20/mock/erc20.go +++ b/pkg/settlement/swap/erc20/mock/erc20.go @@ -10,7 +10,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/settlement/swap/erc20" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20" ) type Service struct { diff --git a/pkg/settlement/swap/headers/utilities.go b/pkg/settlement/swap/headers/utilities.go index ee9709147a0..a940c45b7c3 100644 --- a/pkg/settlement/swap/headers/utilities.go +++ b/pkg/settlement/swap/headers/utilities.go @@ -8,7 +8,7 @@ import ( "errors" "math/big" - "github.com/ethersphere/bee/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p" ) const ( diff --git a/pkg/settlement/swap/headers/utilities_test.go b/pkg/settlement/swap/headers/utilities_test.go index a16087646e6..0cb074ac00f 100644 --- a/pkg/settlement/swap/headers/utilities_test.go +++ b/pkg/settlement/swap/headers/utilities_test.go @@ -9,8 +9,8 @@ import ( "reflect" "testing" - "github.com/ethersphere/bee/pkg/p2p" - swap "github.com/ethersphere/bee/pkg/settlement/swap/headers" + "github.com/ethersphere/bee/v2/pkg/p2p" + swap "github.com/ethersphere/bee/v2/pkg/settlement/swap/headers" ) func TestParseSettlementResponseHeaders(t *testing.T) { diff --git a/pkg/settlement/swap/metrics.go b/pkg/settlement/swap/metrics.go index ca1870645d1..d3f50770d54 100644 --- a/pkg/settlement/swap/metrics.go +++ b/pkg/settlement/swap/metrics.go @@ -5,7 +5,7 @@ package swap import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/settlement/swap/mock/swap.go b/pkg/settlement/swap/mock/swap.go index 8007ddd0c3a..2318194f962 100644 --- a/pkg/settlement/swap/mock/swap.go +++ b/pkg/settlement/swap/mock/swap.go @@ -10,10 +10,10 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/settlement/swap" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" - "github.com/ethersphere/bee/pkg/settlement/swap/swapprotocol" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/settlement/swap" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/swapprotocol" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type Service struct { diff --git a/pkg/settlement/swap/priceoracle/priceoracle.go b/pkg/settlement/swap/priceoracle/priceoracle.go index 06ab07d5e6c..0ba49e6eff2 100644 --- a/pkg/settlement/swap/priceoracle/priceoracle.go +++ b/pkg/settlement/swap/priceoracle/priceoracle.go @@ -13,9 +13,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/util/abiutil" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" "github.com/ethersphere/go-price-oracle-abi/priceoracleabi" ) diff --git a/pkg/settlement/swap/priceoracle/priceoracle_test.go b/pkg/settlement/swap/priceoracle/priceoracle_test.go index 2404d991058..58fa344b675 100644 --- a/pkg/settlement/swap/priceoracle/priceoracle_test.go +++ b/pkg/settlement/swap/priceoracle/priceoracle_test.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/settlement/swap/priceoracle" - transactionmock "github.com/ethersphere/bee/pkg/transaction/mock" - "github.com/ethersphere/bee/pkg/util/abiutil" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/priceoracle" + transactionmock "github.com/ethersphere/bee/v2/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" "github.com/ethersphere/go-price-oracle-abi/priceoracleabi" ) diff --git a/pkg/settlement/swap/swap.go b/pkg/settlement/swap/swap.go index a47e70c0bee..4e7f99bd060 100644 --- a/pkg/settlement/swap/swap.go +++ b/pkg/settlement/swap/swap.go @@ -11,13 +11,13 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage/postagecontract" - "github.com/ethersphere/bee/pkg/settlement" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" - "github.com/ethersphere/bee/pkg/settlement/swap/swapprotocol" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage/postagecontract" + "github.com/ethersphere/bee/v2/pkg/settlement" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/swapprotocol" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // loggerName is the tree path name of the logger for this package. diff --git a/pkg/settlement/swap/swap_test.go b/pkg/settlement/swap/swap_test.go index a7e55198dda..2f4d748740e 100644 --- a/pkg/settlement/swap/swap_test.go +++ b/pkg/settlement/swap/swap_test.go @@ -12,15 +12,15 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/settlement/swap" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" - mockchequebook "github.com/ethersphere/bee/pkg/settlement/swap/chequebook/mock" - mockchequestore "github.com/ethersphere/bee/pkg/settlement/swap/chequestore/mock" - "github.com/ethersphere/bee/pkg/settlement/swap/swapprotocol" - mockstore "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/settlement/swap" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" + mockchequebook "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook/mock" + mockchequestore "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequestore/mock" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/swapprotocol" + mockstore "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type swapProtocolMock struct { diff --git a/pkg/settlement/swap/swapprotocol/export_test.go b/pkg/settlement/swap/swapprotocol/export_test.go index 46b81c598b9..31fc9e6b79f 100644 --- a/pkg/settlement/swap/swapprotocol/export_test.go +++ b/pkg/settlement/swap/swapprotocol/export_test.go @@ -6,7 +6,7 @@ package swapprotocol import ( "context" - "github.com/ethersphere/bee/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p" ) func (s *Service) Init(ctx context.Context, p p2p.Peer) error { diff --git a/pkg/settlement/swap/swapprotocol/swapprotocol.go b/pkg/settlement/swap/swapprotocol/swapprotocol.go index 58318826d23..45715621208 100644 --- a/pkg/settlement/swap/swapprotocol/swapprotocol.go +++ b/pkg/settlement/swap/swapprotocol/swapprotocol.go @@ -13,14 +13,14 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" - swap "github.com/ethersphere/bee/pkg/settlement/swap/headers" - "github.com/ethersphere/bee/pkg/settlement/swap/priceoracle" - "github.com/ethersphere/bee/pkg/settlement/swap/swapprotocol/pb" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" + swap "github.com/ethersphere/bee/v2/pkg/settlement/swap/headers" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/priceoracle" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/swapprotocol/pb" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // loggerName is the tree path name of the logger for this package. diff --git a/pkg/settlement/swap/swapprotocol/swapprotocol_test.go b/pkg/settlement/swap/swapprotocol/swapprotocol_test.go index 482de2e0796..45445132466 100644 --- a/pkg/settlement/swap/swapprotocol/swapprotocol_test.go +++ b/pkg/settlement/swap/swapprotocol/swapprotocol_test.go @@ -14,16 +14,16 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/p2p/streamtest" - "github.com/ethersphere/bee/pkg/settlement/swap/chequebook" - swapmock "github.com/ethersphere/bee/pkg/settlement/swap/mock" - priceoraclemock "github.com/ethersphere/bee/pkg/settlement/swap/priceoracle/mock" - "github.com/ethersphere/bee/pkg/settlement/swap/swapprotocol" - "github.com/ethersphere/bee/pkg/settlement/swap/swapprotocol/pb" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/p2p/streamtest" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/chequebook" + swapmock "github.com/ethersphere/bee/v2/pkg/settlement/swap/mock" + priceoraclemock "github.com/ethersphere/bee/v2/pkg/settlement/swap/priceoracle/mock" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/swapprotocol" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/swapprotocol/pb" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestEmitCheques(t *testing.T) { diff --git a/pkg/sharky/metrics.go b/pkg/sharky/metrics.go index 8da4ed99163..53db4675b06 100644 --- a/pkg/sharky/metrics.go +++ b/pkg/sharky/metrics.go @@ -5,7 +5,7 @@ package sharky import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/sharky/recovery_test.go b/pkg/sharky/recovery_test.go index 3cd96481231..1cc7ae3d55e 100644 --- a/pkg/sharky/recovery_test.go +++ b/pkg/sharky/recovery_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/sharky" ) func TestMissingShard(t *testing.T) { diff --git a/pkg/sharky/shard_test.go b/pkg/sharky/shard_test.go index cb85607d488..567a0cf9ad3 100644 --- a/pkg/sharky/shard_test.go +++ b/pkg/sharky/shard_test.go @@ -8,7 +8,7 @@ import ( "math" "testing" - "github.com/ethersphere/bee/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/sharky" ) func TestLocationSerialization(t *testing.T) { diff --git a/pkg/sharky/sharky_test.go b/pkg/sharky/sharky_test.go index 8ae75f5b9ca..1e3aadd78b4 100644 --- a/pkg/sharky/sharky_test.go +++ b/pkg/sharky/sharky_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/sharky" "golang.org/x/sync/errgroup" ) diff --git a/pkg/shed/db_test.go b/pkg/shed/db_test.go index 754f133a1a7..7bed4610504 100644 --- a/pkg/shed/db_test.go +++ b/pkg/shed/db_test.go @@ -19,7 +19,7 @@ package shed import ( "testing" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) // TestNewDB constructs a new DB diff --git a/pkg/shed/example_store_test.go b/pkg/shed/example_store_test.go index fd8cae0f53a..911fe389d2a 100644 --- a/pkg/shed/example_store_test.go +++ b/pkg/shed/example_store_test.go @@ -25,10 +25,10 @@ import ( "log" "time" - shed2 "github.com/ethersphere/bee/pkg/shed" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/swarm" + shed2 "github.com/ethersphere/bee/v2/pkg/shed" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/pkg/shed/metrics.go b/pkg/shed/metrics.go index e922e39594e..58820407c9d 100644 --- a/pkg/shed/metrics.go +++ b/pkg/shed/metrics.go @@ -5,7 +5,7 @@ package shed import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/skippeers/skippeers.go b/pkg/skippeers/skippeers.go index c512e5e0ae8..f89a49364c4 100644 --- a/pkg/skippeers/skippeers.go +++ b/pkg/skippeers/skippeers.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const MaxDuration time.Duration = math.MaxInt64 diff --git a/pkg/skippeers/skippeers_test.go b/pkg/skippeers/skippeers_test.go index a6201deffc3..1f52636b91c 100644 --- a/pkg/skippeers/skippeers_test.go +++ b/pkg/skippeers/skippeers_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/skippeers" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/skippeers" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestPruneExpiresAfter(t *testing.T) { diff --git a/pkg/soc/soc.go b/pkg/soc/soc.go index 00e069f310e..65b44f2e66e 100644 --- a/pkg/soc/soc.go +++ b/pkg/soc/soc.go @@ -10,9 +10,9 @@ import ( "bytes" "errors" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/soc/soc_test.go b/pkg/soc/soc_test.go index 105a7cdedde..6346242fa1b 100644 --- a/pkg/soc/soc_test.go +++ b/pkg/soc/soc_test.go @@ -12,10 +12,10 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/soc" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestNew(t *testing.T) { diff --git a/pkg/soc/testing/soc.go b/pkg/soc/testing/soc.go index c8449e820ce..e5325f464b1 100644 --- a/pkg/soc/testing/soc.go +++ b/pkg/soc/testing/soc.go @@ -7,10 +7,10 @@ package testing import ( "testing" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/soc" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // MockSOC defines a mocked SOC with exported fields for easy testing. diff --git a/pkg/soc/validator.go b/pkg/soc/validator.go index db0c388808e..06f2fb72e0a 100644 --- a/pkg/soc/validator.go +++ b/pkg/soc/validator.go @@ -7,7 +7,7 @@ package soc import ( "bytes" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // Valid checks if the chunk is a valid single-owner chunk. diff --git a/pkg/soc/validator_test.go b/pkg/soc/validator_test.go index 695d43cc46f..e6913000149 100644 --- a/pkg/soc/validator_test.go +++ b/pkg/soc/validator_test.go @@ -10,10 +10,10 @@ import ( "strings" "testing" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/soc" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // TestValid verifies that the validator can detect diff --git a/pkg/spinlock/wait_test.go b/pkg/spinlock/wait_test.go index e38aef2e650..090543723b1 100644 --- a/pkg/spinlock/wait_test.go +++ b/pkg/spinlock/wait_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/spinlock" + "github.com/ethersphere/bee/v2/pkg/spinlock" ) func TestWait(t *testing.T) { diff --git a/pkg/statestore/leveldb/leveldb.go b/pkg/statestore/leveldb/leveldb.go index 65d2cc471ac..08d757ce288 100644 --- a/pkg/statestore/leveldb/leveldb.go +++ b/pkg/statestore/leveldb/leveldb.go @@ -10,8 +10,8 @@ import ( "errors" "fmt" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/storage" ldberr "github.com/syndtr/goleveldb/leveldb/errors" diff --git a/pkg/statestore/leveldb/leveldb_test.go b/pkg/statestore/leveldb/leveldb_test.go index 2e18b9f6b61..fffd43ac5f1 100644 --- a/pkg/statestore/leveldb/leveldb_test.go +++ b/pkg/statestore/leveldb/leveldb_test.go @@ -7,10 +7,10 @@ package leveldb_test import ( "testing" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/statestore/leveldb" - "github.com/ethersphere/bee/pkg/statestore/test" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/statestore/leveldb" + "github.com/ethersphere/bee/v2/pkg/statestore/test" + "github.com/ethersphere/bee/v2/pkg/storage" ) func TestPersistentStateStore(t *testing.T) { diff --git a/pkg/statestore/mock/store.go b/pkg/statestore/mock/store.go index 964c5c4ef61..a3d34542f2c 100644 --- a/pkg/statestore/mock/store.go +++ b/pkg/statestore/mock/store.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage" ) var _ storage.StateStorer = (*store)(nil) diff --git a/pkg/statestore/mock/store_test.go b/pkg/statestore/mock/store_test.go index fc891136376..330261dbba5 100644 --- a/pkg/statestore/mock/store_test.go +++ b/pkg/statestore/mock/store_test.go @@ -7,9 +7,9 @@ package mock_test import ( "testing" - "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/statestore/test" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/statestore/test" + "github.com/ethersphere/bee/v2/pkg/storage" ) func TestMockStateStore(t *testing.T) { diff --git a/pkg/statestore/storeadapter/migration.go b/pkg/statestore/storeadapter/migration.go index 171f31ccf57..ac5dbd457e2 100644 --- a/pkg/statestore/storeadapter/migration.go +++ b/pkg/statestore/storeadapter/migration.go @@ -7,8 +7,8 @@ package storeadapter import ( "strings" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/migration" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/migration" ) func allSteps() migration.Steps { diff --git a/pkg/statestore/storeadapter/storeadapter.go b/pkg/statestore/storeadapter/storeadapter.go index 03327e83cdd..a923f60a0f8 100644 --- a/pkg/statestore/storeadapter/storeadapter.go +++ b/pkg/statestore/storeadapter/storeadapter.go @@ -10,9 +10,9 @@ import ( "fmt" "strings" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/migration" - "github.com/ethersphere/bee/pkg/storage/storageutil" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/migration" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" ) // stateStoreNamespace is the namespace used for state storage. diff --git a/pkg/statestore/storeadapter/storeadapter_test.go b/pkg/statestore/storeadapter/storeadapter_test.go index 5065a5158da..f90db7b7ce1 100644 --- a/pkg/statestore/storeadapter/storeadapter_test.go +++ b/pkg/statestore/storeadapter/storeadapter_test.go @@ -7,11 +7,11 @@ package storeadapter_test import ( "testing" - "github.com/ethersphere/bee/pkg/statestore/storeadapter" - "github.com/ethersphere/bee/pkg/statestore/test" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - "github.com/ethersphere/bee/pkg/storage/leveldbstore" + "github.com/ethersphere/bee/v2/pkg/statestore/storeadapter" + "github.com/ethersphere/bee/v2/pkg/statestore/test" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + "github.com/ethersphere/bee/v2/pkg/storage/leveldbstore" ) func TestStateStoreAdapter(t *testing.T) { diff --git a/pkg/statestore/test/store.go b/pkg/statestore/test/store.go index ee5050b8633..10bc9c15c83 100644 --- a/pkg/statestore/test/store.go +++ b/pkg/statestore/test/store.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage" ) const ( diff --git a/pkg/status/status.go b/pkg/status/status.go index 9b0b6fcb8d8..a8321dc98bc 100644 --- a/pkg/status/status.go +++ b/pkg/status/status.go @@ -8,13 +8,13 @@ import ( "context" "fmt" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/status/internal/pb" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/status/internal/pb" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" ) // loggerName is the tree path name of the logger for this package. diff --git a/pkg/status/status_test.go b/pkg/status/status_test.go index 887b6175770..927ddb09ca5 100644 --- a/pkg/status/status_test.go +++ b/pkg/status/status_test.go @@ -9,14 +9,14 @@ import ( "context" "testing" - "github.com/ethersphere/bee/pkg/api" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p/protobuf" - "github.com/ethersphere/bee/pkg/p2p/streamtest" - "github.com/ethersphere/bee/pkg/status" - "github.com/ethersphere/bee/pkg/status/internal/pb" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/api" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p/protobuf" + "github.com/ethersphere/bee/v2/pkg/p2p/streamtest" + "github.com/ethersphere/bee/v2/pkg/status" + "github.com/ethersphere/bee/v2/pkg/status/internal/pb" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/steward/mock/steward.go b/pkg/steward/mock/steward.go index 4394ca301af..b8cee8b3588 100644 --- a/pkg/steward/mock/steward.go +++ b/pkg/steward/mock/steward.go @@ -7,8 +7,8 @@ package mock import ( "context" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // Steward represents steward.Interface mock. diff --git a/pkg/steward/steward.go b/pkg/steward/steward.go index 73b3d17b87f..9c099dd3624 100644 --- a/pkg/steward/steward.go +++ b/pkg/steward/steward.go @@ -11,13 +11,13 @@ import ( "errors" "fmt" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/retrieval" - "github.com/ethersphere/bee/pkg/storage" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/traversal" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/retrieval" + "github.com/ethersphere/bee/v2/pkg/storage" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/traversal" ) type Interface interface { diff --git a/pkg/steward/steward_test.go b/pkg/steward/steward_test.go index fe3ccd05ba9..049fa581ae1 100644 --- a/pkg/steward/steward_test.go +++ b/pkg/steward/steward_test.go @@ -14,14 +14,14 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/file/pipeline/builder" - "github.com/ethersphere/bee/pkg/file/redundancy" - postagetesting "github.com/ethersphere/bee/pkg/postage/mock" - "github.com/ethersphere/bee/pkg/steward" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/builder" + "github.com/ethersphere/bee/v2/pkg/file/redundancy" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/mock" + "github.com/ethersphere/bee/v2/pkg/steward" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type counter struct { diff --git a/pkg/storage/cache/cache.go b/pkg/storage/cache/cache.go index 880a408f7aa..1c659146f18 100644 --- a/pkg/storage/cache/cache.go +++ b/pkg/storage/cache/cache.go @@ -7,8 +7,8 @@ package cache import ( "errors" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storageutil" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" lru "github.com/hashicorp/golang-lru/v2" ) diff --git a/pkg/storage/cache/cache_test.go b/pkg/storage/cache/cache_test.go index 9220e93691d..6528f156785 100644 --- a/pkg/storage/cache/cache_test.go +++ b/pkg/storage/cache/cache_test.go @@ -7,9 +7,9 @@ package cache_test import ( "testing" - "github.com/ethersphere/bee/pkg/storage/cache" - "github.com/ethersphere/bee/pkg/storage/leveldbstore" - "github.com/ethersphere/bee/pkg/storage/storagetest" + "github.com/ethersphere/bee/v2/pkg/storage/cache" + "github.com/ethersphere/bee/v2/pkg/storage/leveldbstore" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" ) func TestCache(t *testing.T) { diff --git a/pkg/storage/cache/metrics.go b/pkg/storage/cache/metrics.go index 9492829ebc3..ec9a6051786 100644 --- a/pkg/storage/cache/metrics.go +++ b/pkg/storage/cache/metrics.go @@ -5,7 +5,7 @@ package cache import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/storage/chunkstore.go b/pkg/storage/chunkstore.go index aec30e6afc9..4d2e5d78d4a 100644 --- a/pkg/storage/chunkstore.go +++ b/pkg/storage/chunkstore.go @@ -9,7 +9,7 @@ import ( "fmt" "io" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // Getter is the interface that wraps the basic Get method. diff --git a/pkg/storage/inmemchunkstore/inmemchunkstore.go b/pkg/storage/inmemchunkstore/inmemchunkstore.go index 0f225db0608..f1fd629db41 100644 --- a/pkg/storage/inmemchunkstore/inmemchunkstore.go +++ b/pkg/storage/inmemchunkstore/inmemchunkstore.go @@ -8,8 +8,8 @@ import ( "context" "sync" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type ChunkStore struct { diff --git a/pkg/storage/inmemchunkstore/inmemchunkstore_test.go b/pkg/storage/inmemchunkstore/inmemchunkstore_test.go index 1835fcc02a8..21d48b4687d 100644 --- a/pkg/storage/inmemchunkstore/inmemchunkstore_test.go +++ b/pkg/storage/inmemchunkstore/inmemchunkstore_test.go @@ -7,8 +7,8 @@ package inmemchunkstore_test import ( "testing" - inmem "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/storage/storagetest" + inmem "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" ) func TestChunkStore(t *testing.T) { diff --git a/pkg/storage/inmemchunkstore/transaction.go b/pkg/storage/inmemchunkstore/transaction.go index 5afaeef9386..f4ec18abc7e 100644 --- a/pkg/storage/inmemchunkstore/transaction.go +++ b/pkg/storage/inmemchunkstore/transaction.go @@ -9,8 +9,8 @@ import ( "errors" "fmt" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var _ storage.TxChunkStore = (*TxChunkStore)(nil) diff --git a/pkg/storage/inmemchunkstore/transaction_test.go b/pkg/storage/inmemchunkstore/transaction_test.go index 646298075f7..20919731f51 100644 --- a/pkg/storage/inmemchunkstore/transaction_test.go +++ b/pkg/storage/inmemchunkstore/transaction_test.go @@ -7,8 +7,8 @@ package inmemchunkstore_test import ( "testing" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/storage/storagetest" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" ) func TestTxChunkStore(t *testing.T) { diff --git a/pkg/storage/inmemstore/inmembatch.go b/pkg/storage/inmemstore/inmembatch.go index 309316e3c6f..7188f6d7e71 100644 --- a/pkg/storage/inmemstore/inmembatch.go +++ b/pkg/storage/inmemstore/inmembatch.go @@ -9,7 +9,7 @@ import ( "fmt" "sync" - storage "github.com/ethersphere/bee/pkg/storage" + storage "github.com/ethersphere/bee/v2/pkg/storage" ) // batchOp represents a batch operations. diff --git a/pkg/storage/inmemstore/inmemstore.go b/pkg/storage/inmemstore/inmemstore.go index 38c34af60bd..b0052602aa1 100644 --- a/pkg/storage/inmemstore/inmemstore.go +++ b/pkg/storage/inmemstore/inmemstore.go @@ -11,7 +11,7 @@ import ( "sync" "github.com/armon/go-radix" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage" ) const ( diff --git a/pkg/storage/inmemstore/inmemstore_test.go b/pkg/storage/inmemstore/inmemstore_test.go index cf79c9f2c7c..452daec1a55 100644 --- a/pkg/storage/inmemstore/inmemstore_test.go +++ b/pkg/storage/inmemstore/inmemstore_test.go @@ -7,8 +7,8 @@ package inmemstore_test import ( "testing" - inmem "github.com/ethersphere/bee/pkg/storage/inmemstore" - "github.com/ethersphere/bee/pkg/storage/storagetest" + inmem "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" ) func TestStore(t *testing.T) { diff --git a/pkg/storage/inmemstore/transaction.go b/pkg/storage/inmemstore/transaction.go index b0d600444bc..1415143b41c 100644 --- a/pkg/storage/inmemstore/transaction.go +++ b/pkg/storage/inmemstore/transaction.go @@ -10,7 +10,7 @@ import ( "fmt" "sync" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage" ) var ( diff --git a/pkg/storage/inmemstore/transaction_test.go b/pkg/storage/inmemstore/transaction_test.go index 552088fa311..a9eabe36d56 100644 --- a/pkg/storage/inmemstore/transaction_test.go +++ b/pkg/storage/inmemstore/transaction_test.go @@ -7,8 +7,8 @@ package inmemstore_test import ( "testing" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - "github.com/ethersphere/bee/pkg/storage/storagetest" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" ) func TestTxStore(t *testing.T) { diff --git a/pkg/storage/leveldbstore/batch.go b/pkg/storage/leveldbstore/batch.go index 96bbf2dbf49..64b72a97816 100644 --- a/pkg/storage/leveldbstore/batch.go +++ b/pkg/storage/leveldbstore/batch.go @@ -9,7 +9,7 @@ import ( "fmt" "sync" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage" ldb "github.com/syndtr/goleveldb/leveldb" ) diff --git a/pkg/storage/leveldbstore/recovery.go b/pkg/storage/leveldbstore/recovery.go index f52701275f0..6d3e04ee91d 100644 --- a/pkg/storage/leveldbstore/recovery.go +++ b/pkg/storage/leveldbstore/recovery.go @@ -7,8 +7,8 @@ package leveldbstore import ( "fmt" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/storage" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/opt" ) diff --git a/pkg/storage/leveldbstore/recovery_test.go b/pkg/storage/leveldbstore/recovery_test.go index f3d504f6e62..84bd9075d1a 100644 --- a/pkg/storage/leveldbstore/recovery_test.go +++ b/pkg/storage/leveldbstore/recovery_test.go @@ -11,9 +11,9 @@ import ( "slices" "testing" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/leveldbstore" - "github.com/ethersphere/bee/pkg/storage/storageutil" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/leveldbstore" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/storage/leveldbstore/store.go b/pkg/storage/leveldbstore/store.go index 30f203d3bfc..bf410d54c00 100644 --- a/pkg/storage/leveldbstore/store.go +++ b/pkg/storage/leveldbstore/store.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage" "github.com/syndtr/goleveldb/leveldb" ldbErrors "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/pkg/storage/leveldbstore/store_test.go b/pkg/storage/leveldbstore/store_test.go index 53fffc01a44..7e7bc809213 100644 --- a/pkg/storage/leveldbstore/store_test.go +++ b/pkg/storage/leveldbstore/store_test.go @@ -7,8 +7,8 @@ package leveldbstore_test import ( "testing" - "github.com/ethersphere/bee/pkg/storage/leveldbstore" - "github.com/ethersphere/bee/pkg/storage/storagetest" + "github.com/ethersphere/bee/v2/pkg/storage/leveldbstore" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" "github.com/syndtr/goleveldb/leveldb/opt" ) diff --git a/pkg/storage/leveldbstore/transaction.go b/pkg/storage/leveldbstore/transaction.go index 9a18b904ff2..c24259640a9 100644 --- a/pkg/storage/leveldbstore/transaction.go +++ b/pkg/storage/leveldbstore/transaction.go @@ -10,8 +10,8 @@ import ( "fmt" "sync" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storageutil" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" "github.com/google/uuid" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/pkg/storage/leveldbstore/transaction_test.go b/pkg/storage/leveldbstore/transaction_test.go index cc18e8f8632..e965ef0dc7a 100644 --- a/pkg/storage/leveldbstore/transaction_test.go +++ b/pkg/storage/leveldbstore/transaction_test.go @@ -7,8 +7,8 @@ package leveldbstore_test import ( "testing" - "github.com/ethersphere/bee/pkg/storage/leveldbstore" - "github.com/ethersphere/bee/pkg/storage/storagetest" + "github.com/ethersphere/bee/v2/pkg/storage/leveldbstore" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" ) func TestTxStore(t *testing.T) { diff --git a/pkg/storage/metrics.go b/pkg/storage/metrics.go index 00c90e8b361..f1a83b179d7 100644 --- a/pkg/storage/metrics.go +++ b/pkg/storage/metrics.go @@ -9,8 +9,8 @@ import ( "errors" "time" - m "github.com/ethersphere/bee/pkg/metrics" - "github.com/ethersphere/bee/pkg/swarm" + m "github.com/ethersphere/bee/v2/pkg/metrics" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/storage/migration/index.go b/pkg/storage/migration/index.go index bc08d6f2d2d..bb4df67f96f 100644 --- a/pkg/storage/migration/index.go +++ b/pkg/storage/migration/index.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - storage "github.com/ethersphere/bee/pkg/storage" + storage "github.com/ethersphere/bee/v2/pkg/storage" ) var ErrItemIDShouldntChange = errors.New("item.ID shouldn't be changing after update") diff --git a/pkg/storage/migration/index_test.go b/pkg/storage/migration/index_test.go index cf2e0ab8ded..935a50b9b50 100644 --- a/pkg/storage/migration/index_test.go +++ b/pkg/storage/migration/index_test.go @@ -9,9 +9,9 @@ import ( "reflect" "testing" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - "github.com/ethersphere/bee/pkg/storage/migration" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + "github.com/ethersphere/bee/v2/pkg/storage/migration" ) func TestNewStepOnIndex(t *testing.T) { diff --git a/pkg/storage/migration/migration.go b/pkg/storage/migration/migration.go index 528831f0da8..fcbd154fb34 100644 --- a/pkg/storage/migration/migration.go +++ b/pkg/storage/migration/migration.go @@ -10,8 +10,8 @@ import ( "fmt" "sort" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storageutil" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" ) type ( diff --git a/pkg/storage/migration/migration_test.go b/pkg/storage/migration/migration_test.go index c1de785f7d3..5daa371fd39 100644 --- a/pkg/storage/migration/migration_test.go +++ b/pkg/storage/migration/migration_test.go @@ -12,11 +12,11 @@ import ( "strconv" "testing" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - "github.com/ethersphere/bee/pkg/storage/migration" - "github.com/ethersphere/bee/pkg/storage/storagetest" - "github.com/ethersphere/bee/pkg/storage/storageutil" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + "github.com/ethersphere/bee/v2/pkg/storage/migration" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" ) var ( diff --git a/pkg/storage/migration/steps_chain.go b/pkg/storage/migration/steps_chain.go index 96f8835b614..1b3ddc52301 100644 --- a/pkg/storage/migration/steps_chain.go +++ b/pkg/storage/migration/steps_chain.go @@ -4,7 +4,7 @@ package migration -import storage "github.com/ethersphere/bee/pkg/storage" +import storage "github.com/ethersphere/bee/v2/pkg/storage" // NewStepsChain returns new StepFn which combines all supplied StepFn // into single StepFn. diff --git a/pkg/storage/migration/steps_chain_test.go b/pkg/storage/migration/steps_chain_test.go index 4488d6805b0..f591440ac5a 100644 --- a/pkg/storage/migration/steps_chain_test.go +++ b/pkg/storage/migration/steps_chain_test.go @@ -7,9 +7,9 @@ package migration_test import ( "testing" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - "github.com/ethersphere/bee/pkg/storage/migration" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + "github.com/ethersphere/bee/v2/pkg/storage/migration" ) func TestNewStepsChain(t *testing.T) { diff --git a/pkg/storage/repository.go b/pkg/storage/repository.go index f681ee76d88..c189cc3bfe4 100644 --- a/pkg/storage/repository.go +++ b/pkg/storage/repository.go @@ -9,8 +9,8 @@ import ( "errors" "time" - m "github.com/ethersphere/bee/pkg/metrics" - "github.com/ethersphere/bee/pkg/swarm" + m "github.com/ethersphere/bee/v2/pkg/metrics" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/storage/storagetest/batch.go b/pkg/storage/storagetest/batch.go index b144bc04908..c26986f42b5 100644 --- a/pkg/storage/storagetest/batch.go +++ b/pkg/storage/storagetest/batch.go @@ -9,7 +9,7 @@ import ( "errors" "testing" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/storage/storagetest/benchmark.go b/pkg/storage/storagetest/benchmark.go index 09cd3241ecb..015392ff7c5 100644 --- a/pkg/storage/storagetest/benchmark.go +++ b/pkg/storage/storagetest/benchmark.go @@ -16,9 +16,9 @@ import ( "testing" "time" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/storage/storagetest/chunkstore.go b/pkg/storage/storagetest/chunkstore.go index 767c4a2a0c4..996d7977f06 100644 --- a/pkg/storage/storagetest/chunkstore.go +++ b/pkg/storage/storagetest/chunkstore.go @@ -9,10 +9,10 @@ import ( "errors" "testing" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - storage "github.com/ethersphere/bee/pkg/storage" - chunktest "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/swarm" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + storage "github.com/ethersphere/bee/v2/pkg/storage" + chunktest "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // TestChunkStore runs a correctness test suite on a given ChunkStore. diff --git a/pkg/storage/storagetest/storage.go b/pkg/storage/storagetest/storage.go index 55f21ad156e..d270bbfc357 100644 --- a/pkg/storage/storagetest/storage.go +++ b/pkg/storage/storagetest/storage.go @@ -18,10 +18,10 @@ import ( "sync" "testing" - "github.com/ethersphere/bee/pkg/encryption" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storageutil" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/encryption" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/storage/storagetest/transaction.go b/pkg/storage/storagetest/transaction.go index 1275bedb7d9..8c8dde7cad0 100644 --- a/pkg/storage/storagetest/transaction.go +++ b/pkg/storage/storagetest/transaction.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storageutil" - chunktest "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" + chunktest "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/storage/testing/chunk.go b/pkg/storage/testing/chunk.go index 51623f0b925..f51c1079974 100644 --- a/pkg/storage/testing/chunk.go +++ b/pkg/storage/testing/chunk.go @@ -21,12 +21,12 @@ import ( "crypto/rand" "testing" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/crypto" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - "github.com/ethersphere/bee/pkg/soc" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/crypto" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + "github.com/ethersphere/bee/v2/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) // GenerateTestRandomChunk generates a valid content addressed chunk. diff --git a/pkg/storage/transaction.go b/pkg/storage/transaction.go index 1268e45da86..ad7d829d3c0 100644 --- a/pkg/storage/transaction.go +++ b/pkg/storage/transaction.go @@ -11,7 +11,7 @@ import ( "sync" "sync/atomic" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // ErrTxDone is returned by any operation that is performed on diff --git a/pkg/storage/transaction_test.go b/pkg/storage/transaction_test.go index a03df20a5dc..265e777bb68 100644 --- a/pkg/storage/transaction_test.go +++ b/pkg/storage/transaction_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage" ) func TestTxState(t *testing.T) { diff --git a/pkg/storageincentives/agent.go b/pkg/storageincentives/agent.go index 2bd0bf0ffb4..b71a77c3dff 100644 --- a/pkg/storageincentives/agent.go +++ b/pkg/storageincentives/agent.go @@ -16,17 +16,17 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/postage/postagecontract" - "github.com/ethersphere/bee/pkg/settlement/swap/erc20" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storageincentives/redistribution" - "github.com/ethersphere/bee/pkg/storageincentives/staking" - "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage/postagecontract" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storageincentives/redistribution" + "github.com/ethersphere/bee/v2/pkg/storageincentives/staking" + "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/transaction" ) const loggerName = "storageincentives" diff --git a/pkg/storageincentives/agent_test.go b/pkg/storageincentives/agent_test.go index fe5bc6a937f..ae078f1a871 100644 --- a/pkg/storageincentives/agent_test.go +++ b/pkg/storageincentives/agent_test.go @@ -14,19 +14,19 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - contractMock "github.com/ethersphere/bee/pkg/postage/postagecontract/mock" - erc20mock "github.com/ethersphere/bee/pkg/settlement/swap/erc20/mock" - statestore "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/storageincentives" - "github.com/ethersphere/bee/pkg/storageincentives/redistribution" - "github.com/ethersphere/bee/pkg/storageincentives/staking/mock" - "github.com/ethersphere/bee/pkg/storer" - resMock "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" - transactionmock "github.com/ethersphere/bee/pkg/transaction/mock" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + contractMock "github.com/ethersphere/bee/v2/pkg/postage/postagecontract/mock" + erc20mock "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20/mock" + statestore "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/storageincentives" + "github.com/ethersphere/bee/v2/pkg/storageincentives/redistribution" + "github.com/ethersphere/bee/v2/pkg/storageincentives/staking/mock" + "github.com/ethersphere/bee/v2/pkg/storer" + resMock "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" + transactionmock "github.com/ethersphere/bee/v2/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) func TestAgent(t *testing.T) { diff --git a/pkg/storageincentives/events_test.go b/pkg/storageincentives/events_test.go index 6c40fe8fc2e..0ea4547a145 100644 --- a/pkg/storageincentives/events_test.go +++ b/pkg/storageincentives/events_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/storageincentives" + "github.com/ethersphere/bee/v2/pkg/storageincentives" ) func TestClose(t *testing.T) { diff --git a/pkg/storageincentives/metrics.go b/pkg/storageincentives/metrics.go index 28c692cc3af..b376d9d20b2 100644 --- a/pkg/storageincentives/metrics.go +++ b/pkg/storageincentives/metrics.go @@ -5,7 +5,7 @@ package storageincentives import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/storageincentives/proof.go b/pkg/storageincentives/proof.go index ccc04cd935b..86dd115c67e 100644 --- a/pkg/storageincentives/proof.go +++ b/pkg/storageincentives/proof.go @@ -10,13 +10,13 @@ import ( "hash" "math/big" - "github.com/ethersphere/bee/pkg/bmt" - "github.com/ethersphere/bee/pkg/bmtpool" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/soc" - "github.com/ethersphere/bee/pkg/storageincentives/redistribution" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bmt" + "github.com/ethersphere/bee/v2/pkg/bmtpool" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/storageincentives/redistribution" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var errProofCreation = errors.New("reserve commitment hasher: failure in proof creation") diff --git a/pkg/storageincentives/proof_test.go b/pkg/storageincentives/proof_test.go index 1d83309ba24..8b574cadf3d 100644 --- a/pkg/storageincentives/proof_test.go +++ b/pkg/storageincentives/proof_test.go @@ -12,16 +12,16 @@ import ( "math/big" "testing" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/postage" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - "github.com/ethersphere/bee/pkg/soc" - "github.com/ethersphere/bee/pkg/storageincentives" - "github.com/ethersphere/bee/pkg/storageincentives/redistribution" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/postage" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + "github.com/ethersphere/bee/v2/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/storageincentives" + "github.com/ethersphere/bee/v2/pkg/storageincentives/redistribution" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/testutil" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/storageincentives/redistribution/inclusionproof.go b/pkg/storageincentives/redistribution/inclusionproof.go index b786d1d3001..41e319b9c63 100644 --- a/pkg/storageincentives/redistribution/inclusionproof.go +++ b/pkg/storageincentives/redistribution/inclusionproof.go @@ -8,10 +8,10 @@ import ( "encoding/binary" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/bmt" - "github.com/ethersphere/bee/pkg/soc" - "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bmt" + "github.com/ethersphere/bee/v2/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type ChunkInclusionProofs struct { diff --git a/pkg/storageincentives/redistribution/redistribution.go b/pkg/storageincentives/redistribution/redistribution.go index 01ddb9195b0..42fa4ee6cf1 100644 --- a/pkg/storageincentives/redistribution/redistribution.go +++ b/pkg/storageincentives/redistribution/redistribution.go @@ -11,10 +11,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/transaction" ) const loggerName = "redistributionContract" diff --git a/pkg/storageincentives/redistribution/redistribution_test.go b/pkg/storageincentives/redistribution/redistribution_test.go index 4a8e84b421b..022e88fc3bf 100644 --- a/pkg/storageincentives/redistribution/redistribution_test.go +++ b/pkg/storageincentives/redistribution/redistribution_test.go @@ -15,15 +15,15 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - chaincfg "github.com/ethersphere/bee/pkg/config" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/storageincentives/redistribution" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/transaction" - transactionMock "github.com/ethersphere/bee/pkg/transaction/mock" - "github.com/ethersphere/bee/pkg/util/abiutil" - "github.com/ethersphere/bee/pkg/util/testutil" + chaincfg "github.com/ethersphere/bee/v2/pkg/config" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/storageincentives/redistribution" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/transaction" + transactionMock "github.com/ethersphere/bee/v2/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) var redistributionContractABI = abiutil.MustParseABI(chaincfg.Testnet.RedistributionABI) diff --git a/pkg/storageincentives/redistributionstate.go b/pkg/storageincentives/redistributionstate.go index b1f4b60dd03..9929a9e7831 100644 --- a/pkg/storageincentives/redistributionstate.go +++ b/pkg/storageincentives/redistributionstate.go @@ -12,12 +12,12 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/settlement/swap/erc20" - "github.com/ethersphere/bee/pkg/storage" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20" + "github.com/ethersphere/bee/v2/pkg/storage" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/transaction" ) const loggerNameNode = "nodestatus" diff --git a/pkg/storageincentives/redistributionstate_test.go b/pkg/storageincentives/redistributionstate_test.go index 9c7f750d64c..063991c31d8 100644 --- a/pkg/storageincentives/redistributionstate_test.go +++ b/pkg/storageincentives/redistributionstate_test.go @@ -11,11 +11,11 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - erc20mock "github.com/ethersphere/bee/pkg/settlement/swap/erc20/mock" - "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/swarm" - transactionmock "github.com/ethersphere/bee/pkg/transaction/mock" - "github.com/ethersphere/bee/pkg/util/testutil" + erc20mock "github.com/ethersphere/bee/v2/pkg/settlement/swap/erc20/mock" + "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" + transactionmock "github.com/ethersphere/bee/v2/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/util/testutil" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/storageincentives/soc_mine_test.go b/pkg/storageincentives/soc_mine_test.go index d5b93241b21..bdece238f80 100644 --- a/pkg/storageincentives/soc_mine_test.go +++ b/pkg/storageincentives/soc_mine_test.go @@ -15,11 +15,11 @@ import ( "sync" "testing" - "github.com/ethersphere/bee/pkg/bmt" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/soc" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bmt" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/swarm" "golang.org/x/sync/errgroup" ) diff --git a/pkg/storageincentives/staking/contract.go b/pkg/storageincentives/staking/contract.go index 128343824a2..f5a340b2b93 100644 --- a/pkg/storageincentives/staking/contract.go +++ b/pkg/storageincentives/staking/contract.go @@ -13,10 +13,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/util/abiutil" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" "github.com/ethersphere/go-sw3-abi/sw3abi" ) diff --git a/pkg/storageincentives/staking/contract_test.go b/pkg/storageincentives/staking/contract_test.go index 27f9e31ccca..24133631b99 100644 --- a/pkg/storageincentives/staking/contract_test.go +++ b/pkg/storageincentives/staking/contract_test.go @@ -14,12 +14,12 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - chaincfg "github.com/ethersphere/bee/pkg/config" - "github.com/ethersphere/bee/pkg/storageincentives/staking" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/transaction" - transactionMock "github.com/ethersphere/bee/pkg/transaction/mock" - "github.com/ethersphere/bee/pkg/util/abiutil" + chaincfg "github.com/ethersphere/bee/v2/pkg/config" + "github.com/ethersphere/bee/v2/pkg/storageincentives/staking" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/transaction" + transactionMock "github.com/ethersphere/bee/v2/pkg/transaction/mock" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" ) var stakingContractABI = abiutil.MustParseABI(chaincfg.Testnet.StakingABI) diff --git a/pkg/storageincentives/staking/mock/contract.go b/pkg/storageincentives/staking/mock/contract.go index 09d8c03b4c2..e21e51964f9 100644 --- a/pkg/storageincentives/staking/mock/contract.go +++ b/pkg/storageincentives/staking/mock/contract.go @@ -9,7 +9,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" - "github.com/ethersphere/bee/pkg/storageincentives/staking" + "github.com/ethersphere/bee/v2/pkg/storageincentives/staking" ) type stakingContractMock struct { diff --git a/pkg/storer/cachestore.go b/pkg/storer/cachestore.go index 1e7546c7c23..16c92cb7f25 100644 --- a/pkg/storer/cachestore.go +++ b/pkg/storer/cachestore.go @@ -10,9 +10,9 @@ import ( "fmt" "time" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storer/internal" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const ( diff --git a/pkg/storer/cachestore_test.go b/pkg/storer/cachestore_test.go index dc2264491e7..2c280dd3920 100644 --- a/pkg/storer/cachestore_test.go +++ b/pkg/storer/cachestore_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/spinlock" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storagetest" - chunktesting "github.com/ethersphere/bee/pkg/storage/testing" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/spinlock" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" + chunktesting "github.com/ethersphere/bee/v2/pkg/storage/testing" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func testCacheStore(t *testing.T, newStorer func() (*storer.DB, error)) { diff --git a/pkg/storer/compact.go b/pkg/storer/compact.go index 3ecc623e98f..a2bea67176a 100644 --- a/pkg/storer/compact.go +++ b/pkg/storer/compact.go @@ -12,9 +12,9 @@ import ( "sort" "time" - "github.com/ethersphere/bee/pkg/sharky" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // Compact minimizes sharky disk usage by, using the current sharky locations from the storer, diff --git a/pkg/storer/compact_test.go b/pkg/storer/compact_test.go index 3606e7c8c9d..d18675ef33b 100644 --- a/pkg/storer/compact_test.go +++ b/pkg/storer/compact_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/postage" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - pullerMock "github.com/ethersphere/bee/pkg/puller/mock" - chunk "github.com/ethersphere/bee/pkg/storage/testing" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/postage" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + pullerMock "github.com/ethersphere/bee/v2/pkg/puller/mock" + chunk "github.com/ethersphere/bee/v2/pkg/storage/testing" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // TestCompact creates two batches and puts chunks belonging to both batches. diff --git a/pkg/storer/debug.go b/pkg/storer/debug.go index 9128141a430..16f918d1ed6 100644 --- a/pkg/storer/debug.go +++ b/pkg/storer/debug.go @@ -7,11 +7,11 @@ package storer import ( "context" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstore" - pinstore "github.com/ethersphere/bee/pkg/storer/internal/pinning" - "github.com/ethersphere/bee/pkg/storer/internal/reserve" - "github.com/ethersphere/bee/pkg/storer/internal/upload" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstore" + pinstore "github.com/ethersphere/bee/v2/pkg/storer/internal/pinning" + "github.com/ethersphere/bee/v2/pkg/storer/internal/reserve" + "github.com/ethersphere/bee/v2/pkg/storer/internal/upload" + "github.com/ethersphere/bee/v2/pkg/swarm" "golang.org/x/sync/errgroup" ) diff --git a/pkg/storer/debug_test.go b/pkg/storer/debug_test.go index d62a38aeb55..37325ce6cf8 100644 --- a/pkg/storer/debug_test.go +++ b/pkg/storer/debug_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - chunktest "github.com/ethersphere/bee/pkg/storage/testing" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + chunktest "github.com/ethersphere/bee/v2/pkg/storage/testing" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/storer/export_test.go b/pkg/storer/export_test.go index 0613e467831..47532f0c63d 100644 --- a/pkg/storer/export_test.go +++ b/pkg/storer/export_test.go @@ -7,9 +7,9 @@ package storer import ( "context" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storer/internal/events" - "github.com/ethersphere/bee/pkg/storer/internal/reserve" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storer/internal/events" + "github.com/ethersphere/bee/v2/pkg/storer/internal/reserve" ) func (db *DB) Reserve() *reserve.Reserve { diff --git a/pkg/storer/internal/cache/cache.go b/pkg/storer/internal/cache/cache.go index 887f2a27ae9..a3e71f9cc70 100644 --- a/pkg/storer/internal/cache/cache.go +++ b/pkg/storer/internal/cache/cache.go @@ -14,9 +14,9 @@ import ( "sync/atomic" "time" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storer/internal" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + "github.com/ethersphere/bee/v2/pkg/swarm" "resenje.org/multex" ) diff --git a/pkg/storer/internal/cache/cache_test.go b/pkg/storer/internal/cache/cache_test.go index c331853d352..337d47641df 100644 --- a/pkg/storer/internal/cache/cache_test.go +++ b/pkg/storer/internal/cache/cache_test.go @@ -14,12 +14,12 @@ import ( "testing" "time" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storagetest" - chunktest "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer/internal" - "github.com/ethersphere/bee/pkg/storer/internal/cache" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" + chunktest "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + "github.com/ethersphere/bee/v2/pkg/storer/internal/cache" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/storer/internal/cache/export_test.go b/pkg/storer/internal/cache/export_test.go index 9a8eda3afa3..dee5f9e6d09 100644 --- a/pkg/storer/internal/cache/export_test.go +++ b/pkg/storer/internal/cache/export_test.go @@ -9,9 +9,9 @@ import ( "fmt" "time" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storer/internal" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type ( diff --git a/pkg/storer/internal/chunkstamp/chunkstamp.go b/pkg/storer/internal/chunkstamp/chunkstamp.go index 4e8e8c91f22..83b6a4c236c 100644 --- a/pkg/storer/internal/chunkstamp/chunkstamp.go +++ b/pkg/storer/internal/chunkstamp/chunkstamp.go @@ -10,10 +10,10 @@ import ( "errors" "fmt" - "github.com/ethersphere/bee/pkg/postage" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storageutil" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/postage" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/storer/internal/chunkstamp/chunkstamp_test.go b/pkg/storer/internal/chunkstamp/chunkstamp_test.go index a09b1c111ac..44e1f8c3f78 100644 --- a/pkg/storer/internal/chunkstamp/chunkstamp_test.go +++ b/pkg/storer/internal/chunkstamp/chunkstamp_test.go @@ -9,13 +9,13 @@ import ( "fmt" "testing" - "github.com/ethersphere/bee/pkg/postage" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storagetest" - chunktest "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer/internal" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstamp" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/postage" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" + chunktest "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstamp" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/storer/internal/chunkstamp/export_test.go b/pkg/storer/internal/chunkstamp/export_test.go index 5e2640d094b..77e54330e66 100644 --- a/pkg/storer/internal/chunkstamp/export_test.go +++ b/pkg/storer/internal/chunkstamp/export_test.go @@ -4,7 +4,7 @@ package chunkstamp -import "github.com/ethersphere/bee/pkg/swarm" +import "github.com/ethersphere/bee/v2/pkg/swarm" type Item = item diff --git a/pkg/storer/internal/chunkstore/chunkstore.go b/pkg/storer/internal/chunkstore/chunkstore.go index f1af1098944..70279c6e320 100644 --- a/pkg/storer/internal/chunkstore/chunkstore.go +++ b/pkg/storer/internal/chunkstore/chunkstore.go @@ -11,10 +11,10 @@ import ( "fmt" "time" - "github.com/ethersphere/bee/pkg/sharky" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storageutil" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" + "github.com/ethersphere/bee/v2/pkg/swarm" "golang.org/x/exp/slices" ) diff --git a/pkg/storer/internal/chunkstore/chunkstore_test.go b/pkg/storer/internal/chunkstore/chunkstore_test.go index ce135ebaceb..9515a8142e9 100644 --- a/pkg/storer/internal/chunkstore/chunkstore_test.go +++ b/pkg/storer/internal/chunkstore/chunkstore_test.go @@ -13,13 +13,13 @@ import ( "os" "testing" - "github.com/ethersphere/bee/pkg/sharky" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - "github.com/ethersphere/bee/pkg/storage/storagetest" - chunktest "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" + chunktest "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/spf13/afero" ) diff --git a/pkg/storer/internal/chunkstore/helpers.go b/pkg/storer/internal/chunkstore/helpers.go index 8e0269144eb..782acc5788b 100644 --- a/pkg/storer/internal/chunkstore/helpers.go +++ b/pkg/storer/internal/chunkstore/helpers.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "github.com/ethersphere/bee/pkg/sharky" - storage "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/sharky" + storage "github.com/ethersphere/bee/v2/pkg/storage" ) type LocationResult struct { diff --git a/pkg/storer/internal/chunkstore/helpers_test.go b/pkg/storer/internal/chunkstore/helpers_test.go index 5add6228f9e..2b5d37f2247 100644 --- a/pkg/storer/internal/chunkstore/helpers_test.go +++ b/pkg/storer/internal/chunkstore/helpers_test.go @@ -10,12 +10,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ethersphere/bee/pkg/sharky" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - chunktest "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/sharky" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + chunktest "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/spf13/afero" ) diff --git a/pkg/storer/internal/chunkstore/recovery.go b/pkg/storer/internal/chunkstore/recovery.go index fad8d47e222..a628d60ff44 100644 --- a/pkg/storer/internal/chunkstore/recovery.go +++ b/pkg/storer/internal/chunkstore/recovery.go @@ -9,10 +9,10 @@ import ( "fmt" "slices" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/sharky" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storageutil" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" "github.com/vmihailenco/msgpack/v5" ) diff --git a/pkg/storer/internal/chunkstore/recovery_test.go b/pkg/storer/internal/chunkstore/recovery_test.go index 99c5b0f8c76..40d033df474 100644 --- a/pkg/storer/internal/chunkstore/recovery_test.go +++ b/pkg/storer/internal/chunkstore/recovery_test.go @@ -10,12 +10,12 @@ import ( "slices" - "github.com/ethersphere/bee/pkg/sharky" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/leveldbstore" - chunktest "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/leveldbstore" + chunktest "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/spf13/afero" diff --git a/pkg/storer/internal/chunkstore/transaction.go b/pkg/storer/internal/chunkstore/transaction.go index 02927d6423a..82833fecd54 100644 --- a/pkg/storer/internal/chunkstore/transaction.go +++ b/pkg/storer/internal/chunkstore/transaction.go @@ -11,10 +11,10 @@ import ( "fmt" "sync" - "github.com/ethersphere/bee/pkg/sharky" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/leveldbstore" - "github.com/ethersphere/bee/pkg/storage/storageutil" + "github.com/ethersphere/bee/v2/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/leveldbstore" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" "github.com/google/uuid" "github.com/vmihailenco/msgpack/v5" ) diff --git a/pkg/storer/internal/chunkstore/transaction_test.go b/pkg/storer/internal/chunkstore/transaction_test.go index 88dd98851ed..9c1092331f1 100644 --- a/pkg/storer/internal/chunkstore/transaction_test.go +++ b/pkg/storer/internal/chunkstore/transaction_test.go @@ -8,14 +8,14 @@ import ( "context" "testing" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - "github.com/ethersphere/bee/pkg/sharky" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/leveldbstore" - "github.com/ethersphere/bee/pkg/storage/storagetest" - chunktest "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstore" - "github.com/ethersphere/bee/pkg/swarm" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + "github.com/ethersphere/bee/v2/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/leveldbstore" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" + chunktest "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/spf13/afero" ) diff --git a/pkg/storer/internal/events/subscribe_test.go b/pkg/storer/internal/events/subscribe_test.go index a2fb3088924..3e99494cd06 100644 --- a/pkg/storer/internal/events/subscribe_test.go +++ b/pkg/storer/internal/events/subscribe_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/storer/internal/events" + "github.com/ethersphere/bee/v2/pkg/storer/internal/events" ) func TestSubscriber(t *testing.T) { diff --git a/pkg/storer/internal/internal.go b/pkg/storer/internal/internal.go index 0433ad7a1c5..104d0a07fdd 100644 --- a/pkg/storer/internal/internal.go +++ b/pkg/storer/internal/internal.go @@ -9,10 +9,10 @@ import ( "context" "errors" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // Storage groups the storage.Store and storage.ChunkStore interfaces. diff --git a/pkg/storer/internal/pinning/export_test.go b/pkg/storer/internal/pinning/export_test.go index 79e5864dfba..ecce9d1b597 100644 --- a/pkg/storer/internal/pinning/export_test.go +++ b/pkg/storer/internal/pinning/export_test.go @@ -7,8 +7,8 @@ package pinstore import ( "fmt" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type ( diff --git a/pkg/storer/internal/pinning/pinning.go b/pkg/storer/internal/pinning/pinning.go index 8fb25ba92ad..de33f9ffd93 100644 --- a/pkg/storer/internal/pinning/pinning.go +++ b/pkg/storer/internal/pinning/pinning.go @@ -12,11 +12,11 @@ import ( "fmt" "sync" - "github.com/ethersphere/bee/pkg/encryption" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storageutil" - "github.com/ethersphere/bee/pkg/storer/internal" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/encryption" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/google/uuid" ) diff --git a/pkg/storer/internal/pinning/pinning_test.go b/pkg/storer/internal/pinning/pinning_test.go index 017b135f6f8..431d04097be 100644 --- a/pkg/storer/internal/pinning/pinning_test.go +++ b/pkg/storer/internal/pinning/pinning_test.go @@ -11,12 +11,12 @@ import ( "math" "testing" - storage "github.com/ethersphere/bee/pkg/storage" - storagetest "github.com/ethersphere/bee/pkg/storage/storagetest" - chunktest "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer/internal" - pinstore "github.com/ethersphere/bee/pkg/storer/internal/pinning" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + storagetest "github.com/ethersphere/bee/v2/pkg/storage/storagetest" + chunktest "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + pinstore "github.com/ethersphere/bee/v2/pkg/storer/internal/pinning" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type pinningCollection struct { diff --git a/pkg/storer/internal/reserve/items.go b/pkg/storer/internal/reserve/items.go index 0e98dc3bdb9..9380727b6ab 100644 --- a/pkg/storer/internal/reserve/items.go +++ b/pkg/storer/internal/reserve/items.go @@ -9,10 +9,10 @@ import ( "errors" "path" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/soc" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/soc" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/storer/internal/reserve/items_test.go b/pkg/storer/internal/reserve/items_test.go index 5ef0f5424ca..e5750626f9e 100644 --- a/pkg/storer/internal/reserve/items_test.go +++ b/pkg/storer/internal/reserve/items_test.go @@ -8,10 +8,10 @@ import ( "fmt" "testing" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storagetest" - "github.com/ethersphere/bee/pkg/storer/internal/reserve" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" + "github.com/ethersphere/bee/v2/pkg/storer/internal/reserve" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestReserveItems(t *testing.T) { diff --git a/pkg/storer/internal/reserve/reserve.go b/pkg/storer/internal/reserve/reserve.go index 47c843e48b1..c640052609e 100644 --- a/pkg/storer/internal/reserve/reserve.go +++ b/pkg/storer/internal/reserve/reserve.go @@ -14,13 +14,13 @@ import ( "sync/atomic" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storer/internal" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstamp" - "github.com/ethersphere/bee/pkg/storer/internal/stampindex" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstamp" + "github.com/ethersphere/bee/v2/pkg/storer/internal/stampindex" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" ) // loggerName is the tree path name of the logger for this package. diff --git a/pkg/storer/internal/reserve/reserve_test.go b/pkg/storer/internal/reserve/reserve_test.go index 596552ad4dc..56a1ba4ee11 100644 --- a/pkg/storer/internal/reserve/reserve_test.go +++ b/pkg/storer/internal/reserve/reserve_test.go @@ -12,17 +12,17 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - storage "github.com/ethersphere/bee/pkg/storage" - chunk "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer/internal" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstamp" - "github.com/ethersphere/bee/pkg/storer/internal/reserve" - "github.com/ethersphere/bee/pkg/storer/internal/stampindex" - "github.com/ethersphere/bee/pkg/swarm" - kademlia "github.com/ethersphere/bee/pkg/topology/mock" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + storage "github.com/ethersphere/bee/v2/pkg/storage" + chunk "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstamp" + "github.com/ethersphere/bee/v2/pkg/storer/internal/reserve" + "github.com/ethersphere/bee/v2/pkg/storer/internal/stampindex" + "github.com/ethersphere/bee/v2/pkg/swarm" + kademlia "github.com/ethersphere/bee/v2/pkg/topology/mock" ) func noopCacher(_ context.Context, _ internal.Storage, _ ...swarm.Address) error { diff --git a/pkg/storer/internal/stampindex/export_test.go b/pkg/storer/internal/stampindex/export_test.go index 50e75134b7c..b247fc06534 100644 --- a/pkg/storer/internal/stampindex/export_test.go +++ b/pkg/storer/internal/stampindex/export_test.go @@ -4,7 +4,7 @@ package stampindex -import "github.com/ethersphere/bee/pkg/swarm" +import "github.com/ethersphere/bee/v2/pkg/swarm" var ( ErrStampItemMarshalNamespaceInvalid = errStampItemMarshalNamespaceInvalid diff --git a/pkg/storer/internal/stampindex/stampindex.go b/pkg/storer/internal/stampindex/stampindex.go index 596c2af6af0..ff9c5e94318 100644 --- a/pkg/storer/internal/stampindex/stampindex.go +++ b/pkg/storer/internal/stampindex/stampindex.go @@ -9,10 +9,10 @@ import ( "errors" "fmt" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storageutil" - "github.com/ethersphere/bee/pkg/storer/internal" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/storer/internal/stampindex/stampindex_test.go b/pkg/storer/internal/stampindex/stampindex_test.go index c95cdf0b682..b03aa390efb 100644 --- a/pkg/storer/internal/stampindex/stampindex_test.go +++ b/pkg/storer/internal/stampindex/stampindex_test.go @@ -9,12 +9,12 @@ import ( "fmt" "testing" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storagetest" - chunktest "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer/internal" - "github.com/ethersphere/bee/pkg/storer/internal/stampindex" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" + chunktest "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + "github.com/ethersphere/bee/v2/pkg/storer/internal/stampindex" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/storer/internal/upload/uploadstore.go b/pkg/storer/internal/upload/uploadstore.go index 81fed2a8bcb..146995ecd7a 100644 --- a/pkg/storer/internal/upload/uploadstore.go +++ b/pkg/storer/internal/upload/uploadstore.go @@ -12,12 +12,12 @@ import ( "strconv" "time" - "github.com/ethersphere/bee/pkg/encryption" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storageutil" - "github.com/ethersphere/bee/pkg/storer/internal" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstamp" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/encryption" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstamp" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // now returns the current time.Time; used in testing. diff --git a/pkg/storer/internal/upload/uploadstore_test.go b/pkg/storer/internal/upload/uploadstore_test.go index a2f7f931913..f8e46af258f 100644 --- a/pkg/storer/internal/upload/uploadstore_test.go +++ b/pkg/storer/internal/upload/uploadstore_test.go @@ -15,12 +15,12 @@ import ( "testing" "time" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storagetest" - chunktest "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer/internal" - "github.com/ethersphere/bee/pkg/storer/internal/upload" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" + chunktest "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + "github.com/ethersphere/bee/v2/pkg/storer/internal/upload" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" ) diff --git a/pkg/storer/metrics.go b/pkg/storer/metrics.go index e132c4e931e..c416d222783 100644 --- a/pkg/storer/metrics.go +++ b/pkg/storer/metrics.go @@ -9,9 +9,9 @@ import ( "errors" "time" - m "github.com/ethersphere/bee/pkg/metrics" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + m "github.com/ethersphere/bee/v2/pkg/metrics" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/storer/migration/all_steps.go b/pkg/storer/migration/all_steps.go index 69aa419747f..ea222c81181 100644 --- a/pkg/storer/migration/all_steps.go +++ b/pkg/storer/migration/all_steps.go @@ -5,9 +5,9 @@ package migration import ( - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/migration" - "github.com/ethersphere/bee/pkg/storer/internal/reserve" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/migration" + "github.com/ethersphere/bee/v2/pkg/storer/internal/reserve" ) // AfterInitSteps lists all migration steps for localstore IndexStore after the localstore is intiated. diff --git a/pkg/storer/migration/all_steps_test.go b/pkg/storer/migration/all_steps_test.go index 10a6fbce752..94e70fb251f 100644 --- a/pkg/storer/migration/all_steps_test.go +++ b/pkg/storer/migration/all_steps_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - "github.com/ethersphere/bee/pkg/storage/migration" - localmigration "github.com/ethersphere/bee/pkg/storer/migration" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + "github.com/ethersphere/bee/v2/pkg/storage/migration" + localmigration "github.com/ethersphere/bee/v2/pkg/storer/migration" ) func TestPreSteps(t *testing.T) { diff --git a/pkg/storer/migration/refCntSize.go b/pkg/storer/migration/refCntSize.go index ccb4552b9a0..d13f5b8c354 100644 --- a/pkg/storer/migration/refCntSize.go +++ b/pkg/storer/migration/refCntSize.go @@ -10,12 +10,12 @@ import ( "errors" "os" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/sharky" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storageutil" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const oldRretrievalIndexItemSize = swarm.HashSize + 8 + sharky.LocationSize + 1 diff --git a/pkg/storer/migration/refCntSize_test.go b/pkg/storer/migration/refCntSize_test.go index a7869d31c31..c3310077ef2 100644 --- a/pkg/storer/migration/refCntSize_test.go +++ b/pkg/storer/migration/refCntSize_test.go @@ -8,11 +8,11 @@ import ( "math/rand" "testing" - "github.com/ethersphere/bee/pkg/sharky" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstore" - localmigration "github.com/ethersphere/bee/pkg/storer/migration" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstore" + localmigration "github.com/ethersphere/bee/v2/pkg/storer/migration" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/stretchr/testify/assert" ) diff --git a/pkg/storer/migration/step_01.go b/pkg/storer/migration/step_01.go index cc0b4fe8544..beaff83537d 100644 --- a/pkg/storer/migration/step_01.go +++ b/pkg/storer/migration/step_01.go @@ -5,7 +5,7 @@ package migration import ( - storage "github.com/ethersphere/bee/pkg/storage" + storage "github.com/ethersphere/bee/v2/pkg/storage" ) // step_01 serves as example for setting up migration step. diff --git a/pkg/storer/migration/step_01_test.go b/pkg/storer/migration/step_01_test.go index 8b89d556745..7e4e6ee5df1 100644 --- a/pkg/storer/migration/step_01_test.go +++ b/pkg/storer/migration/step_01_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - localmigration "github.com/ethersphere/bee/pkg/storer/migration" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + localmigration "github.com/ethersphere/bee/v2/pkg/storer/migration" ) func Test_Step_01(t *testing.T) { diff --git a/pkg/storer/migration/step_02.go b/pkg/storer/migration/step_02.go index 2da6963a35f..b60ce42cc43 100644 --- a/pkg/storer/migration/step_02.go +++ b/pkg/storer/migration/step_02.go @@ -7,9 +7,9 @@ package migration import ( "time" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storer/internal/cache" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storer/internal/cache" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // step_02 migrates the cache to the new format. diff --git a/pkg/storer/migration/step_02_test.go b/pkg/storer/migration/step_02_test.go index 85180ce134b..6275790093e 100644 --- a/pkg/storer/migration/step_02_test.go +++ b/pkg/storer/migration/step_02_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/assert" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - "github.com/ethersphere/bee/pkg/storer/internal/cache" - localmigration "github.com/ethersphere/bee/pkg/storer/migration" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + "github.com/ethersphere/bee/v2/pkg/storer/internal/cache" + localmigration "github.com/ethersphere/bee/v2/pkg/storer/migration" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type testEntry struct { diff --git a/pkg/storer/migration/step_03.go b/pkg/storer/migration/step_03.go index 8f52ba11547..317f4290aea 100644 --- a/pkg/storer/migration/step_03.go +++ b/pkg/storer/migration/step_03.go @@ -9,10 +9,10 @@ import ( "errors" "os" - "github.com/ethersphere/bee/pkg/log" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storer/internal/reserve" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storer/internal/reserve" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // step_03 is a migration step that removes all BinItem entries and migrates diff --git a/pkg/storer/migration/step_03_test.go b/pkg/storer/migration/step_03_test.go index 180cc16aa10..4df69dec6c7 100644 --- a/pkg/storer/migration/step_03_test.go +++ b/pkg/storer/migration/step_03_test.go @@ -9,13 +9,13 @@ import ( "errors" "testing" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - chunktest "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer/internal/reserve" - localmigration "github.com/ethersphere/bee/pkg/storer/migration" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + chunktest "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer/internal/reserve" + localmigration "github.com/ethersphere/bee/v2/pkg/storer/migration" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/stretchr/testify/assert" ) diff --git a/pkg/storer/migration/step_04.go b/pkg/storer/migration/step_04.go index e621ae3458a..fa316f8393b 100644 --- a/pkg/storer/migration/step_04.go +++ b/pkg/storer/migration/step_04.go @@ -8,11 +8,11 @@ import ( "context" "os" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/sharky" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // step_04 is the fourth step of the migration. It forces a sharky recovery to diff --git a/pkg/storer/migration/step_04_test.go b/pkg/storer/migration/step_04_test.go index 6b70d69d5e7..ec3f4cb87e8 100644 --- a/pkg/storer/migration/step_04_test.go +++ b/pkg/storer/migration/step_04_test.go @@ -11,12 +11,12 @@ import ( "path/filepath" "testing" - "github.com/ethersphere/bee/pkg/sharky" - "github.com/ethersphere/bee/pkg/storage/inmemstore" - chunktest "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstore" - localmigration "github.com/ethersphere/bee/pkg/storer/migration" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/storage/inmemstore" + chunktest "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstore" + localmigration "github.com/ethersphere/bee/v2/pkg/storer/migration" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/stretchr/testify/assert" ) diff --git a/pkg/storer/migration/step_05.go b/pkg/storer/migration/step_05.go index f9aa75b2b00..0061920fb6c 100644 --- a/pkg/storer/migration/step_05.go +++ b/pkg/storer/migration/step_05.go @@ -8,9 +8,9 @@ import ( "fmt" "os" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storer/internal/upload" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storer/internal/upload" ) // step_05 is a migration step that removes all upload items from the store. diff --git a/pkg/storer/migration/step_05_test.go b/pkg/storer/migration/step_05_test.go index cc7a88214a8..e363c0b71b2 100644 --- a/pkg/storer/migration/step_05_test.go +++ b/pkg/storer/migration/step_05_test.go @@ -8,17 +8,17 @@ import ( "context" "testing" - "github.com/ethersphere/bee/pkg/node" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/storage" - chunktest "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/storer/internal" - "github.com/ethersphere/bee/pkg/storer/internal/upload" - localmigration "github.com/ethersphere/bee/pkg/storer/migration" - "github.com/ethersphere/bee/pkg/swarm" - kademlia "github.com/ethersphere/bee/pkg/topology/mock" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/node" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/storage" + chunktest "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + "github.com/ethersphere/bee/v2/pkg/storer/internal/upload" + localmigration "github.com/ethersphere/bee/v2/pkg/storer/migration" + "github.com/ethersphere/bee/v2/pkg/swarm" + kademlia "github.com/ethersphere/bee/v2/pkg/topology/mock" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) func Test_Step_05(t *testing.T) { diff --git a/pkg/storer/mock/forgetting.go b/pkg/storer/mock/forgetting.go index 5588b5c263e..e91560c60fb 100644 --- a/pkg/storer/mock/forgetting.go +++ b/pkg/storer/mock/forgetting.go @@ -10,8 +10,8 @@ import ( "sync/atomic" "time" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type DelayedStore struct { diff --git a/pkg/storer/mock/mockreserve.go b/pkg/storer/mock/mockreserve.go index d6d70390242..7cd3cb8fd6a 100644 --- a/pkg/storer/mock/mockreserve.go +++ b/pkg/storer/mock/mockreserve.go @@ -9,9 +9,9 @@ import ( "math/big" "sync" - storage "github.com/ethersphere/bee/pkg/storage" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type chunksResponse struct { diff --git a/pkg/storer/mock/mockstorer.go b/pkg/storer/mock/mockstorer.go index fa08445d0ec..083b1c5a95b 100644 --- a/pkg/storer/mock/mockstorer.go +++ b/pkg/storer/mock/mockstorer.go @@ -9,12 +9,12 @@ import ( "sync" "time" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - "github.com/ethersphere/bee/pkg/pusher" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + "github.com/ethersphere/bee/v2/pkg/pusher" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" "go.uber.org/atomic" ) diff --git a/pkg/storer/mock/mockstorer_test.go b/pkg/storer/mock/mockstorer_test.go index 40f08a4d852..6fbee300c24 100644 --- a/pkg/storer/mock/mockstorer_test.go +++ b/pkg/storer/mock/mockstorer_test.go @@ -12,11 +12,11 @@ import ( "testing" "time" - storage "github.com/ethersphere/bee/pkg/storage" - chunktesting "github.com/ethersphere/bee/pkg/storage/testing" - storer "github.com/ethersphere/bee/pkg/storer" - mockstorer "github.com/ethersphere/bee/pkg/storer/mock" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + chunktesting "github.com/ethersphere/bee/v2/pkg/storage/testing" + storer "github.com/ethersphere/bee/v2/pkg/storer" + mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/storer/netstore.go b/pkg/storer/netstore.go index 3d5a0c01057..1b13ef5908e 100644 --- a/pkg/storer/netstore.go +++ b/pkg/storer/netstore.go @@ -8,10 +8,10 @@ import ( "context" "errors" - "github.com/ethersphere/bee/pkg/pusher" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/pusher" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" "github.com/opentracing/opentracing-go/ext" olog "github.com/opentracing/opentracing-go/log" "golang.org/x/sync/errgroup" diff --git a/pkg/storer/netstore_test.go b/pkg/storer/netstore_test.go index b15cd2cfed8..3feac383898 100644 --- a/pkg/storer/netstore_test.go +++ b/pkg/storer/netstore_test.go @@ -11,12 +11,12 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/pusher" - "github.com/ethersphere/bee/pkg/retrieval" - storage "github.com/ethersphere/bee/pkg/storage" - chunktesting "github.com/ethersphere/bee/pkg/storage/testing" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/pusher" + "github.com/ethersphere/bee/v2/pkg/retrieval" + storage "github.com/ethersphere/bee/v2/pkg/storage" + chunktesting "github.com/ethersphere/bee/v2/pkg/storage/testing" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type testRetrieval struct { diff --git a/pkg/storer/pinstore.go b/pkg/storer/pinstore.go index 58cc2ef2cc2..dd9cfc3b51d 100644 --- a/pkg/storer/pinstore.go +++ b/pkg/storer/pinstore.go @@ -9,10 +9,10 @@ import ( "fmt" "time" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storer/internal" - pinstore "github.com/ethersphere/bee/pkg/storer/internal/pinning" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + pinstore "github.com/ethersphere/bee/v2/pkg/storer/internal/pinning" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // NewCollection is the implementation of the PinStore.NewCollection method. diff --git a/pkg/storer/pinstore_test.go b/pkg/storer/pinstore_test.go index 43676f6ce61..4719f4baaf5 100644 --- a/pkg/storer/pinstore_test.go +++ b/pkg/storer/pinstore_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - storage "github.com/ethersphere/bee/pkg/storage" - chunktesting "github.com/ethersphere/bee/pkg/storage/testing" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + chunktesting "github.com/ethersphere/bee/v2/pkg/storage/testing" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func testPinStore(t *testing.T, newStorer func() (*storer.DB, error)) { diff --git a/pkg/storer/recover.go b/pkg/storer/recover.go index 7fa48ec2112..a6500ea7828 100644 --- a/pkg/storer/recover.go +++ b/pkg/storer/recover.go @@ -12,10 +12,10 @@ import ( "path/filepath" "time" - "github.com/ethersphere/bee/pkg/sharky" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstore" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/sharky" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const ( diff --git a/pkg/storer/reserve.go b/pkg/storer/reserve.go index 56bd12bf80f..589a0f853a1 100644 --- a/pkg/storer/reserve.go +++ b/pkg/storer/reserve.go @@ -14,12 +14,12 @@ import ( "sync/atomic" "time" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storageutil" - "github.com/ethersphere/bee/pkg/storer/internal" - "github.com/ethersphere/bee/pkg/storer/internal/reserve" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storageutil" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + "github.com/ethersphere/bee/v2/pkg/storer/internal/reserve" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const ( diff --git a/pkg/storer/reserve_test.go b/pkg/storer/reserve_test.go index aa5f79a6737..9537f230c49 100644 --- a/pkg/storer/reserve_test.go +++ b/pkg/storer/reserve_test.go @@ -12,19 +12,19 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/postage" - batchstore "github.com/ethersphere/bee/pkg/postage/batchstore/mock" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - pullerMock "github.com/ethersphere/bee/pkg/puller/mock" - "github.com/ethersphere/bee/pkg/spinlock" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/storagetest" - chunk "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstamp" - "github.com/ethersphere/bee/pkg/storer/internal/reserve" - "github.com/ethersphere/bee/pkg/storer/internal/stampindex" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/postage" + batchstore "github.com/ethersphere/bee/v2/pkg/postage/batchstore/mock" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + pullerMock "github.com/ethersphere/bee/v2/pkg/puller/mock" + "github.com/ethersphere/bee/v2/pkg/spinlock" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/storagetest" + chunk "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstamp" + "github.com/ethersphere/bee/v2/pkg/storer/internal/reserve" + "github.com/ethersphere/bee/v2/pkg/storer/internal/stampindex" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestIndexCollision(t *testing.T) { diff --git a/pkg/storer/sample.go b/pkg/storer/sample.go index 45ba3da129c..d3cb1ecec99 100644 --- a/pkg/storer/sample.go +++ b/pkg/storer/sample.go @@ -16,13 +16,13 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/bmt" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/soc" - chunk "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstamp" - "github.com/ethersphere/bee/pkg/storer/internal/reserve" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/bmt" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/soc" + chunk "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstamp" + "github.com/ethersphere/bee/v2/pkg/storer/internal/reserve" + "github.com/ethersphere/bee/v2/pkg/swarm" "golang.org/x/sync/errgroup" ) diff --git a/pkg/storer/sample_test.go b/pkg/storer/sample_test.go index 215b190fc1a..cf10d59894b 100644 --- a/pkg/storer/sample_test.go +++ b/pkg/storer/sample_test.go @@ -6,15 +6,15 @@ package storer_test import ( "context" - "github.com/ethersphere/bee/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/postage" "math/rand" "testing" "time" - postagetesting "github.com/ethersphere/bee/pkg/postage/testing" - chunk "github.com/ethersphere/bee/pkg/storage/testing" - "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + postagetesting "github.com/ethersphere/bee/v2/pkg/postage/testing" + chunk "github.com/ethersphere/bee/v2/pkg/storage/testing" + "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/storer/storer.go b/pkg/storer/storer.go index 396fbf7cb58..c6987a54554 100644 --- a/pkg/storer/storer.go +++ b/pkg/storer/storer.go @@ -18,27 +18,27 @@ import ( "sync/atomic" "time" - "github.com/ethersphere/bee/pkg/log" - m "github.com/ethersphere/bee/pkg/metrics" - "github.com/ethersphere/bee/pkg/postage" - "github.com/ethersphere/bee/pkg/pusher" - "github.com/ethersphere/bee/pkg/retrieval" - "github.com/ethersphere/bee/pkg/sharky" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/leveldbstore" - "github.com/ethersphere/bee/pkg/storage/migration" - "github.com/ethersphere/bee/pkg/storer/internal" - "github.com/ethersphere/bee/pkg/storer/internal/cache" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstore" - "github.com/ethersphere/bee/pkg/storer/internal/events" - pinstore "github.com/ethersphere/bee/pkg/storer/internal/pinning" - "github.com/ethersphere/bee/pkg/storer/internal/reserve" - "github.com/ethersphere/bee/pkg/storer/internal/upload" - localmigration "github.com/ethersphere/bee/pkg/storer/migration" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/tracing" - "github.com/ethersphere/bee/pkg/util/syncutil" + "github.com/ethersphere/bee/v2/pkg/log" + m "github.com/ethersphere/bee/v2/pkg/metrics" + "github.com/ethersphere/bee/v2/pkg/postage" + "github.com/ethersphere/bee/v2/pkg/pusher" + "github.com/ethersphere/bee/v2/pkg/retrieval" + "github.com/ethersphere/bee/v2/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/leveldbstore" + "github.com/ethersphere/bee/v2/pkg/storage/migration" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + "github.com/ethersphere/bee/v2/pkg/storer/internal/cache" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstore" + "github.com/ethersphere/bee/v2/pkg/storer/internal/events" + pinstore "github.com/ethersphere/bee/v2/pkg/storer/internal/pinning" + "github.com/ethersphere/bee/v2/pkg/storer/internal/reserve" + "github.com/ethersphere/bee/v2/pkg/storer/internal/upload" + localmigration "github.com/ethersphere/bee/v2/pkg/storer/migration" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/util/syncutil" "github.com/prometheus/client_golang/prometheus" "github.com/spf13/afero" "github.com/syndtr/goleveldb/leveldb" diff --git a/pkg/storer/storer_test.go b/pkg/storer/storer_test.go index ce2d7eb72cf..43ea78d889e 100644 --- a/pkg/storer/storer_test.go +++ b/pkg/storer/storer_test.go @@ -11,20 +11,20 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/postage" - batchstore "github.com/ethersphere/bee/pkg/postage/batchstore/mock" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/storage/migration" - "github.com/ethersphere/bee/pkg/storer" - cs "github.com/ethersphere/bee/pkg/storer/internal/chunkstore" - pinstore "github.com/ethersphere/bee/pkg/storer/internal/pinning" - "github.com/ethersphere/bee/pkg/storer/internal/upload" - localmigration "github.com/ethersphere/bee/pkg/storer/migration" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - kademlia "github.com/ethersphere/bee/pkg/topology/mock" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/postage" + batchstore "github.com/ethersphere/bee/v2/pkg/postage/batchstore/mock" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/storage/migration" + "github.com/ethersphere/bee/v2/pkg/storer" + cs "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstore" + pinstore "github.com/ethersphere/bee/v2/pkg/storer/internal/pinning" + "github.com/ethersphere/bee/v2/pkg/storer/internal/upload" + localmigration "github.com/ethersphere/bee/v2/pkg/storer/migration" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + kademlia "github.com/ethersphere/bee/v2/pkg/topology/mock" ) func verifyChunks( diff --git a/pkg/storer/subscribe_push.go b/pkg/storer/subscribe_push.go index d9c37abce28..a82c0db46db 100644 --- a/pkg/storer/subscribe_push.go +++ b/pkg/storer/subscribe_push.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/storer/internal/upload" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/storer/internal/upload" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const subscribePushEventKey = "subscribe-push" diff --git a/pkg/storer/subscribe_push_test.go b/pkg/storer/subscribe_push_test.go index 851dd060580..17d7c46e486 100644 --- a/pkg/storer/subscribe_push_test.go +++ b/pkg/storer/subscribe_push_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - chunktesting "github.com/ethersphere/bee/pkg/storage/testing" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + chunktesting "github.com/ethersphere/bee/v2/pkg/storage/testing" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestPushSubscriber(t *testing.T) { diff --git a/pkg/storer/uploadstore.go b/pkg/storer/uploadstore.go index 9b5aeca4bbc..d3596dbede0 100644 --- a/pkg/storer/uploadstore.go +++ b/pkg/storer/uploadstore.go @@ -10,11 +10,11 @@ import ( "fmt" "sort" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storer/internal" - pinstore "github.com/ethersphere/bee/pkg/storer/internal/pinning" - "github.com/ethersphere/bee/pkg/storer/internal/upload" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storer/internal" + pinstore "github.com/ethersphere/bee/v2/pkg/storer/internal/pinning" + "github.com/ethersphere/bee/v2/pkg/storer/internal/upload" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const uploadStoreKey = "uploadstore" diff --git a/pkg/storer/uploadstore_test.go b/pkg/storer/uploadstore_test.go index fa267728e6e..04b1016027a 100644 --- a/pkg/storer/uploadstore_test.go +++ b/pkg/storer/uploadstore_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - storage "github.com/ethersphere/bee/pkg/storage" - chunktesting "github.com/ethersphere/bee/pkg/storage/testing" - storer "github.com/ethersphere/bee/pkg/storer" - "github.com/ethersphere/bee/pkg/swarm" + storage "github.com/ethersphere/bee/v2/pkg/storage" + chunktesting "github.com/ethersphere/bee/v2/pkg/storage/testing" + storer "github.com/ethersphere/bee/v2/pkg/storer" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/storer/validate.go b/pkg/storer/validate.go index 140d1b4d26a..894f12a0651 100644 --- a/pkg/storer/validate.go +++ b/pkg/storer/validate.go @@ -14,14 +14,14 @@ import ( "sync/atomic" - "github.com/ethersphere/bee/pkg/cac" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/sharky" - "github.com/ethersphere/bee/pkg/soc" - "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storer/internal/chunkstore" - pinstore "github.com/ethersphere/bee/pkg/storer/internal/pinning" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/cac" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/sharky" + "github.com/ethersphere/bee/v2/pkg/soc" + "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storer/internal/chunkstore" + pinstore "github.com/ethersphere/bee/v2/pkg/storer/internal/pinning" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // Validate ensures that all retrievalIndex chunks are correctly stored in sharky. diff --git a/pkg/swarm/distance_test.go b/pkg/swarm/distance_test.go index f06641a0ed2..0adf2430919 100644 --- a/pkg/swarm/distance_test.go +++ b/pkg/swarm/distance_test.go @@ -7,7 +7,7 @@ package swarm_test import ( "testing" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type distanceTest struct { diff --git a/pkg/swarm/hasher_test.go b/pkg/swarm/hasher_test.go index 3811e09605a..f08e2f28f42 100644 --- a/pkg/swarm/hasher_test.go +++ b/pkg/swarm/hasher_test.go @@ -8,7 +8,7 @@ import ( "bytes" "testing" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestNewHasher(t *testing.T) { diff --git a/pkg/swarm/swarm_test.go b/pkg/swarm/swarm_test.go index 7555ac5bf4d..fdde62625be 100644 --- a/pkg/swarm/swarm_test.go +++ b/pkg/swarm/swarm_test.go @@ -10,7 +10,7 @@ import ( "errors" "testing" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func TestAddress(t *testing.T) { diff --git a/pkg/swarm/test_helpers.go b/pkg/swarm/test_helpers.go index e3d6cb27ac9..b043e1bb17d 100644 --- a/pkg/swarm/test_helpers.go +++ b/pkg/swarm/test_helpers.go @@ -8,7 +8,7 @@ import ( "math/rand" "testing" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) // RandAddress generates a random address. diff --git a/pkg/swarm/test_helpers_test.go b/pkg/swarm/test_helpers_test.go index e7c21e9e633..a4184dfedc2 100644 --- a/pkg/swarm/test_helpers_test.go +++ b/pkg/swarm/test_helpers_test.go @@ -8,7 +8,7 @@ import ( "encoding/binary" "testing" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func Test_RandAddress(t *testing.T) { diff --git a/pkg/swarm/utilities_test.go b/pkg/swarm/utilities_test.go index 17ade1aaa28..6cd75a89a32 100644 --- a/pkg/swarm/utilities_test.go +++ b/pkg/swarm/utilities_test.go @@ -7,7 +7,7 @@ package swarm_test import ( "testing" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func Test_ContainsAddress(t *testing.T) { diff --git a/pkg/topology/kademlia/binprefix.go b/pkg/topology/kademlia/binprefix.go index f9d92ff429e..94e2550ea2d 100644 --- a/pkg/topology/kademlia/binprefix.go +++ b/pkg/topology/kademlia/binprefix.go @@ -8,7 +8,7 @@ import ( "math" "math/bits" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // generateCommonBinPrefixes generates the common bin prefixes diff --git a/pkg/topology/kademlia/export_test.go b/pkg/topology/kademlia/export_test.go index b005dd92c93..96b8b3191fc 100644 --- a/pkg/topology/kademlia/export_test.go +++ b/pkg/topology/kademlia/export_test.go @@ -5,9 +5,9 @@ package kademlia import ( - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/topology/pslice" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/topology/pslice" ) var ( diff --git a/pkg/topology/kademlia/internal/metrics/metrics.go b/pkg/topology/kademlia/internal/metrics/metrics.go index a161b2ec014..d6ce41e3a73 100644 --- a/pkg/topology/kademlia/internal/metrics/metrics.go +++ b/pkg/topology/kademlia/internal/metrics/metrics.go @@ -13,9 +13,9 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/shed" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/shed" + "github.com/ethersphere/bee/v2/pkg/swarm" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/pkg/topology/kademlia/internal/metrics/metrics_test.go b/pkg/topology/kademlia/internal/metrics/metrics_test.go index 3373dc4b7b8..2aae2a68c4e 100644 --- a/pkg/topology/kademlia/internal/metrics/metrics_test.go +++ b/pkg/topology/kademlia/internal/metrics/metrics_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/shed" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology/kademlia/internal/metrics" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/shed" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology/kademlia/internal/metrics" + "github.com/ethersphere/bee/v2/pkg/util/testutil" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/topology/kademlia/internal/waitnext/waitnext.go b/pkg/topology/kademlia/internal/waitnext/waitnext.go index 744622d93b8..9a93f274eba 100644 --- a/pkg/topology/kademlia/internal/waitnext/waitnext.go +++ b/pkg/topology/kademlia/internal/waitnext/waitnext.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type next struct { diff --git a/pkg/topology/kademlia/internal/waitnext/waitnext_test.go b/pkg/topology/kademlia/internal/waitnext/waitnext_test.go index 35f3062bd38..3b67a785f3e 100644 --- a/pkg/topology/kademlia/internal/waitnext/waitnext_test.go +++ b/pkg/topology/kademlia/internal/waitnext/waitnext_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology/kademlia/internal/waitnext" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology/kademlia/internal/waitnext" ) func TestSet(t *testing.T) { diff --git a/pkg/topology/kademlia/kademlia.go b/pkg/topology/kademlia/kademlia.go index 70339c55d7c..5fe6f7f2f4d 100644 --- a/pkg/topology/kademlia/kademlia.go +++ b/pkg/topology/kademlia/kademlia.go @@ -16,16 +16,16 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/addressbook" - "github.com/ethersphere/bee/pkg/discovery" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/shed" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - im "github.com/ethersphere/bee/pkg/topology/kademlia/internal/metrics" - "github.com/ethersphere/bee/pkg/topology/kademlia/internal/waitnext" - "github.com/ethersphere/bee/pkg/topology/pslice" + "github.com/ethersphere/bee/v2/pkg/addressbook" + "github.com/ethersphere/bee/v2/pkg/discovery" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/shed" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + im "github.com/ethersphere/bee/v2/pkg/topology/kademlia/internal/metrics" + "github.com/ethersphere/bee/v2/pkg/topology/kademlia/internal/waitnext" + "github.com/ethersphere/bee/v2/pkg/topology/pslice" ma "github.com/multiformats/go-multiaddr" "golang.org/x/sync/errgroup" ) diff --git a/pkg/topology/kademlia/kademlia_test.go b/pkg/topology/kademlia/kademlia_test.go index 48e0c20ecb7..e3cd6912ebc 100644 --- a/pkg/topology/kademlia/kademlia_test.go +++ b/pkg/topology/kademlia/kademlia_test.go @@ -18,21 +18,21 @@ import ( ma "github.com/multiformats/go-multiaddr" - "github.com/ethersphere/bee/pkg/addressbook" - "github.com/ethersphere/bee/pkg/bzz" - beeCrypto "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/discovery/mock" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - p2pmock "github.com/ethersphere/bee/pkg/p2p/mock" - "github.com/ethersphere/bee/pkg/spinlock" - mockstate "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/topology/kademlia" - im "github.com/ethersphere/bee/pkg/topology/kademlia/internal/metrics" - "github.com/ethersphere/bee/pkg/topology/pslice" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/addressbook" + "github.com/ethersphere/bee/v2/pkg/bzz" + beeCrypto "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/discovery/mock" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + p2pmock "github.com/ethersphere/bee/v2/pkg/p2p/mock" + "github.com/ethersphere/bee/v2/pkg/spinlock" + mockstate "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/topology/kademlia" + im "github.com/ethersphere/bee/v2/pkg/topology/kademlia/internal/metrics" + "github.com/ethersphere/bee/v2/pkg/topology/pslice" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) const spinLockWaitTime = time.Second * 5 diff --git a/pkg/topology/kademlia/metrics.go b/pkg/topology/kademlia/metrics.go index 3640ca7fd54..42e1d6c294a 100644 --- a/pkg/topology/kademlia/metrics.go +++ b/pkg/topology/kademlia/metrics.go @@ -5,7 +5,7 @@ package kademlia import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/topology/kademlia/mock/kademlia.go b/pkg/topology/kademlia/mock/kademlia.go index 23713a129c6..cd115bf7186 100644 --- a/pkg/topology/kademlia/mock/kademlia.go +++ b/pkg/topology/kademlia/mock/kademlia.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" ) type AddrTuple struct { diff --git a/pkg/topology/lightnode/container.go b/pkg/topology/lightnode/container.go index 5f2285a06a4..0e4f6c3967c 100644 --- a/pkg/topology/lightnode/container.go +++ b/pkg/topology/lightnode/container.go @@ -10,10 +10,10 @@ import ( "math/big" "sync" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/topology/pslice" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/topology/pslice" ) type Container struct { diff --git a/pkg/topology/lightnode/container_test.go b/pkg/topology/lightnode/container_test.go index 3533dcc089f..20a7664adc5 100644 --- a/pkg/topology/lightnode/container_test.go +++ b/pkg/topology/lightnode/container_test.go @@ -10,10 +10,10 @@ import ( "reflect" "testing" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" - "github.com/ethersphere/bee/pkg/topology/lightnode" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/topology/lightnode" ) func TestContainer(t *testing.T) { diff --git a/pkg/topology/lightnode/metrics.go b/pkg/topology/lightnode/metrics.go index f6c6ff2bbc1..cea1504f8a9 100644 --- a/pkg/topology/lightnode/metrics.go +++ b/pkg/topology/lightnode/metrics.go @@ -5,7 +5,7 @@ package lightnode import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/topology/mock/mock.go b/pkg/topology/mock/mock.go index f052045920b..f545bfee858 100644 --- a/pkg/topology/mock/mock.go +++ b/pkg/topology/mock/mock.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" ) type mock struct { diff --git a/pkg/topology/pslice/pslice.go b/pkg/topology/pslice/pslice.go index 0337fa0125d..ca1b8e5c4c3 100644 --- a/pkg/topology/pslice/pslice.go +++ b/pkg/topology/pslice/pslice.go @@ -7,8 +7,8 @@ package pslice import ( "sync" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/topology" ) // PSlice maintains a list of addresses, indexing them by their different proximity orders. diff --git a/pkg/topology/pslice/pslice_test.go b/pkg/topology/pslice/pslice_test.go index 37e454871ce..9bcdf1312e2 100644 --- a/pkg/topology/pslice/pslice_test.go +++ b/pkg/topology/pslice/pslice_test.go @@ -9,9 +9,9 @@ import ( "sort" "testing" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" - "github.com/ethersphere/bee/pkg/topology/pslice" + "github.com/ethersphere/bee/v2/pkg/topology/pslice" ) // TestShallowestEmpty tests that ShallowestEmpty functionality works correctly. diff --git a/pkg/topology/topology.go b/pkg/topology/topology.go index ebc7bcf8670..63747a912c6 100644 --- a/pkg/topology/topology.go +++ b/pkg/topology/topology.go @@ -11,8 +11,8 @@ import ( "io" "time" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/swarm" ) var ( diff --git a/pkg/tracing/tracing.go b/pkg/tracing/tracing.go index 14ccdb9ab43..e9c563464fa 100644 --- a/pkg/tracing/tracing.go +++ b/pkg/tracing/tracing.go @@ -13,8 +13,8 @@ import ( "net/http" "time" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" "github.com/opentracing/opentracing-go" "github.com/uber/jaeger-client-go" "github.com/uber/jaeger-client-go/config" diff --git a/pkg/tracing/tracing_test.go b/pkg/tracing/tracing_test.go index 8a2f871dc45..9c0baa2f685 100644 --- a/pkg/tracing/tracing_test.go +++ b/pkg/tracing/tracing_test.go @@ -11,10 +11,10 @@ import ( "fmt" "testing" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/p2p" - "github.com/ethersphere/bee/pkg/tracing" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/p2p" + "github.com/ethersphere/bee/v2/pkg/tracing" + "github.com/ethersphere/bee/v2/pkg/util/testutil" "github.com/uber/jaeger-client-go" ) diff --git a/pkg/transaction/backend.go b/pkg/transaction/backend.go index df479d55829..be1f958b317 100644 --- a/pkg/transaction/backend.go +++ b/pkg/transaction/backend.go @@ -13,7 +13,7 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/log" + "github.com/ethersphere/bee/v2/pkg/log" ) // Backend is the minimum of blockchain backend functions we need. diff --git a/pkg/transaction/backend_test.go b/pkg/transaction/backend_test.go index 8ca76fec823..d9d09e55b3c 100644 --- a/pkg/transaction/backend_test.go +++ b/pkg/transaction/backend_test.go @@ -12,8 +12,8 @@ import ( "time" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/transaction/backendmock" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/transaction/backendmock" ) func TestIsSynced(t *testing.T) { diff --git a/pkg/transaction/backendmock/backend.go b/pkg/transaction/backendmock/backend.go index 7f787fe3d60..3a78f325c0c 100644 --- a/pkg/transaction/backendmock/backend.go +++ b/pkg/transaction/backendmock/backend.go @@ -12,7 +12,7 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/transaction" ) type backendMock struct { diff --git a/pkg/transaction/backendsimulation/backend.go b/pkg/transaction/backendsimulation/backend.go index 2b3a3946864..57965abe7ea 100644 --- a/pkg/transaction/backendsimulation/backend.go +++ b/pkg/transaction/backendsimulation/backend.go @@ -12,7 +12,7 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/transaction" ) type AccountAtKey struct { diff --git a/pkg/transaction/event_test.go b/pkg/transaction/event_test.go index 4d6dd47193e..e286796d248 100644 --- a/pkg/transaction/event_test.go +++ b/pkg/transaction/event_test.go @@ -11,8 +11,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/util/abiutil" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" "github.com/ethersphere/go-sw3-abi/sw3abi" ) diff --git a/pkg/transaction/mock/transaction.go b/pkg/transaction/mock/transaction.go index 7478daa63e6..d987fd52249 100644 --- a/pkg/transaction/mock/transaction.go +++ b/pkg/transaction/mock/transaction.go @@ -14,7 +14,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/transaction" ) type transactionServiceMock struct { diff --git a/pkg/transaction/monitor.go b/pkg/transaction/monitor.go index 64d58be7c5c..f4ebcd3be92 100644 --- a/pkg/transaction/monitor.go +++ b/pkg/transaction/monitor.go @@ -15,7 +15,7 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/log" + "github.com/ethersphere/bee/v2/pkg/log" ) var ErrTransactionCancelled = errors.New("transaction cancelled") diff --git a/pkg/transaction/monitor_test.go b/pkg/transaction/monitor_test.go index 5887848ac2c..7b88e84629f 100644 --- a/pkg/transaction/monitor_test.go +++ b/pkg/transaction/monitor_test.go @@ -11,9 +11,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/transaction/backendsimulation" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/transaction/backendsimulation" ) func TestMonitorWatchTransaction(t *testing.T) { diff --git a/pkg/transaction/monitormock/monitor.go b/pkg/transaction/monitormock/monitor.go index a0334469873..1662751aa74 100644 --- a/pkg/transaction/monitormock/monitor.go +++ b/pkg/transaction/monitormock/monitor.go @@ -11,7 +11,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/transaction" ) type transactionMonitorMock struct { diff --git a/pkg/transaction/transaction.go b/pkg/transaction/transaction.go index 592af68a566..2774aad95af 100644 --- a/pkg/transaction/transaction.go +++ b/pkg/transaction/transaction.go @@ -19,10 +19,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rpc" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/sctx" - "github.com/ethersphere/bee/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/sctx" + "github.com/ethersphere/bee/v2/pkg/storage" "golang.org/x/net/context" ) diff --git a/pkg/transaction/transaction_test.go b/pkg/transaction/transaction_test.go index 0bc8be4f361..41cf94f0112 100644 --- a/pkg/transaction/transaction_test.go +++ b/pkg/transaction/transaction_test.go @@ -18,16 +18,16 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rpc" - "github.com/ethersphere/bee/pkg/crypto" - signermock "github.com/ethersphere/bee/pkg/crypto/mock" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/sctx" - storemock "github.com/ethersphere/bee/pkg/statestore/mock" - "github.com/ethersphere/bee/pkg/transaction" - "github.com/ethersphere/bee/pkg/transaction/backendmock" - "github.com/ethersphere/bee/pkg/transaction/monitormock" - "github.com/ethersphere/bee/pkg/util/abiutil" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/crypto" + signermock "github.com/ethersphere/bee/v2/pkg/crypto/mock" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/sctx" + storemock "github.com/ethersphere/bee/v2/pkg/statestore/mock" + "github.com/ethersphere/bee/v2/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/transaction/backendmock" + "github.com/ethersphere/bee/v2/pkg/transaction/monitormock" + "github.com/ethersphere/bee/v2/pkg/util/abiutil" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) func nonceKey(sender common.Address) string { diff --git a/pkg/transaction/wrapped/metrics.go b/pkg/transaction/wrapped/metrics.go index bc555032fdf..eeb255c3d3b 100644 --- a/pkg/transaction/wrapped/metrics.go +++ b/pkg/transaction/wrapped/metrics.go @@ -5,7 +5,7 @@ package wrapped import ( - m "github.com/ethersphere/bee/pkg/metrics" + m "github.com/ethersphere/bee/v2/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/transaction/wrapped/wrapped.go b/pkg/transaction/wrapped/wrapped.go index 24d8e3d5a0c..f810ee2ebab 100644 --- a/pkg/transaction/wrapped/wrapped.go +++ b/pkg/transaction/wrapped/wrapped.go @@ -12,7 +12,7 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethersphere/bee/pkg/transaction" + "github.com/ethersphere/bee/v2/pkg/transaction" ) var ( diff --git a/pkg/traversal/traversal.go b/pkg/traversal/traversal.go index dbdb5603e82..98029f925d9 100644 --- a/pkg/traversal/traversal.go +++ b/pkg/traversal/traversal.go @@ -13,13 +13,13 @@ import ( "errors" "fmt" - "github.com/ethersphere/bee/pkg/file/joiner" - "github.com/ethersphere/bee/pkg/file/loadsave" - "github.com/ethersphere/bee/pkg/manifest" - "github.com/ethersphere/bee/pkg/manifest/mantaray" - "github.com/ethersphere/bee/pkg/soc" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/file/joiner" + "github.com/ethersphere/bee/v2/pkg/file/loadsave" + "github.com/ethersphere/bee/v2/pkg/manifest" + "github.com/ethersphere/bee/v2/pkg/manifest/mantaray" + "github.com/ethersphere/bee/v2/pkg/soc" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/swarm" ) // Traverser represents service which traverse through address dependent chunks. diff --git a/pkg/traversal/traversal_test.go b/pkg/traversal/traversal_test.go index 7d9d473e1e4..04f0068c6de 100644 --- a/pkg/traversal/traversal_test.go +++ b/pkg/traversal/traversal_test.go @@ -14,15 +14,15 @@ import ( "testing" "time" - "github.com/ethersphere/bee/pkg/file/loadsave" - "github.com/ethersphere/bee/pkg/file/pipeline" - "github.com/ethersphere/bee/pkg/file/pipeline/builder" - "github.com/ethersphere/bee/pkg/manifest" - testingsoc "github.com/ethersphere/bee/pkg/soc/testing" - storage "github.com/ethersphere/bee/pkg/storage" - "github.com/ethersphere/bee/pkg/storage/inmemchunkstore" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/traversal" + "github.com/ethersphere/bee/v2/pkg/file/loadsave" + "github.com/ethersphere/bee/v2/pkg/file/pipeline" + "github.com/ethersphere/bee/v2/pkg/file/pipeline/builder" + "github.com/ethersphere/bee/v2/pkg/manifest" + testingsoc "github.com/ethersphere/bee/v2/pkg/soc/testing" + storage "github.com/ethersphere/bee/v2/pkg/storage" + "github.com/ethersphere/bee/v2/pkg/storage/inmemchunkstore" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/traversal" ) const ( diff --git a/pkg/util/nbhdutil/miner.go b/pkg/util/nbhdutil/miner.go index 4d6f38a6f1d..83a51a8eeb7 100644 --- a/pkg/util/nbhdutil/miner.go +++ b/pkg/util/nbhdutil/miner.go @@ -10,8 +10,8 @@ import ( "encoding/binary" "fmt" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/swarm" ) func MineOverlay(ctx context.Context, p ecdsa.PublicKey, networkID uint64, targetNeighborhood string) (swarm.Address, []byte, error) { diff --git a/pkg/util/nbhdutil/miner_test.go b/pkg/util/nbhdutil/miner_test.go index 2b630af3c19..bcf72128bb9 100644 --- a/pkg/util/nbhdutil/miner_test.go +++ b/pkg/util/nbhdutil/miner_test.go @@ -9,9 +9,9 @@ import ( "math/rand" "testing" - "github.com/ethersphere/bee/pkg/crypto" - "github.com/ethersphere/bee/pkg/swarm" - "github.com/ethersphere/bee/pkg/util/nbhdutil" + "github.com/ethersphere/bee/v2/pkg/crypto" + "github.com/ethersphere/bee/v2/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/util/nbhdutil" ) func TestMiner(t *testing.T) { diff --git a/pkg/util/nbhdutil/neighborhoodsuggestion.go b/pkg/util/nbhdutil/neighborhoodsuggestion.go index 713f0345055..699bc37505b 100644 --- a/pkg/util/nbhdutil/neighborhoodsuggestion.go +++ b/pkg/util/nbhdutil/neighborhoodsuggestion.go @@ -11,7 +11,7 @@ import ( "net/http" "net/url" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) type httpClient interface { diff --git a/pkg/util/nbhdutil/neighborhoodsuggestion_test.go b/pkg/util/nbhdutil/neighborhoodsuggestion_test.go index 27c9b59d800..cf477800882 100644 --- a/pkg/util/nbhdutil/neighborhoodsuggestion_test.go +++ b/pkg/util/nbhdutil/neighborhoodsuggestion_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/ethersphere/bee/pkg/util/nbhdutil" + "github.com/ethersphere/bee/v2/pkg/util/nbhdutil" ) type mockHttpClient struct { diff --git a/pkg/util/testutil/helpers.go b/pkg/util/testutil/helpers.go index da9488e0987..1726e33d020 100644 --- a/pkg/util/testutil/helpers.go +++ b/pkg/util/testutil/helpers.go @@ -11,8 +11,8 @@ import ( "reflect" "testing" - "github.com/ethersphere/bee/pkg/log" - "github.com/ethersphere/bee/pkg/util/ioutil" + "github.com/ethersphere/bee/v2/pkg/log" + "github.com/ethersphere/bee/v2/pkg/util/ioutil" ) // RandBytes returns bytes slice of specified size filled with random values. diff --git a/pkg/util/testutil/helpers_test.go b/pkg/util/testutil/helpers_test.go index d74c8ad4bca..7ad37a272f9 100644 --- a/pkg/util/testutil/helpers_test.go +++ b/pkg/util/testutil/helpers_test.go @@ -8,7 +8,7 @@ import ( "bytes" "testing" - "github.com/ethersphere/bee/pkg/util/testutil" + "github.com/ethersphere/bee/v2/pkg/util/testutil" ) func TestRandBytes(t *testing.T) { diff --git a/pkg/util/testutil/pseudorand/reader.go b/pkg/util/testutil/pseudorand/reader.go index d7fcf0c3646..bccb8900d7e 100644 --- a/pkg/util/testutil/pseudorand/reader.go +++ b/pkg/util/testutil/pseudorand/reader.go @@ -16,7 +16,7 @@ import ( "fmt" "io" - "github.com/ethersphere/bee/pkg/swarm" + "github.com/ethersphere/bee/v2/pkg/swarm" ) const bufSize = 4096 diff --git a/pkg/util/testutil/pseudorand/reader_test.go b/pkg/util/testutil/pseudorand/reader_test.go index 4ec85a90d73..2abd6aaf382 100644 --- a/pkg/util/testutil/pseudorand/reader_test.go +++ b/pkg/util/testutil/pseudorand/reader_test.go @@ -12,7 +12,7 @@ import ( "math/rand" "testing" - "github.com/ethersphere/bee/pkg/util/testutil/pseudorand" + "github.com/ethersphere/bee/v2/pkg/util/testutil/pseudorand" ) func TestReader(t *testing.T) {