Skip to content
This repository has been archived by the owner on Aug 2, 2021. It is now read-only.

Commit

Permalink
network, p2p, vendor: move vendored p2p/testing under swarm (#1647)
Browse files Browse the repository at this point in the history
  • Loading branch information
@zelig
zelig authored Aug 14, 2019
1 parent b5af0d8 commit 7ee35e3
Show file tree
Hide file tree
Showing 12 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion network/discovery_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion network/hive_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion network/protocol_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion network/stream/common_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion network/stream/delivery_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion network/stream/lightnode_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion network/stream/streamer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions p2p/protocols/protocol_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...ereum/go-ethereum/p2p/testing/peerpool.go → p2p/testing/peerpool.go
View file
File renamed without changes.
0 ...o-ethereum/p2p/testing/protocolsession.go → p2p/testing/protocolsession.go
View file
File renamed without changes.
0 ...go-ethereum/p2p/testing/protocoltester.go → p2p/testing/protocoltester.go
View file
File renamed without changes.
1 change: 0 additions & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7ee35e3

Please sign in to comment.