From 3bbdca374991f5c69b6aaf6ecdeb3f4d5f843cbc Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 14 Aug 2019 14:42:31 +0200 Subject: [PATCH] network, p2p, vendor: move vendored p2p/testing under swarm --- network/discovery_test.go | 2 +- network/hive_test.go | 2 +- network/protocol_test.go | 2 +- network/stream/common_test.go | 2 +- network/stream/delivery_test.go | 2 +- network/stream/lightnode_test.go | 2 +- network/stream/streamer_test.go | 2 +- p2p/protocols/protocol_test.go | 5 ++--- .../ethereum/go-ethereum/p2p => p2p}/testing/peerpool.go | 0 .../go-ethereum/p2p => p2p}/testing/protocolsession.go | 0 .../go-ethereum/p2p => p2p}/testing/protocoltester.go | 0 vendor/modules.txt | 1 - 12 files changed, 9 insertions(+), 11 deletions(-) rename {vendor/github.com/ethereum/go-ethereum/p2p => p2p}/testing/peerpool.go (100%) rename {vendor/github.com/ethereum/go-ethereum/p2p => p2p}/testing/protocolsession.go (100%) rename {vendor/github.com/ethereum/go-ethereum/p2p => p2p}/testing/protocoltester.go (100%) diff --git a/network/discovery_test.go b/network/discovery_test.go index b2bed30f9a..f7b61af627 100644 --- a/network/discovery_test.go +++ b/network/discovery_test.go @@ -30,8 +30,8 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" "github.com/ethersphere/swarm/p2p/protocols" + p2ptest "github.com/ethersphere/swarm/p2p/testing" "github.com/ethersphere/swarm/pot" ) diff --git a/network/hive_test.go b/network/hive_test.go index b89151d040..ff08a85690 100644 --- a/network/hive_test.go +++ b/network/hive_test.go @@ -24,7 +24,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/p2p" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + p2ptest "github.com/ethersphere/swarm/p2p/testing" "github.com/ethersphere/swarm/state" ) diff --git a/network/protocol_test.go b/network/protocol_test.go index ec4a5b38d1..14b01fae08 100644 --- a/network/protocol_test.go +++ b/network/protocol_test.go @@ -30,8 +30,8 @@ import ( "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enr" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" "github.com/ethersphere/swarm/p2p/protocols" + p2ptest "github.com/ethersphere/swarm/p2p/testing" "github.com/ethersphere/swarm/pot" ) diff --git a/network/stream/common_test.go b/network/stream/common_test.go index b08e7ef39c..17d96ec8d5 100644 --- a/network/stream/common_test.go +++ b/network/stream/common_test.go @@ -36,10 +36,10 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" "github.com/ethersphere/swarm/chunk" "github.com/ethersphere/swarm/network" "github.com/ethersphere/swarm/network/simulation" + p2ptest "github.com/ethersphere/swarm/p2p/testing" "github.com/ethersphere/swarm/state" "github.com/ethersphere/swarm/storage" "github.com/ethersphere/swarm/storage/localstore" diff --git a/network/stream/delivery_test.go b/network/stream/delivery_test.go index 5f9ab0f7c3..a1a658b3ad 100644 --- a/network/stream/delivery_test.go +++ b/network/stream/delivery_test.go @@ -24,11 +24,11 @@ import ( "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" "github.com/ethersphere/swarm/chunk" "github.com/ethersphere/swarm/network" pq "github.com/ethersphere/swarm/network/priorityqueue" "github.com/ethersphere/swarm/p2p/protocols" + p2ptest "github.com/ethersphere/swarm/p2p/testing" "github.com/ethersphere/swarm/storage" ) diff --git a/network/stream/lightnode_test.go b/network/stream/lightnode_test.go index eb4e73d475..0687e81864 100644 --- a/network/stream/lightnode_test.go +++ b/network/stream/lightnode_test.go @@ -18,7 +18,7 @@ package stream import ( "testing" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + p2ptest "github.com/ethersphere/swarm/p2p/testing" ) // This test checks the default behavior of the server, that is diff --git a/network/stream/streamer_test.go b/network/stream/streamer_test.go index dc080916a1..327cd5ef5d 100644 --- a/network/stream/streamer_test.go +++ b/network/stream/streamer_test.go @@ -32,9 +32,9 @@ import ( "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" "github.com/ethersphere/swarm/network" "github.com/ethersphere/swarm/network/simulation" + p2ptest "github.com/ethersphere/swarm/p2p/testing" "github.com/ethersphere/swarm/state" "github.com/ethersphere/swarm/testutil" "golang.org/x/crypto/sha3" diff --git a/p2p/protocols/protocol_test.go b/p2p/protocols/protocol_test.go index 00526b97a7..f57714894b 100644 --- a/p2p/protocols/protocol_test.go +++ b/p2p/protocols/protocol_test.go @@ -25,13 +25,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/rlp" - "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" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + "github.com/ethereum/go-ethereum/rlp" + p2ptest "github.com/ethersphere/swarm/p2p/testing" ) // handshake message type diff --git a/vendor/github.com/ethereum/go-ethereum/p2p/testing/peerpool.go b/p2p/testing/peerpool.go similarity index 100% rename from vendor/github.com/ethereum/go-ethereum/p2p/testing/peerpool.go rename to p2p/testing/peerpool.go diff --git a/vendor/github.com/ethereum/go-ethereum/p2p/testing/protocolsession.go b/p2p/testing/protocolsession.go similarity index 100% rename from vendor/github.com/ethereum/go-ethereum/p2p/testing/protocolsession.go rename to p2p/testing/protocolsession.go diff --git a/vendor/github.com/ethereum/go-ethereum/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go similarity index 100% rename from vendor/github.com/ethereum/go-ethereum/p2p/testing/protocoltester.go rename to p2p/testing/protocoltester.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 8351fef384..195a837aac 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -152,7 +152,6 @@ github.com/ethereum/go-ethereum/eth/filters github.com/ethereum/go-ethereum/common/prque github.com/ethereum/go-ethereum/consensus/misc github.com/ethereum/go-ethereum/metrics/prometheus -github.com/ethereum/go-ethereum/p2p/testing github.com/ethereum/go-ethereum/internal/ethapi github.com/ethereum/go-ethereum/signer/core github.com/ethereum/go-ethereum/accounts/usbwallet/trezor