diff --git a/cmd/swarm-snapshot/create.go b/cmd/swarm-snapshot/create.go index db932b0cf8..9de082ac53 100644 --- a/cmd/swarm-snapshot/create.go +++ b/cmd/swarm-snapshot/create.go @@ -31,8 +31,8 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethersphere/swarm/network" "github.com/ethersphere/swarm/network/simulation" cli "gopkg.in/urfave/cli.v1" diff --git a/cmd/swarm-snapshot/create_test.go b/cmd/swarm-snapshot/create_test.go index 384219df79..7ab19092e3 100644 --- a/cmd/swarm-snapshot/create_test.go +++ b/cmd/swarm-snapshot/create_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations" ) // TestSnapshotCreate is a high level e2e test that tests for snapshot generation. diff --git a/network/networkid_test.go b/network/networkid_test.go index 614092f634..b8c4265de9 100644 --- a/network/networkid_test.go +++ b/network/networkid_test.go @@ -29,8 +29,8 @@ import ( "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethereum/go-ethereum/rpc" "github.com/ethersphere/swarm/testutil" ) diff --git a/network/retrieval/retrieve_test.go b/network/retrieval/retrieve_test.go index d8772a58a0..bb87be2c01 100644 --- a/network/retrieval/retrieve_test.go +++ b/network/retrieval/retrieve_test.go @@ -36,7 +36,7 @@ import ( "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethersphere/swarm/chunk" "github.com/ethersphere/swarm/network" "github.com/ethersphere/swarm/network/simulation" diff --git a/network/simulation/bucket_test.go b/network/simulation/bucket_test.go index 16df52e651..83bf173e24 100644 --- a/network/simulation/bucket_test.go +++ b/network/simulation/bucket_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" ) // TestServiceBucket tests all bucket functionality using subtests. diff --git a/network/simulation/events.go b/network/simulation/events.go index d73c3af4ee..075304c3c8 100644 --- a/network/simulation/events.go +++ b/network/simulation/events.go @@ -21,7 +21,7 @@ import ( "sync" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations" ) // PeerEvent is the type of the channel returned by Simulation.PeerEvents. diff --git a/network/simulation/example_test.go b/network/simulation/example_test.go index e97a20c505..6a14273717 100644 --- a/network/simulation/example_test.go +++ b/network/simulation/example_test.go @@ -24,7 +24,7 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethersphere/swarm/network" "github.com/ethersphere/swarm/network/simulation" ) diff --git a/network/simulation/http.go b/network/simulation/http.go index 69ae3baec2..47b9026ebc 100644 --- a/network/simulation/http.go +++ b/network/simulation/http.go @@ -21,7 +21,7 @@ import ( "net/http" "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations" ) // Package defaults. diff --git a/network/simulation/http_test.go b/network/simulation/http_test.go index 7a32da03e6..40e468eb4a 100644 --- a/network/simulation/http_test.go +++ b/network/simulation/http_test.go @@ -26,7 +26,7 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" ) func TestSimulationWithHTTPServer(t *testing.T) { diff --git a/network/simulation/kademlia.go b/network/simulation/kademlia.go index eab1e427ab..eba3078924 100644 --- a/network/simulation/kademlia.go +++ b/network/simulation/kademlia.go @@ -25,7 +25,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations" "github.com/ethersphere/swarm/network" ) diff --git a/network/simulation/kademlia_test.go b/network/simulation/kademlia_test.go index 703a92174b..c68fddd4f5 100644 --- a/network/simulation/kademlia_test.go +++ b/network/simulation/kademlia_test.go @@ -25,7 +25,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethersphere/swarm/network" ) diff --git a/network/simulation/node.go b/network/simulation/node.go index 2e2352c678..599e6ac0bc 100644 --- a/network/simulation/node.go +++ b/network/simulation/node.go @@ -30,8 +30,8 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethersphere/swarm/network" ) diff --git a/network/simulation/node_test.go b/network/simulation/node_test.go index b2edb2237c..725523d1b0 100644 --- a/network/simulation/node_test.go +++ b/network/simulation/node_test.go @@ -26,8 +26,8 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethersphere/swarm/network" ) diff --git a/network/simulation/service.go b/network/simulation/service.go index 0ac8149a94..d61fcff31d 100644 --- a/network/simulation/service.go +++ b/network/simulation/service.go @@ -19,7 +19,7 @@ package simulation import ( "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" ) // Service returns a single Service by name on a particular node diff --git a/network/simulation/simulation.go b/network/simulation/simulation.go index 4ba27e4b69..1929be2bdf 100644 --- a/network/simulation/simulation.go +++ b/network/simulation/simulation.go @@ -28,8 +28,8 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethersphere/swarm/network" ) diff --git a/network/simulation/simulation_test.go b/network/simulation/simulation_test.go index 1bba397f6e..1d54d19816 100644 --- a/network/simulation/simulation_test.go +++ b/network/simulation/simulation_test.go @@ -24,8 +24,8 @@ import ( "time" "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethersphere/swarm/testutil" ) diff --git a/network/simulations/discovery/discovery_test.go b/network/simulations/discovery/discovery_test.go index 5ce46ad286..b1d47df694 100644 --- a/network/simulations/discovery/discovery_test.go +++ b/network/simulations/discovery/discovery_test.go @@ -34,8 +34,8 @@ import ( "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethersphere/swarm/network" "github.com/ethersphere/swarm/state" ) diff --git a/network/simulations/overlay.go b/network/simulations/overlay.go index c353a79968..1998407c6b 100644 --- a/network/simulations/overlay.go +++ b/network/simulations/overlay.go @@ -30,8 +30,8 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethersphere/swarm/network" "github.com/ethersphere/swarm/state" "github.com/mattn/go-colorable" diff --git a/network/simulations/overlay_test.go b/network/simulations/overlay_test.go index f894488efa..292bb2a2a2 100644 --- a/network/simulations/overlay_test.go +++ b/network/simulations/overlay_test.go @@ -27,7 +27,7 @@ import ( "time" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations" "github.com/ethersphere/swarm/log" ) diff --git a/network/stream/common_test.go b/network/stream/common_test.go index bb025b090f..9d08031177 100644 --- a/network/stream/common_test.go +++ b/network/stream/common_test.go @@ -32,7 +32,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethersphere/swarm/chunk" "github.com/ethersphere/swarm/network" "github.com/ethersphere/swarm/network/retrieval" diff --git a/network/stream/cursors_test.go b/network/stream/cursors_test.go index f6fe669dee..32c38811d1 100644 --- a/network/stream/cursors_test.go +++ b/network/stream/cursors_test.go @@ -29,7 +29,7 @@ import ( "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations" "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/p2p/enode" diff --git a/network_test.go b/network_test.go index afbcc99255..345cbbac87 100644 --- a/network_test.go +++ b/network_test.go @@ -33,7 +33,7 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethersphere/swarm/api" "github.com/ethersphere/swarm/network/simulation" "github.com/ethersphere/swarm/sctx" diff --git a/p2p/protocols/accounting_simulation_test.go b/p2p/protocols/accounting_simulation_test.go index 76e51da465..80b2d6fc21 100644 --- a/p2p/protocols/accounting_simulation_test.go +++ b/p2p/protocols/accounting_simulation_test.go @@ -36,8 +36,8 @@ import ( "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations/adapters" ) const ( diff --git a/p2p/protocols/accounting_test.go b/p2p/protocols/accounting_test.go index 2b452e255e..91df33eef0 100644 --- a/p2p/protocols/accounting_test.go +++ b/p2p/protocols/accounting_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethereum/go-ethereum/rlp" ) diff --git a/p2p/protocols/protocol_test.go b/p2p/protocols/protocol_test.go index 39b2ee0bf5..4530c554e7 100644 --- a/p2p/protocols/protocol_test.go +++ b/p2p/protocols/protocol_test.go @@ -28,7 +28,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethereum/go-ethereum/rlp" p2ptest "github.com/ethersphere/swarm/p2p/testing" ) diff --git a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/README.md b/p2p/simulations/README.md similarity index 100% rename from vendor/github.com/ethereum/go-ethereum/p2p/simulations/README.md rename to p2p/simulations/README.md diff --git a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go similarity index 100% rename from vendor/github.com/ethereum/go-ethereum/p2p/simulations/adapters/exec.go rename to p2p/simulations/adapters/exec.go diff --git a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go similarity index 99% rename from vendor/github.com/ethereum/go-ethereum/p2p/simulations/adapters/inproc.go rename to p2p/simulations/adapters/inproc.go index c1cf23a175..a1c3c733de 100644 --- a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -28,7 +28,7 @@ import ( "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" + "github.com/ethersphere/swarm/p2p/simulations/pipes" "github.com/ethereum/go-ethereum/rpc" ) diff --git a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go similarity index 100% rename from vendor/github.com/ethereum/go-ethereum/p2p/simulations/adapters/types.go rename to p2p/simulations/adapters/types.go diff --git a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/connect.go b/p2p/simulations/connect.go similarity index 100% rename from vendor/github.com/ethereum/go-ethereum/p2p/simulations/connect.go rename to p2p/simulations/connect.go diff --git a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/events.go b/p2p/simulations/events.go similarity index 100% rename from vendor/github.com/ethereum/go-ethereum/p2p/simulations/events.go rename to p2p/simulations/events.go diff --git a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/http.go b/p2p/simulations/http.go similarity index 99% rename from vendor/github.com/ethereum/go-ethereum/p2p/simulations/http.go rename to p2p/simulations/http.go index 1f44cc6675..a94f4ce9c1 100644 --- a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -32,7 +32,7 @@ import ( "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethereum/go-ethereum/rpc" "github.com/julienschmidt/httprouter" "golang.org/x/net/websocket" diff --git a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/mocker.go b/p2p/simulations/mocker.go similarity index 98% rename from vendor/github.com/ethereum/go-ethereum/p2p/simulations/mocker.go rename to p2p/simulations/mocker.go index 8ce777a010..097e298e7f 100644 --- a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -26,7 +26,7 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" ) //a map of mocker names to its function diff --git a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/network.go b/p2p/simulations/network.go similarity index 99% rename from vendor/github.com/ethereum/go-ethereum/p2p/simulations/network.go rename to p2p/simulations/network.go index f03c953e89..b9ca777df0 100644 --- a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -31,7 +31,7 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" ) var DialBanTimeout = 200 * time.Millisecond diff --git a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/pipes/pipes.go b/p2p/simulations/pipes/pipes.go similarity index 100% rename from vendor/github.com/ethereum/go-ethereum/p2p/simulations/pipes/pipes.go rename to p2p/simulations/pipes/pipes.go diff --git a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/simulation.go b/p2p/simulations/simulation.go similarity index 100% rename from vendor/github.com/ethereum/go-ethereum/p2p/simulations/simulation.go rename to p2p/simulations/simulation.go diff --git a/vendor/github.com/ethereum/go-ethereum/p2p/simulations/test.go b/p2p/simulations/test.go similarity index 100% rename from vendor/github.com/ethereum/go-ethereum/p2p/simulations/test.go rename to p2p/simulations/test.go diff --git a/p2p/testing/protocolsession.go b/p2p/testing/protocolsession.go index 476c2a9840..7e60de8c40 100644 --- a/p2p/testing/protocolsession.go +++ b/p2p/testing/protocolsession.go @@ -25,7 +25,7 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" ) var errTimedOut = errors.New("timed out") diff --git a/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go index 333ec905cd..71c8d66023 100644 --- a/p2p/testing/protocoltester.go +++ b/p2p/testing/protocoltester.go @@ -36,8 +36,8 @@ import ( "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rpc" ) diff --git a/pss/client/client_test.go b/pss/client/client_test.go index c9e5428a52..405a87d361 100644 --- a/pss/client/client_test.go +++ b/pss/client/client_test.go @@ -30,8 +30,8 @@ import ( "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethereum/go-ethereum/rpc" "github.com/ethersphere/swarm/network" "github.com/ethersphere/swarm/pss" diff --git a/pss/notify/notify_test.go b/pss/notify/notify_test.go index e0b6f992db..53413a0661 100644 --- a/pss/notify/notify_test.go +++ b/pss/notify/notify_test.go @@ -12,8 +12,8 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethersphere/swarm/network" "github.com/ethersphere/swarm/pss" "github.com/ethersphere/swarm/pss/crypto" diff --git a/pss/prox_test.go b/pss/prox_test.go index f427559a8e..e5b6b90844 100644 --- a/pss/prox_test.go +++ b/pss/prox_test.go @@ -16,7 +16,7 @@ import ( "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethereum/go-ethereum/rpc" "github.com/ethersphere/swarm/network" "github.com/ethersphere/swarm/network/simulation" diff --git a/pss/pss_test.go b/pss/pss_test.go index 0e1ed892a0..f1999619dc 100644 --- a/pss/pss_test.go +++ b/pss/pss_test.go @@ -37,7 +37,7 @@ import ( "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethereum/go-ethereum/rpc" "github.com/ethersphere/swarm/network" "github.com/ethersphere/swarm/network/simulation" diff --git a/pushsync/simulation_test.go b/pushsync/simulation_test.go index ddac0c2971..2f8a211f75 100644 --- a/pushsync/simulation_test.go +++ b/pushsync/simulation_test.go @@ -32,7 +32,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethereum/go-ethereum/rpc" "github.com/ethersphere/swarm/chunk" chunktesting "github.com/ethersphere/swarm/chunk/testing" diff --git a/swap/swap_test.go b/swap/swap_test.go index 3c995b5b28..7ee49352b8 100644 --- a/swap/swap_test.go +++ b/swap/swap_test.go @@ -45,7 +45,7 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersphere/swarm/p2p/simulations/adapters" "github.com/ethereum/go-ethereum/rpc" contract "github.com/ethersphere/go-sw3/contracts-v0-1-0/simpleswap" "github.com/ethersphere/swarm/contracts/swap" diff --git a/vendor/modules.txt b/vendor/modules.txt index 47db76b0fc..54029b4c04 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -108,8 +108,6 @@ github.com/ethereum/go-ethereum/console github.com/ethereum/go-ethereum/p2p/nat github.com/ethereum/go-ethereum/rlp github.com/ethereum/go-ethereum/metrics/influxdb -github.com/ethereum/go-ethereum/p2p/simulations -github.com/ethereum/go-ethereum/p2p/simulations/adapters github.com/ethereum/go-ethereum github.com/ethereum/go-ethereum/accounts/abi github.com/ethereum/go-ethereum/event @@ -146,7 +144,6 @@ github.com/ethereum/go-ethereum/miner github.com/ethereum/go-ethereum/whisper/whisperv6 github.com/ethereum/go-ethereum/internal/jsre github.com/ethereum/go-ethereum/internal/web3ext -github.com/ethereum/go-ethereum/p2p/simulations/pipes github.com/ethereum/go-ethereum/accounts/abi/bind/backends github.com/ethereum/go-ethereum/metrics/prometheus github.com/ethereum/go-ethereum/internal/ethapi