Skip to content
This repository was archived by the owner on Aug 2, 2021. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/swarm-snapshot/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/swarm-snapshot/create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions network/networkid_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion network/retrieval/retrieve_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion network/simulation/bucket_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion network/simulation/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion network/simulation/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion network/simulation/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion network/simulation/http_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion network/simulation/kademlia.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

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

Expand Down
4 changes: 2 additions & 2 deletions network/simulation/node.go
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/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"
)

Expand Down
4 changes: 2 additions & 2 deletions network/simulation/node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

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

Expand Down
4 changes: 2 additions & 2 deletions network/simulation/simulation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions network/simulations/discovery/discovery_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions network/simulations/overlay.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion network/simulations/overlay_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion network/stream/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion network/stream/cursors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion network_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions p2p/protocols/accounting_simulation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion p2p/protocols/accounting_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion p2p/testing/protocolsession.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions p2p/testing/protocoltester.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions pss/client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pss/notify/notify_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pss/prox_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pss/pss_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pushsync/simulation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion swap/swap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down