diff options
Diffstat (limited to 'swarm')
156 files changed, 621 insertions, 622 deletions
diff --git a/swarm/README.md b/swarm/README.md index e81963217..30d053454 100644 --- a/swarm/README.md +++ b/swarm/README.md @@ -27,9 +27,9 @@ Swarm is a distributed storage platform and content distribution service, a nati Building Swarm requires Go (version 1.10 or later). - go get -d github.com/ethereum/go-ethereum + go get -d github.com/dexon-foundation/dexon - go install github.com/ethereum/go-ethereum/cmd/swarm + go install github.com/dexon-foundation/dexon/cmd/swarm ## Running Swarm @@ -90,12 +90,12 @@ Swarm documentation can be found at [https://swarm-guide.readthedocs.io](https:/ We assume that you have Go v1.10 installed, and `GOPATH` is set. -You must have your working copy under `$GOPATH/src/github.com/ethereum/go-ethereum`. +You must have your working copy under `$GOPATH/src/github.com/dexon-foundation/dexon`. Most likely you will be working from your fork of `go-ethereum`, let's say from `github.com/nirname/go-ethereum`. Clone or move your fork into the right place: ``` -git clone git@github.com:nirname/go-ethereum.git $GOPATH/src/github.com/ethereum/go-ethereum +git clone git@github.com:nirname/go-ethereum.git $GOPATH/src/github.com/dexon-foundation/dexon ``` @@ -181,7 +181,7 @@ Once you have `stateth` installed, and you have Docker running locally, you have 1. Run `stateth` and keep it running in the background ``` -stateth --rm --grafana-dashboards-folder $GOPATH/src/github.com/ethereum/go-ethereum/swarm/grafana_dashboards --influxdb-database metrics +stateth --rm --grafana-dashboards-folder $GOPATH/src/github.com/dexon-foundation/dexon/swarm/grafana_dashboards --influxdb-database metrics ``` 2. Run `swarm` with at least the following params: @@ -228,7 +228,7 @@ Please make sure your contributions adhere to our coding guidelines: * Code must adhere to the official Go [formatting](https://golang.org/doc/effective_go.html#formatting) guidelines (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)). * Code must be documented adhering to the official Go [commentary](https://golang.org/doc/effective_go.html#commentary) guidelines. * Pull requests need to be based on and opened against the `master` branch. - * [Code review guidelines](https://github.com/ethereum/go-ethereum/wiki/Code-Review-Guidelines). + * [Code review guidelines](https://github.com/dexon-foundation/dexon/wiki/Code-Review-Guidelines). * Commit messages should be prefixed with the package(s) they modify. * E.g. "swarm/fuse: ignore default manifest entry" diff --git a/swarm/api/act.go b/swarm/api/act.go index e54369f9a..6021547a6 100644 --- a/swarm/api/act.go +++ b/swarm/api/act.go @@ -12,13 +12,13 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/sctx" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/crypto/ecies" + "github.com/dexon-foundation/dexon/crypto/sha3" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/sctx" + "github.com/dexon-foundation/dexon/swarm/storage" "golang.org/x/crypto/scrypt" cli "gopkg.in/urfave/cli.v1" ) diff --git a/swarm/api/api.go b/swarm/api/api.go index 33a8e3539..4ef2a3f89 100644 --- a/swarm/api/api.go +++ b/swarm/api/api.go @@ -37,15 +37,15 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/contracts/ens" + "github.com/dexon-foundation/dexon/core/types" + "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/spancontext" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage/feed" + "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" opentracing "github.com/opentracing/opentracing-go" ) diff --git a/swarm/api/api_test.go b/swarm/api/api_test.go index eb896f32a..2e573b9d0 100644 --- a/swarm/api/api_test.go +++ b/swarm/api/api_test.go @@ -28,11 +28,11 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/sctx" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/core/types" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/swarm/sctx" + "github.com/dexon-foundation/dexon/swarm/storage" ) func init() { diff --git a/swarm/api/client/client.go b/swarm/api/client/client.go index f793ca8b8..cafccc821 100644 --- a/swarm/api/client/client.go +++ b/swarm/api/client/client.go @@ -37,11 +37,11 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/storage/feed" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/swarm/api" + "github.com/dexon-foundation/dexon/swarm/spancontext" + "github.com/dexon-foundation/dexon/swarm/storage/feed" "github.com/pborman/uuid" ) diff --git a/swarm/api/client/client_test.go b/swarm/api/client/client_test.go index 39f6e4797..6a4cd4dab 100644 --- a/swarm/api/client/client_test.go +++ b/swarm/api/client/client_test.go @@ -25,14 +25,14 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" - - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/swarm/api" - swarmhttp "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/storage/feed" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" + + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/swarm/api" + swarmhttp "github.com/dexon-foundation/dexon/swarm/api/http" + "github.com/dexon-foundation/dexon/swarm/storage/feed" ) func serverFunc(api *api.API) swarmhttp.TestServer { diff --git a/swarm/api/config.go b/swarm/api/config.go index be7385408..32068603a 100644 --- a/swarm/api/config.go +++ b/swarm/api/config.go @@ -23,16 +23,16 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/services/swap" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/contracts/ens" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/pss" + "github.com/dexon-foundation/dexon/swarm/services/swap" + "github.com/dexon-foundation/dexon/swarm/storage" ) const ( diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go index bd7e1d870..7ebacacae 100644 --- a/swarm/api/config_test.go +++ b/swarm/api/config_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/crypto" ) func TestConfig(t *testing.T) { diff --git a/swarm/api/encrypt.go b/swarm/api/encrypt.go index ffe6c16d2..93977b976 100644 --- a/swarm/api/encrypt.go +++ b/swarm/api/encrypt.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "errors" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/swarm/storage/encryption" + "github.com/dexon-foundation/dexon/crypto/sha3" + "github.com/dexon-foundation/dexon/swarm/storage/encryption" ) type RefEncryption struct { diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go index 266ef71be..a7dc54071 100644 --- a/swarm/api/filesystem.go +++ b/swarm/api/filesystem.go @@ -26,9 +26,9 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/storage" ) const maxParallelFiles = 5 diff --git a/swarm/api/filesystem_test.go b/swarm/api/filesystem_test.go index 02f5bff65..6d9f3757a 100644 --- a/swarm/api/filesystem_test.go +++ b/swarm/api/filesystem_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/swarm/storage" ) var testDownloadDir, _ = ioutil.TempDir(os.TempDir(), "bzz-test") diff --git a/swarm/api/gen_mime.go b/swarm/api/gen_mime.go index 109edeb50..b97880198 100644 --- a/swarm/api/gen_mime.go +++ b/swarm/api/gen_mime.go @@ -1,4 +1,4 @@ -// Code generated by github.com/ethereum/go-ethereum/cmd/swarm/mimegen. DO NOT EDIT. +// Code generated by github.com/dexon-foundation/dexon/cmd/swarm/mimegen. DO NOT EDIT. package api diff --git a/swarm/api/http/middleware.go b/swarm/api/http/middleware.go index f7f819eab..42302610d 100644 --- a/swarm/api/http/middleware.go +++ b/swarm/api/http/middleware.go @@ -7,11 +7,11 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/sctx" - "github.com/ethereum/go-ethereum/swarm/spancontext" + "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/swarm/api" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/sctx" + "github.com/dexon-foundation/dexon/swarm/spancontext" "github.com/pborman/uuid" ) diff --git a/swarm/api/http/response.go b/swarm/api/http/response.go index d4e81d7f6..3ffa78509 100644 --- a/swarm/api/http/response.go +++ b/swarm/api/http/response.go @@ -24,9 +24,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/swarm/api" ) var ( diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go index be8ea3985..c62b5bab7 100644 --- a/swarm/api/http/roundtripper.go +++ b/swarm/api/http/roundtripper.go @@ -20,17 +20,17 @@ import ( "fmt" "net/http" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/swarm/log" ) /* http roundtripper to register for bzz url scheme -see https://github.com/ethereum/go-ethereum/issues/2040 +see https://github.com/dexon-foundation/dexon/issues/2040 Usage: import ( - "github.com/ethereum/go-ethereum/common/httpclient" - "github.com/ethereum/go-ethereum/swarm/api/http" + "github.com/dexon-foundation/dexon/common/httpclient" + "github.com/dexon-foundation/dexon/swarm/api/http" ) client := httpclient.New() // for (private) swarm proxy running locally diff --git a/swarm/api/http/sctx.go b/swarm/api/http/sctx.go index b8dafab0b..cde99b8a7 100644 --- a/swarm/api/http/sctx.go +++ b/swarm/api/http/sctx.go @@ -3,8 +3,8 @@ package http import ( "context" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/sctx" + "github.com/dexon-foundation/dexon/swarm/api" + "github.com/dexon-foundation/dexon/swarm/sctx" ) type uriKey struct{} diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go index 3c6735a73..2055bda58 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -35,12 +35,12 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/swarm/api" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage/feed" "github.com/rs/cors" ) diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go index e82762ce0..dbb86c200 100644 --- a/swarm/api/http/server_test.go +++ b/swarm/api/http/server_test.go @@ -37,17 +37,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" - - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" + + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/core/types" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/swarm/api" + swarm "github.com/dexon-foundation/dexon/swarm/api/client" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage/feed" + "github.com/dexon-foundation/dexon/swarm/testutil" ) func init() { diff --git a/swarm/api/http/templates.go b/swarm/api/http/templates.go index 986f5f887..a37d7b03b 100644 --- a/swarm/api/http/templates.go +++ b/swarm/api/http/templates.go @@ -22,7 +22,7 @@ import ( "html/template" "path" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/dexon-foundation/dexon/swarm/api" ) type htmlListData struct { diff --git a/swarm/api/http/test_server.go b/swarm/api/http/test_server.go index 9245c9c5b..14de20c77 100644 --- a/swarm/api/http/test_server.go +++ b/swarm/api/http/test_server.go @@ -23,9 +23,9 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed" + "github.com/dexon-foundation/dexon/swarm/api" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage/feed" ) type TestServer interface { diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index 890ed88bd..d309f6914 100644 --- a/swarm/api/manifest.go +++ b/swarm/api/manifest.go @@ -27,11 +27,11 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/swarm/storage/feed" + "github.com/dexon-foundation/dexon/swarm/storage/feed" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/storage" ) const ( diff --git a/swarm/api/manifest_test.go b/swarm/api/manifest_test.go index 1c8e53c43..268e628b1 100644 --- a/swarm/api/manifest_test.go +++ b/swarm/api/manifest_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage" ) func manifest(paths ...string) (manifestReader storage.LazySectionReader) { diff --git a/swarm/api/storage.go b/swarm/api/storage.go index 8a48fe5bc..7712d49ed 100644 --- a/swarm/api/storage.go +++ b/swarm/api/storage.go @@ -20,7 +20,7 @@ import ( "context" "path" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage" ) type Response struct { diff --git a/swarm/api/testapi.go b/swarm/api/testapi.go index 4c7d0982b..92a183954 100644 --- a/swarm/api/testapi.go +++ b/swarm/api/testapi.go @@ -17,7 +17,7 @@ package api import ( - "github.com/ethereum/go-ethereum/swarm/network" + "github.com/dexon-foundation/dexon/swarm/network" ) type Control struct { diff --git a/swarm/api/uri.go b/swarm/api/uri.go index 09cfa4502..30dcb4988 100644 --- a/swarm/api/uri.go +++ b/swarm/api/uri.go @@ -22,8 +22,8 @@ import ( "regexp" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/swarm/storage" ) //matches hex swarm hashes diff --git a/swarm/api/uri_test.go b/swarm/api/uri_test.go index ea649e273..a175185ec 100644 --- a/swarm/api/uri_test.go +++ b/swarm/api/uri_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage" ) func TestParseURI(t *testing.T) { diff --git a/swarm/bmt/bmt_test.go b/swarm/bmt/bmt_test.go index 683ba4f5b..2577b747f 100644 --- a/swarm/bmt/bmt_test.go +++ b/swarm/bmt/bmt_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/dexon-foundation/dexon/crypto/sha3" + "github.com/dexon-foundation/dexon/swarm/testutil" ) // the actual data length generated (could be longer than max datalength of the BMT) diff --git a/swarm/dev/Makefile b/swarm/dev/Makefile index 365964b7f..d571a7d31 100644 --- a/swarm/dev/Makefile +++ b/swarm/dev/Makefile @@ -3,12 +3,12 @@ default: build build: - go build -o bin/swarm github.com/ethereum/go-ethereum/cmd/swarm - go build -o bin/geth github.com/ethereum/go-ethereum/cmd/geth - go build -o bin/bootnode github.com/ethereum/go-ethereum/cmd/bootnode + go build -o bin/swarm github.com/dexon-foundation/dexon/cmd/swarm + go build -o bin/geth github.com/dexon-foundation/dexon/cmd/geth + go build -o bin/bootnode github.com/dexon-foundation/dexon/cmd/bootnode cluster: build scripts/boot-cluster.sh test: - go test -v github.com/ethereum/go-ethereum/swarm/... + go test -v github.com/dexon-foundation/dexon/swarm/... diff --git a/swarm/dev/bashrc b/swarm/dev/bashrc index efb504fa3..b1f9652e7 100644 --- a/swarm/dev/bashrc +++ b/swarm/dev/bashrc @@ -1,4 +1,4 @@ -export ROOT="${GOPATH}/src/github.com/ethereum/go-ethereum" +export ROOT="${GOPATH}/src/github.com/dexon-foundation/dexon" export PATH="${ROOT}/swarm/dev/bin:${PATH}" cd "${ROOT}/swarm/dev" diff --git a/swarm/dev/run.sh b/swarm/dev/run.sh index 2ad600ded..71ed13262 100755 --- a/swarm/dev/run.sh +++ b/swarm/dev/run.sh @@ -80,7 +80,7 @@ run_image() { --rm \ --hostname "${name}" \ --name "${name}" \ - --volume "${ROOT}:/go/src/github.com/ethereum/go-ethereum" \ + --volume "${ROOT}:/go/src/github.com/dexon-foundation/dexon" \ --volume "/var/run/docker.sock:/var/run/docker.sock" \ ${docker_args} \ "${name}" \ diff --git a/swarm/fuse/fuse_dir.go b/swarm/fuse/fuse_dir.go index 7f66451f1..59bfd66f9 100644 --- a/swarm/fuse/fuse_dir.go +++ b/swarm/fuse/fuse_dir.go @@ -25,7 +25,7 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/swarm/log" "golang.org/x/net/context" ) diff --git a/swarm/fuse/fuse_file.go b/swarm/fuse/fuse_file.go index ca04f737e..073351f59 100644 --- a/swarm/fuse/fuse_file.go +++ b/swarm/fuse/fuse_file.go @@ -26,8 +26,8 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/storage" "golang.org/x/net/context" ) diff --git a/swarm/fuse/swarmfs.go b/swarm/fuse/swarmfs.go index c7aa983b7..4f690ea96 100644 --- a/swarm/fuse/swarmfs.go +++ b/swarm/fuse/swarmfs.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/dexon-foundation/dexon/swarm/api" ) const ( diff --git a/swarm/fuse/swarmfs_test.go b/swarm/fuse/swarmfs_test.go index 460e31c4e..4624f4392 100644 --- a/swarm/fuse/swarmfs_test.go +++ b/swarm/fuse/swarmfs_test.go @@ -29,10 +29,10 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/swarm/api" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/testutil" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/fuse/swarmfs_unix.go b/swarm/fuse/swarmfs_unix.go index 9ff55cc32..ede87c8a8 100644 --- a/swarm/fuse/swarmfs_unix.go +++ b/swarm/fuse/swarmfs_unix.go @@ -30,9 +30,9 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/swarm/api" + "github.com/dexon-foundation/dexon/swarm/log" ) var ( diff --git a/swarm/fuse/swarmfs_util.go b/swarm/fuse/swarmfs_util.go index 4f2e1416b..3db4ae25b 100644 --- a/swarm/fuse/swarmfs_util.go +++ b/swarm/fuse/swarmfs_util.go @@ -24,7 +24,7 @@ import ( "os/exec" "runtime" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/swarm/log" ) func externalUnmount(mountPoint string) error { diff --git a/swarm/log/log.go b/swarm/log/log.go index ce372632e..901be4a4f 100644 --- a/swarm/log/log.go +++ b/swarm/log/log.go @@ -1,8 +1,8 @@ package log import ( - l "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + l "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/metrics" ) const ( diff --git a/swarm/metrics/flags.go b/swarm/metrics/flags.go index 7c12120a6..5d8c9fcc5 100644 --- a/swarm/metrics/flags.go +++ b/swarm/metrics/flags.go @@ -19,10 +19,10 @@ package metrics import ( "time" - "github.com/ethereum/go-ethereum/cmd/utils" - gethmetrics "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/cmd/utils" + gethmetrics "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/metrics/influxdb" + "github.com/dexon-foundation/dexon/swarm/log" "gopkg.in/urfave/cli.v1" ) diff --git a/swarm/network/discovery.go b/swarm/network/discovery.go index 21703e70f..4607750be 100644 --- a/swarm/network/discovery.go +++ b/swarm/network/discovery.go @@ -21,7 +21,7 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/swarm/pot" + "github.com/dexon-foundation/dexon/swarm/pot" ) // discovery bzz extension for requesting and relaying node address records diff --git a/swarm/network/discovery_test.go b/swarm/network/discovery_test.go index dd3299c0f..e7b5e3087 100644 --- a/swarm/network/discovery_test.go +++ b/swarm/network/discovery_test.go @@ -19,7 +19,7 @@ package network import ( "testing" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + p2ptest "github.com/dexon-foundation/dexon/p2p/testing" ) /*** diff --git a/swarm/network/fetcher.go b/swarm/network/fetcher.go index 6aed57e22..016be45c7 100644 --- a/swarm/network/fetcher.go +++ b/swarm/network/fetcher.go @@ -21,9 +21,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/swarm/storage" ) var searchTimeout = 1 * time.Second diff --git a/swarm/network/fetcher_test.go b/swarm/network/fetcher_test.go index 3a926f475..c5545fc34 100644 --- a/swarm/network/fetcher_test.go +++ b/swarm/network/fetcher_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/enode" ) var requestedPeerID = enode.HexID("3431c3939e1ee2a6345e976a8234f9870152d64879f30bc272a074f6859e75e8") diff --git a/swarm/network/hive.go b/swarm/network/hive.go index ebef54592..c0515eae5 100644 --- a/swarm/network/hive.go +++ b/swarm/network/hive.go @@ -21,11 +21,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/state" ) /* diff --git a/swarm/network/hive_test.go b/swarm/network/hive_test.go index 56adc5a8e..af21fb503 100644 --- a/swarm/network/hive_test.go +++ b/swarm/network/hive_test.go @@ -22,8 +22,8 @@ import ( "os" "testing" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/swarm/state" + p2ptest "github.com/dexon-foundation/dexon/p2p/testing" + "github.com/dexon-foundation/dexon/swarm/state" ) func newHiveTester(t *testing.T, params *HiveParams, n int, store state.Store) (*bzzTester, *Hive) { diff --git a/swarm/network/kademlia.go b/swarm/network/kademlia.go index a8ecaa4be..e7ced65bc 100644 --- a/swarm/network/kademlia.go +++ b/swarm/network/kademlia.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/pot" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/pot" ) /* diff --git a/swarm/network/kademlia_test.go b/swarm/network/kademlia_test.go index 184a2d942..6ab7df698 100644 --- a/swarm/network/kademlia_test.go +++ b/swarm/network/kademlia_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "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/protocols" - "github.com/ethereum/go-ethereum/swarm/pot" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/protocols" + "github.com/dexon-foundation/dexon/swarm/pot" ) func init() { diff --git a/swarm/network/networkid_test.go b/swarm/network/networkid_test.go index 191d67e5b..ef8e37dde 100644 --- a/swarm/network/networkid_test.go +++ b/swarm/network/networkid_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "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/ethereum/go-ethereum/rpc" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/rpc" ) var ( diff --git a/swarm/network/priorityqueue/priorityqueue.go b/swarm/network/priorityqueue/priorityqueue.go index 538502605..2a5042911 100644 --- a/swarm/network/priorityqueue/priorityqueue.go +++ b/swarm/network/priorityqueue/priorityqueue.go @@ -29,7 +29,7 @@ import ( "context" "errors" - "github.com/ethereum/go-ethereum/log" + "github.com/dexon-foundation/dexon/log" ) var ( diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go index 4b9b28cdc..6c3a3ab54 100644 --- a/swarm/network/protocol.go +++ b/swarm/network/protocol.go @@ -24,13 +24,13 @@ import ( "sync" "time" - "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/protocols" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/protocols" + "github.com/dexon-foundation/dexon/rpc" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/state" ) const ( diff --git a/swarm/network/protocol_test.go b/swarm/network/protocol_test.go index 53ceda744..91834ae12 100644 --- a/swarm/network/protocol_test.go +++ b/swarm/network/protocol_test.go @@ -23,11 +23,11 @@ import ( "sync" "testing" - "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/protocols" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/protocols" + p2ptest "github.com/dexon-foundation/dexon/p2p/testing" ) const ( diff --git a/swarm/network/simulation/bucket.go b/swarm/network/simulation/bucket.go index bd15ea2ab..885b76ed7 100644 --- a/swarm/network/simulation/bucket.go +++ b/swarm/network/simulation/bucket.go @@ -16,7 +16,7 @@ package simulation -import "github.com/ethereum/go-ethereum/p2p/enode" +import "github.com/dexon-foundation/dexon/p2p/enode" // BucketKey is the type that should be used for keys in simulation buckets. type BucketKey string diff --git a/swarm/network/simulation/bucket_test.go b/swarm/network/simulation/bucket_test.go index 69df19bfe..bc145715e 100644 --- a/swarm/network/simulation/bucket_test.go +++ b/swarm/network/simulation/bucket_test.go @@ -20,8 +20,8 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" ) // TestServiceBucket tests all bucket functionalities using subtests. diff --git a/swarm/network/simulation/connect.go b/swarm/network/simulation/connect.go index 8b2aa1bfa..929583abe 100644 --- a/swarm/network/simulation/connect.go +++ b/swarm/network/simulation/connect.go @@ -19,7 +19,7 @@ package simulation import ( "strings" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/enode" ) // ConnectToPivotNode connects the node with provided NodeID diff --git a/swarm/network/simulation/connect_test.go b/swarm/network/simulation/connect_test.go index 6c94b3a01..c166e7e3e 100644 --- a/swarm/network/simulation/connect_test.go +++ b/swarm/network/simulation/connect_test.go @@ -19,7 +19,7 @@ package simulation import ( "testing" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/enode" ) func TestConnectToPivotNode(t *testing.T) { diff --git a/swarm/network/simulation/events.go b/swarm/network/simulation/events.go index d73c3af4e..c4a944ae4 100644 --- a/swarm/network/simulation/events.go +++ b/swarm/network/simulation/events.go @@ -20,8 +20,8 @@ import ( "context" "sync" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations" ) // PeerEvent is the type of the channel returned by Simulation.PeerEvents. diff --git a/swarm/network/simulation/example_test.go b/swarm/network/simulation/example_test.go index 7b6204617..8d22f518f 100644 --- a/swarm/network/simulation/example_test.go +++ b/swarm/network/simulation/example_test.go @@ -22,11 +22,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/network/simulation" ) // Every node can have a Kademlia associated using the node bucket under diff --git a/swarm/network/simulation/http.go b/swarm/network/simulation/http.go index 69ae3baec..b05deb59b 100644 --- a/swarm/network/simulation/http.go +++ b/swarm/network/simulation/http.go @@ -20,8 +20,8 @@ import ( "fmt" "net/http" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/simulations" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/p2p/simulations" ) // Package defaults. diff --git a/swarm/network/simulation/http_test.go b/swarm/network/simulation/http_test.go index 775cf9219..fc6dfb0d6 100644 --- a/swarm/network/simulation/http_test.go +++ b/swarm/network/simulation/http_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" ) func TestSimulationWithHTTPServer(t *testing.T) { diff --git a/swarm/network/simulation/kademlia.go b/swarm/network/simulation/kademlia.go index 7982810ca..4c9720875 100644 --- a/swarm/network/simulation/kademlia.go +++ b/swarm/network/simulation/kademlia.go @@ -21,10 +21,10 @@ import ( "encoding/hex" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/network" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/swarm/network" ) // BucketKeyKademlia is the key to be used for storing the kademlia diff --git a/swarm/network/simulation/kademlia_test.go b/swarm/network/simulation/kademlia_test.go index f02b0e541..79f207306 100644 --- a/swarm/network/simulation/kademlia_test.go +++ b/swarm/network/simulation/kademlia_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/swarm/network" ) func TestWaitTillHealthy(t *testing.T) { diff --git a/swarm/network/simulation/node.go b/swarm/network/simulation/node.go index a916d3fc2..3f13b25a2 100644 --- a/swarm/network/simulation/node.go +++ b/swarm/network/simulation/node.go @@ -24,10 +24,10 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" ) // NodeIDs returns NodeIDs for all nodes in the network. diff --git a/swarm/network/simulation/node_test.go b/swarm/network/simulation/node_test.go index 01346ef14..de29be2b2 100644 --- a/swarm/network/simulation/node_test.go +++ b/swarm/network/simulation/node_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "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/ethereum/go-ethereum/swarm/network" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/swarm/network" ) func TestUpDownNodeIDs(t *testing.T) { diff --git a/swarm/network/simulation/service.go b/swarm/network/simulation/service.go index 819602e9e..e23013088 100644 --- a/swarm/network/simulation/service.go +++ b/swarm/network/simulation/service.go @@ -17,9 +17,9 @@ 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/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" ) // Service returns a single Service by name on a particular node diff --git a/swarm/network/simulation/simulation.go b/swarm/network/simulation/simulation.go index e5435b9f0..d723abbad 100644 --- a/swarm/network/simulation/simulation.go +++ b/swarm/network/simulation/simulation.go @@ -23,11 +23,11 @@ import ( "sync" "time" - "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/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" ) // Common errors that are returned by functions in this package. diff --git a/swarm/network/simulation/simulation_test.go b/swarm/network/simulation/simulation_test.go index ca8599d7c..2b9f77af8 100644 --- a/swarm/network/simulation/simulation_test.go +++ b/swarm/network/simulation/simulation_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/rpc" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/network/simulations/discovery/discovery_test.go b/swarm/network/simulations/discovery/discovery_test.go index cd5456b73..8bc12385d 100644 --- a/swarm/network/simulations/discovery/discovery_test.go +++ b/swarm/network/simulations/discovery/discovery_test.go @@ -31,14 +31,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "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/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/state" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/network/simulations/overlay.go b/swarm/network/simulations/overlay.go index 284ae6398..9c8e1f5f7 100644 --- a/swarm/network/simulations/overlay.go +++ b/swarm/network/simulations/overlay.go @@ -27,13 +27,13 @@ import ( "sync" "time" - "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/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/state" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/network/simulations/overlay_test.go b/swarm/network/simulations/overlay_test.go index 6ccdb5ce2..cc4ea6475 100644 --- a/swarm/network/simulations/overlay_test.go +++ b/swarm/network/simulations/overlay_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations" + "github.com/dexon-foundation/dexon/swarm/log" ) var ( diff --git a/swarm/network/stream/common_test.go b/swarm/network/stream/common_test.go index e0a7f7e12..154446b4a 100644 --- a/swarm/network/stream/common_test.go +++ b/swarm/network/stream/common_test.go @@ -30,15 +30,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/p2p/enode" + p2ptest "github.com/dexon-foundation/dexon/p2p/testing" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/network/simulation" + "github.com/dexon-foundation/dexon/swarm/pot" + "github.com/dexon-foundation/dexon/swarm/state" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/testutil" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/network/stream/delivery.go b/swarm/network/stream/delivery.go index c73298d9a..fbaacb512 100644 --- a/swarm/network/stream/delivery.go +++ b/swarm/network/stream/delivery.go @@ -19,15 +19,14 @@ package stream import ( "context" "errors" - "fmt" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/spancontext" + "github.com/dexon-foundation/dexon/swarm/storage" opentracing "github.com/opentracing/opentracing-go" ) diff --git a/swarm/network/stream/delivery_test.go b/swarm/network/stream/delivery_test.go index f69f80499..ad0ea531e 100644 --- a/swarm/network/stream/delivery_test.go +++ b/swarm/network/stream/delivery_test.go @@ -25,19 +25,19 @@ import ( "testing" "time" - "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/protocols" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - pq "github.com/ethereum/go-ethereum/swarm/network/priorityqueue" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/protocols" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + p2ptest "github.com/dexon-foundation/dexon/p2p/testing" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/network" + pq "github.com/dexon-foundation/dexon/swarm/network/priorityqueue" + "github.com/dexon-foundation/dexon/swarm/network/simulation" + "github.com/dexon-foundation/dexon/swarm/state" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/testutil" ) //Tests initializing a retrieve request diff --git a/swarm/network/stream/intervals/dbstore_test.go b/swarm/network/stream/intervals/dbstore_test.go index 6716e593a..9d07a95a6 100644 --- a/swarm/network/stream/intervals/dbstore_test.go +++ b/swarm/network/stream/intervals/dbstore_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/dexon-foundation/dexon/swarm/state" ) // TestDBStore tests basic functionality of DBStore. diff --git a/swarm/network/stream/intervals/store_test.go b/swarm/network/stream/intervals/store_test.go index 0ab14c065..289d34f19 100644 --- a/swarm/network/stream/intervals/store_test.go +++ b/swarm/network/stream/intervals/store_test.go @@ -20,7 +20,7 @@ import ( "errors" "testing" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/dexon-foundation/dexon/swarm/state" ) var ErrNotFound = errors.New("not found") diff --git a/swarm/network/stream/intervals_test.go b/swarm/network/stream/intervals_test.go index 668cf586c..965648705 100644 --- a/swarm/network/stream/intervals_test.go +++ b/swarm/network/stream/intervals_test.go @@ -25,15 +25,15 @@ import ( "testing" "time" - "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/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/network/simulation" + "github.com/dexon-foundation/dexon/swarm/state" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/testutil" ) func TestIntervalsLive(t *testing.T) { diff --git a/swarm/network/stream/lightnode_test.go b/swarm/network/stream/lightnode_test.go index 65cde2411..3f674db7d 100644 --- a/swarm/network/stream/lightnode_test.go +++ b/swarm/network/stream/lightnode_test.go @@ -18,7 +18,7 @@ package stream import ( "testing" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + p2ptest "github.com/dexon-foundation/dexon/p2p/testing" ) // This test checks the default behavior of the server, that is diff --git a/swarm/network/stream/messages.go b/swarm/network/stream/messages.go index eb1b2983e..611ed97f9 100644 --- a/swarm/network/stream/messages.go +++ b/swarm/network/stream/messages.go @@ -21,11 +21,11 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - bv "github.com/ethereum/go-ethereum/swarm/network/bitvector" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/swarm/log" + bv "github.com/dexon-foundation/dexon/swarm/network/bitvector" + "github.com/dexon-foundation/dexon/swarm/spancontext" + "github.com/dexon-foundation/dexon/swarm/storage" "github.com/opentracing/opentracing-go" ) diff --git a/swarm/network/stream/peer.go b/swarm/network/stream/peer.go index 4bccf56f5..7d3188f15 100644 --- a/swarm/network/stream/peer.go +++ b/swarm/network/stream/peer.go @@ -23,14 +23,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/swarm/log" - pq "github.com/ethereum/go-ethereum/swarm/network/priorityqueue" - "github.com/ethereum/go-ethereum/swarm/network/stream/intervals" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/p2p/protocols" + "github.com/dexon-foundation/dexon/swarm/log" + pq "github.com/dexon-foundation/dexon/swarm/network/priorityqueue" + "github.com/dexon-foundation/dexon/swarm/network/stream/intervals" + "github.com/dexon-foundation/dexon/swarm/spancontext" + "github.com/dexon-foundation/dexon/swarm/state" + "github.com/dexon-foundation/dexon/swarm/storage" opentracing "github.com/opentracing/opentracing-go" ) diff --git a/swarm/network/stream/snapshot_retrieval_test.go b/swarm/network/stream/snapshot_retrieval_test.go index 932e28b32..25b835d2f 100644 --- a/swarm/network/stream/snapshot_retrieval_test.go +++ b/swarm/network/stream/snapshot_retrieval_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/network/simulation" + "github.com/dexon-foundation/dexon/swarm/state" + "github.com/dexon-foundation/dexon/swarm/storage" ) //constants for random file generation diff --git a/swarm/network/stream/snapshot_sync_test.go b/swarm/network/stream/snapshot_sync_test.go index 4a632c8c9..c9c97ed8b 100644 --- a/swarm/network/stream/snapshot_sync_test.go +++ b/swarm/network/stream/snapshot_sync_test.go @@ -24,20 +24,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "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/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mock" - mockmem "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/network/simulation" + "github.com/dexon-foundation/dexon/swarm/pot" + "github.com/dexon-foundation/dexon/swarm/state" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage/mock" + mockmem "github.com/dexon-foundation/dexon/swarm/storage/mock/mem" + "github.com/dexon-foundation/dexon/swarm/testutil" ) const MaxTimeout = 600 diff --git a/swarm/network/stream/stream.go b/swarm/network/stream/stream.go index 32e107823..a7c7d8a2f 100644 --- a/swarm/network/stream/stream.go +++ b/swarm/network/stream/stream.go @@ -25,17 +25,17 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/stream/intervals" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/protocols" + "github.com/dexon-foundation/dexon/rpc" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/network/stream/intervals" + "github.com/dexon-foundation/dexon/swarm/pot" + "github.com/dexon-foundation/dexon/swarm/state" + "github.com/dexon-foundation/dexon/swarm/storage" ) const ( diff --git a/swarm/network/stream/streamer_test.go b/swarm/network/stream/streamer_test.go index 16c74d3b3..ed1602813 100644 --- a/swarm/network/stream/streamer_test.go +++ b/swarm/network/stream/streamer_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto/sha3" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + "github.com/dexon-foundation/dexon/crypto/sha3" + p2ptest "github.com/dexon-foundation/dexon/p2p/testing" ) func TestStreamerSubscribe(t *testing.T) { diff --git a/swarm/network/stream/syncer.go b/swarm/network/stream/syncer.go index 4bfbac8b0..6b0f1b9ec 100644 --- a/swarm/network/stream/syncer.go +++ b/swarm/network/stream/syncer.go @@ -21,9 +21,9 @@ import ( "strconv" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/storage" ) const ( diff --git a/swarm/network/stream/syncer_test.go b/swarm/network/stream/syncer_test.go index 3e3cee18d..4c312a804 100644 --- a/swarm/network/stream/syncer_test.go +++ b/swarm/network/stream/syncer_test.go @@ -26,18 +26,18 @@ import ( "testing" "time" - "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/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mock" - mockmem "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/network/simulation" + "github.com/dexon-foundation/dexon/swarm/state" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage/mock" + mockmem "github.com/dexon-foundation/dexon/swarm/storage/mock/mem" + "github.com/dexon-foundation/dexon/swarm/testutil" ) const dataChunkCount = 200 diff --git a/swarm/network/stream/visualized_snapshot_sync_sim_test.go b/swarm/network/stream/visualized_snapshot_sync_sim_test.go index f6d618020..02f7b4537 100644 --- a/swarm/network/stream/visualized_snapshot_sync_sim_test.go +++ b/swarm/network/stream/visualized_snapshot_sync_sim_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/discover" + "github.com/dexon-foundation/dexon/p2p/simulations" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/network/simulation" + "github.com/dexon-foundation/dexon/swarm/storage" ) /* diff --git a/swarm/network_test.go b/swarm/network_test.go index 41993dfc6..f3121dca7 100644 --- a/swarm/network_test.go +++ b/swarm/network_test.go @@ -28,14 +28,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "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/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/swarm/api" + "github.com/dexon-foundation/dexon/swarm/network/simulation" + "github.com/dexon-foundation/dexon/swarm/storage" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/pot/address.go b/swarm/pot/address.go index 728dac14e..13dd09aa0 100644 --- a/swarm/pot/address.go +++ b/swarm/pot/address.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/dexon-foundation/dexon/common" ) var ( diff --git a/swarm/pot/pot_test.go b/swarm/pot/pot_test.go index aeb23dfc6..745e2aa55 100644 --- a/swarm/pot/pot_test.go +++ b/swarm/pot/pot_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/swarm/log" ) const ( diff --git a/swarm/pss/api.go b/swarm/pss/api.go index 587382d72..913001b72 100644 --- a/swarm/pss/api.go +++ b/swarm/pss/api.go @@ -21,11 +21,11 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/rpc" + "github.com/dexon-foundation/dexon/swarm/log" ) // Wrapper for receiving pss messages when using the pss API diff --git a/swarm/pss/client/client.go b/swarm/pss/client/client.go index 5ee387aa7..89c6d9b13 100644 --- a/swarm/pss/client/client.go +++ b/swarm/pss/client/client.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/pss" + "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/protocols" + "github.com/dexon-foundation/dexon/rlp" + "github.com/dexon-foundation/dexon/rpc" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/pss" ) const ( diff --git a/swarm/pss/client/client_test.go b/swarm/pss/client/client_test.go index 8f2f0e805..7f3e18e2e 100644 --- a/swarm/pss/client/client_test.go +++ b/swarm/pss/client/client_test.go @@ -27,18 +27,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/log" - "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/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/state" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/rpc" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/pss" + "github.com/dexon-foundation/dexon/swarm/state" + whisper "github.com/dexon-foundation/dexon/whisper/whisperv5" ) type protoCtrl struct { diff --git a/swarm/pss/client/doc.go b/swarm/pss/client/doc.go index 080af45a9..cd60ec341 100644 --- a/swarm/pss/client/doc.go +++ b/swarm/pss/client/doc.go @@ -28,11 +28,11 @@ // "context" // "fmt" // "os" -// pss "github.com/ethereum/go-ethereum/swarm/pss/client" -// "github.com/ethereum/go-ethereum/p2p/protocols" -// "github.com/ethereum/go-ethereum/p2p" -// "github.com/ethereum/go-ethereum/swarm/pot" -// "github.com/ethereum/go-ethereum/swarm/log" +// pss "github.com/dexon-foundation/dexon/swarm/pss/client" +// "github.com/dexon-foundation/dexon/p2p/protocols" +// "github.com/dexon-foundation/dexon/p2p" +// "github.com/dexon-foundation/dexon/swarm/pot" +// "github.com/dexon-foundation/dexon/swarm/log" // ) // // type FooMsg struct { diff --git a/swarm/pss/handshake.go b/swarm/pss/handshake.go index 5486abafa..580b9f8f3 100644 --- a/swarm/pss/handshake.go +++ b/swarm/pss/handshake.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/rlp" + "github.com/dexon-foundation/dexon/rpc" + "github.com/dexon-foundation/dexon/swarm/log" ) const ( diff --git a/swarm/pss/handshake_test.go b/swarm/pss/handshake_test.go index 0fc7e798f..ad80b41a8 100644 --- a/swarm/pss/handshake_test.go +++ b/swarm/pss/handshake_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/swarm/log" ) // asymmetrical key exchange between two directly connected peers diff --git a/swarm/pss/notify/notify.go b/swarm/pss/notify/notify.go index d3c89058b..60407f1ce 100644 --- a/swarm/pss/notify/notify.go +++ b/swarm/pss/notify/notify.go @@ -5,12 +5,12 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/pss" + "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/rlp" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/pss" ) const ( diff --git a/swarm/pss/notify/notify_test.go b/swarm/pss/notify/notify_test.go index 6100195b0..8b1cbe578 100644 --- a/swarm/pss/notify/notify_test.go +++ b/swarm/pss/notify/notify_test.go @@ -9,17 +9,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "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/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/state" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/simulations" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/pss" + "github.com/dexon-foundation/dexon/swarm/state" + whisper "github.com/dexon-foundation/dexon/whisper/whisperv5" ) var ( diff --git a/swarm/pss/ping.go b/swarm/pss/ping.go index ff635f40a..b45bd169b 100644 --- a/swarm/pss/ping.go +++ b/swarm/pss/ping.go @@ -23,9 +23,9 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/protocols" + "github.com/dexon-foundation/dexon/swarm/log" ) // Generic ping protocol implementation for diff --git a/swarm/pss/protocol.go b/swarm/pss/protocol.go index 5fcae090e..ac3e7aa4f 100644 --- a/swarm/pss/protocol.go +++ b/swarm/pss/protocol.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/protocols" + "github.com/dexon-foundation/dexon/rlp" + "github.com/dexon-foundation/dexon/swarm/log" ) const ( diff --git a/swarm/pss/protocol_test.go b/swarm/pss/protocol_test.go index 520c48a20..6d379c067 100644 --- a/swarm/pss/protocol_test.go +++ b/swarm/pss/protocol_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/swarm/log" ) type protoCtrl struct { diff --git a/swarm/pss/pss.go b/swarm/pss/pss.go index d0986d280..12b6b9a8a 100644 --- a/swarm/pss/pss.go +++ b/swarm/pss/pss.go @@ -27,19 +27,19 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/storage" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/crypto/sha3" + "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/protocols" + "github.com/dexon-foundation/dexon/rpc" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/pot" + "github.com/dexon-foundation/dexon/swarm/storage" + whisper "github.com/dexon-foundation/dexon/whisper/whisperv5" ) const ( diff --git a/swarm/pss/pss_test.go b/swarm/pss/pss_test.go index 72f62acd9..995ef7bc7 100644 --- a/swarm/pss/pss_test.go +++ b/swarm/pss/pss_test.go @@ -34,23 +34,23 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" - "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/protocols" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/state" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/metrics/influxdb" + "github.com/dexon-foundation/dexon/node" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/protocols" + "github.com/dexon-foundation/dexon/p2p/simulations" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/rpc" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/pot" + "github.com/dexon-foundation/dexon/swarm/state" + whisper "github.com/dexon-foundation/dexon/whisper/whisperv5" ) var ( diff --git a/swarm/pss/types.go b/swarm/pss/types.go index ba963067c..d87fc5291 100644 --- a/swarm/pss/types.go +++ b/swarm/pss/types.go @@ -21,12 +21,12 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/storage" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/rlp" + "github.com/dexon-foundation/dexon/swarm/storage" + whisper "github.com/dexon-foundation/dexon/whisper/whisperv5" ) const ( diff --git a/swarm/pss/writeup.md b/swarm/pss/writeup.md index af731fe7f..06f72c4d6 100644 --- a/swarm/pss/writeup.md +++ b/swarm/pss/writeup.md @@ -36,22 +36,22 @@ go test -race -v ./swarm/pss -cpu 4 -run TestNetwork 1 ================== 2 WARNING: DATA RACE 3 Read at 0x00c424d456a0 by goroutine 1089: - 4 github.com/ethereum/go-ethereum/swarm/pss.(*Pss).forward.func1() - 5 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/swarm/pss/pss.go:654 +0x44f - 6 github.com/ethereum/go-ethereum/swarm/network.(*Kademlia).eachConn.func1() - 7 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/swarm/network/kademlia.go:350 +0xc9 - 8 github.com/ethereum/go-ethereum/pot.(*Pot).eachNeighbour.func1() - 9 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/pot/pot.go:599 +0x59 + 4 github.com/dexon-foundation/dexon/swarm/pss.(*Pss).forward.func1() + 5 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/swarm/pss/pss.go:654 +0x44f + 6 github.com/dexon-foundation/dexon/swarm/network.(*Kademlia).eachConn.func1() + 7 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/swarm/network/kademlia.go:350 +0xc9 + 8 github.com/dexon-foundation/dexon/pot.(*Pot).eachNeighbour.func1() + 9 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/pot/pot.go:599 +0x59 ... 28 29 Previous write at 0x00c424d456a0 by goroutine 829: - 30 github.com/ethereum/go-ethereum/swarm/pss.(*Pss).Run() - 31 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/swarm/pss/pss.go:192 +0x16a - 32 github.com/ethereum/go-ethereum/swarm/pss.(*Pss).Run-fm() - 33 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/swarm/pss/pss.go:185 +0x63 - 34 github.com/ethereum/go-ethereum/p2p.(*Peer).startProtocols.func1() - 35 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/p2p/peer.go:347 +0x8b + 30 github.com/dexon-foundation/dexon/swarm/pss.(*Pss).Run() + 31 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/swarm/pss/pss.go:192 +0x16a + 32 github.com/dexon-foundation/dexon/swarm/pss.(*Pss).Run-fm() + 33 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/swarm/pss/pss.go:185 +0x63 + 34 github.com/dexon-foundation/dexon/p2p.(*Peer).startProtocols.func1() + 35 /Users/nonsense/code/src/github.com/dexon-foundation/dexon/p2p/peer.go:347 +0x8b ... ``` diff --git a/swarm/services/swap/swap.go b/swarm/services/swap/swap.go index 91fa54fcf..f5de85340 100644 --- a/swarm/services/swap/swap.go +++ b/swarm/services/swap/swap.go @@ -27,14 +27,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/contracts/chequebook/contract" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" + "github.com/dexon-foundation/dexon/accounts/abi/bind" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/contracts/chequebook" + "github.com/dexon-foundation/dexon/contracts/chequebook/contract" + "github.com/dexon-foundation/dexon/core/types" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/services/swap/swap" ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/services/swap/swap/swap.go b/swarm/services/swap/swap/swap.go index 0afca9ab3..f0b2405a4 100644 --- a/swarm/services/swap/swap/swap.go +++ b/swarm/services/swap/swap/swap.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/swarm/log" ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/services/swap/swap/swap_test.go b/swarm/services/swap/swap/swap_test.go index d0e34f8a5..1dc4f4e5a 100644 --- a/swarm/services/swap/swap/swap_test.go +++ b/swarm/services/swap/swap/swap_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/dexon-foundation/dexon/common" ) type testInPayment struct { diff --git a/swarm/shed/db.go b/swarm/shed/db.go index e128b8cbc..e71f1af95 100644 --- a/swarm/shed/db.go +++ b/swarm/shed/db.go @@ -23,7 +23,7 @@ package shed import ( - "github.com/ethereum/go-ethereum/metrics" + "github.com/dexon-foundation/dexon/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" diff --git a/swarm/shed/example_store_test.go b/swarm/shed/example_store_test.go index 2ed0be141..aaf3ac38f 100644 --- a/swarm/shed/example_store_test.go +++ b/swarm/shed/example_store_test.go @@ -26,8 +26,8 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/swarm/shed" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/shed" + "github.com/dexon-foundation/dexon/swarm/storage" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/swarm/shed/field_struct.go b/swarm/shed/field_struct.go index 90daee7fc..e327ec53b 100644 --- a/swarm/shed/field_struct.go +++ b/swarm/shed/field_struct.go @@ -17,7 +17,7 @@ package shed import ( - "github.com/ethereum/go-ethereum/rlp" + "github.com/dexon-foundation/dexon/rlp" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/swarm/storage/chunker.go b/swarm/storage/chunker.go index cbe65372a..a2b4a9600 100644 --- a/swarm/storage/chunker.go +++ b/swarm/storage/chunker.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/metrics" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/spancontext" + "github.com/dexon-foundation/dexon/metrics" + ch "github.com/dexon-foundation/dexon/swarm/chunk" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/spancontext" opentracing "github.com/opentracing/opentracing-go" olog "github.com/opentracing/opentracing-go/log" ) diff --git a/swarm/storage/chunker_test.go b/swarm/storage/chunker_test.go index 1f847edcb..d705f9ec1 100644 --- a/swarm/storage/chunker_test.go +++ b/swarm/storage/chunker_test.go @@ -24,8 +24,8 @@ import ( "io" "testing" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/dexon-foundation/dexon/crypto/sha3" + "github.com/dexon-foundation/dexon/swarm/testutil" ) /* diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go index af104a5ae..58221a983 100644 --- a/swarm/storage/common_test.go +++ b/swarm/storage/common_test.go @@ -28,8 +28,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - ch "github.com/ethereum/go-ethereum/swarm/chunk" + "github.com/dexon-foundation/dexon/log" + ch "github.com/dexon-foundation/dexon/swarm/chunk" "github.com/mattn/go-colorable" ) diff --git a/swarm/storage/database.go b/swarm/storage/database.go index e25fce31f..a54defbe1 100644 --- a/swarm/storage/database.go +++ b/swarm/storage/database.go @@ -20,7 +20,7 @@ package storage // no need for queueing/caching import ( - "github.com/ethereum/go-ethereum/metrics" + "github.com/dexon-foundation/dexon/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" diff --git a/swarm/storage/encryption/encryption_test.go b/swarm/storage/encryption/encryption_test.go index 0c0d0508c..8c1510fd6 100644 --- a/swarm/storage/encryption/encryption_test.go +++ b/swarm/storage/encryption/encryption_test.go @@ -20,10 +20,10 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/dexon-foundation/dexon/crypto/sha3" + "github.com/dexon-foundation/dexon/swarm/testutil" ) var expectedTransformedHex = "352187af3a843decc63ceca6cb01ea39dbcf77caf0a8f705f5c30d557044ceec9392b94a79376f1e5c10cd0c0f2a98e5353bf22b3ea4fdac6677ee553dec192e3db64e179d0474e96088fb4abd2babd67de123fb398bdf84d818f7bda2c1ab60b3ea0e0569ae54aa969658eb4844e6960d2ff44d7c087ee3aaffa1c0ee5df7e50b615f7ad90190f022934ad5300c7d1809bfe71a11cc04cece5274eb97a5f20350630522c1dbb7cebaf4f97f84e03f5cfd88f2b48880b25d12f4d5e75c150f704ef6b46c72e07db2b705ac3644569dccd22fd8f964f6ef787fda63c46759af334e6f665f70eac775a7017acea49f3c7696151cb1b9434fa4ac27fb803921ffb5ec58dafa168098d7d5b97e384be3384cf5bc235c3d887fef89fe76c0065f9b8d6ad837b442340d9e797b46ef5709ea3358bc415df11e4830de986ef0f1c418ffdcc80e9a3cda9bea0ab5676c0d4240465c43ba527e3b4ea50b4f6255b510e5d25774a75449b0bd71e56c537ade4fcf0f4d63c99ae1dbb5a844971e2c19941b8facfcfc8ee3056e7cb3c7114c5357e845b52f7103cb6e00d2308c37b12baa5b769e1cc7b00fc06f2d16e70cc27a82cb9c1a4e40cb0d43907f73df2c9db44f1b51a6b0bc6d09f77ac3be14041fae3f9df2da42df43ae110904f9ecee278030185254d7c6e918a5512024d047f77a992088cb3190a6587aa54d0c7231c1cd2e455e0d4c07f74bece68e29cd8ba0190c0bcfb26d24634af5d91a81ef5d4dd3d614836ce942ddbf7bb1399317f4c03faa675f325f18324bf9433844bfe5c4cc04130c8d5c329562b7cd66e72f7355de8f5375a72202971613c32bd7f3fcdcd51080758cd1d0a46dbe8f0374381dbc359f5864250c63dde8131cbd7c98ae2b0147d6ea4bf65d1443d511b18e6d608bbb46ac036353b4c51df306a10a6f6939c38629a5c18aaf89cac04bd3ad5156e6b92011c88341cb08551bab0a89e6a46538f5af33b86121dba17e3a434c273f385cd2e8cb90bdd32747d8425d929ccbd9b0815c73325988855549a8489dfd047daf777aaa3099e54cf997175a5d9e1edfe363e3b68c70e02f6bf4fcde6a0f3f7d0e7e98bde1a72ae8b6cd27b32990680cc4a04fc467f41c5adcaddabfc71928a3f6872c360c1d765260690dd28b269864c8e380d9c92ef6b89b0094c8f9bb22608b4156381b19b920e9583c9616ce5693b4d2a6c689f02e6a91584a8e501e107403d2689dd0045269dd9946c0e969fb656a3b39d84a798831f5f9290f163eb2f97d3ae25071324e95e2256d9c1e56eb83c26397855323edc202d56ad05894333b7f0ed3c1e4734782eb8bd5477242fd80d7a89b12866f85cfae476322f032465d6b1253993033fccd4723530630ab97a1566460af9c90c9da843c229406e65f3fa578bd6bf04dee9b6153807ddadb8ceefc5c601a8ab26023c67b1ab1e8e0f29ce94c78c308005a781853e7a2e0e51738939a657c987b5e611f32f47b5ff461c52e63e0ea390515a8e1f5393dae54ea526934b5f310b76e3fa050e40718cb4c8a20e58946d6ee1879f08c52764422fe542b3240e75eccb7aa75b1f8a651e37a3bc56b0932cdae0e985948468db1f98eb4b77b82081ea25d8a762db00f7898864984bd80e2f3f35f236bf57291dec28f550769943bcfb6f884b7687589b673642ef7fe5d7d5a87d3eca5017f83ccb9a3310520474479464cb3f433440e7e2f1e28c0aef700a45848573409e7ab66e0cfd4fe5d2147ace81bc65fd8891f6245cd69246bbf5c27830e5ab882dd1d02aba34ff6ca9af88df00fd602892f02fedbdc65dedec203faf3f8ff4a97314e0ddb58b9ab756a61a562597f4088b445fcc3b28a708ca7b1485dcd791b779fbf2b3ef1ec5c6205f595fbe45a02105034147e5a146089c200a49dae33ae051a08ea5f974a21540aaeffa7f9d9e3d35478016fb27b871036eb27217a5b834b461f535752fb5f1c8dded3ae14ce3a2ef6639e2fe41939e3509e46e347a95d50b2080f1ba42c804b290ddc912c952d1cec3f2661369f738feacc0dbf1ea27429c644e45f9e26f30c341acd34c7519b2a1663e334621691e810767e9918c2c547b2e23cce915f97d26aac8d0d2fcd3edb7986ad4e2b8a852edebad534cb6c0e9f0797d3563e5409d7e068e48356c67ce519246cd9c560e881453df97cbba562018811e6cf8c327f399d1d1253ab47a19f4a0ccc7c6d86a9603e0551da310ea595d71305c4aad96819120a92cdbaf1f77ec8df9cc7c838c0d4de1e8692dd81da38268d1d71324bcffdafbe5122e4b81828e021e936d83ae8021eac592aa52cd296b5ce392c7173d622f8e07d18f59bb1b08ba15211af6703463b09b593af3c37735296816d9f2e7a369354a5374ea3955e14ca8ac56d5bfe4aef7a21bd825d6ae85530bee5d2aaaa4914981b3dfdb2e92ec2a27c83d74b59e84ff5c056f7d8945745f2efc3dcf28f288c6cd8383700fb2312f7001f24dd40015e436ae23e052fe9070ea9535b9c989898a9bda3d5382cf10e432fae6ccf0c825b3e6436edd3a9f8846e5606f8563931b5f29ba407c5236e5730225dda211a8504ec1817bc935e1fd9a532b648c502df302ed2063aed008fd5676131ac9e95998e9447b02bd29d77e38fcfd2959f2de929b31970335eb2a74348cc6918bc35b9bf749eab0fe304c946cd9e1ca284e6853c42646e60b6b39e0d3fb3c260abfc5c1b4ca3c3770f344118ca7c7f5c1ad1f123f8f369cd60afc3cdb3e9e81968c5c9fa7c8b014ffe0508dd4f0a2a976d5d1ca8fc9ad7a237d92cfe7b41413d934d6e142824b252699397e48e4bac4e91ebc10602720684bd0863773c548f9a2f9724245e47b129ecf65afd7252aac48c8a8d6fd3d888af592a01fb02dc71ed7538a700d3d16243e4621e0fcf9f8ed2b4e11c9fa9a95338bb1dac74a7d9bc4eb8cbf900b634a2a56469c00f5994e4f0934bdb947640e6d67e47d0b621aacd632bfd3c800bd7d93bd329f494a90e06ed51535831bd6e07ac1b4b11434ef3918fa9511813a002913f33f836454798b8d1787fea9a4c4743ba091ed192ed92f4d33e43a226bf9503e1a83a16dd340b3cbbf38af6db0d99201da8de529b4225f3d2fa2aad6621afc6c79ef3537720591edfc681ae6d00ede53ed724fc71b23b90d2e9b7158aaee98d626a4fe029107df2cb5f90147e07ebe423b1519d848af18af365c71bfd0665db46be493bbe99b79a188de0cf3594aef2299f0324075bdce9eb0b87bc29d62401ba4fd6ae48b1ba33261b5b845279becf38ee03e3dc5c45303321c5fac96fd02a3ad8c9e3b02127b320501333c9e6360440d1ad5e64a6239501502dde1a49c9abe33b66098458eee3d611bb06ffcd234a1b9aef4af5021cd61f0de6789f822ee116b5078aae8c129e8391d8987500d322b58edd1595dc570b57341f2df221b94a96ab7fbcf32a8ca9684196455694024623d7ed49f7d66e8dd453c0bae50e0d8b34377b22d0ece059e2c385dfc70b9089fcd27577c51f4d870b5738ee2b68c361a67809c105c7848b68860a829f29930857a9f9d40b14fd2384ac43bafdf43c0661103794c4bd07d1cfdd4681b6aeaefad53d4c1473359bcc5a83b09189352e5bb9a7498dd0effb89c35aad26954551f8b0621374b449bf515630bd3974dca982279733470fdd059aa9c3df403d8f22b38c4709c82d8f12b888e22990350490e16179caf406293cc9e65f116bafcbe96af132f679877061107a2f690a82a8cb46eea57a90abd23798c5937c6fe6b17be3f9bfa01ce117d2c268181b9095bf49f395fea07ca03838de0588c5e2db633e836d64488c1421e653ea52d810d096048c092d0da6e02fa6613890219f51a76148c8588c2487b171a28f17b7a299204874af0131725d793481333be5f08e86ca837a226850b0c1060891603bfecf9e55cddd22c0dbb28d495342d9cc3de8409f72e52a0115141cffe755c74f061c1a770428ccb0ae59536ee6fc074fbfc6cacb51a549d327527e20f8407477e60355863f1153f9ce95641198663c968874e7fdb29407bd771d94fdda8180cbb0358f5874738db705924b8cbe0cd5e1484aeb64542fe8f38667b7c34baf818c63b1e18440e9fba575254d063fd49f24ef26432f4eb323f3836972dca87473e3e9bb26dc3be236c3aae6bc8a6da567442309da0e8450e242fc9db836e2964f2c76a3b80a2c677979882dda7d7ebf62c93664018bcf4ec431fe6b403d49b3b36618b9c07c2d0d4569cb8d52223903debc72ec113955b206c34f1ae5300990ccfc0180f47d91afdb542b6312d12aeff7e19c645dc0b9fe6e3288e9539f6d5870f99882df187bfa6d24d179dfd1dac22212c8b5339f7171a3efc15b760fed8f68538bc5cbd845c2d1ab41f3a6c692820653eaef7930c02fbe6061d93805d73decdbb945572a7c44ed0241982a6e4d2d730898f82b3d9877cb7bca41cc6dcee67aa0c3d6db76f0b0a708ace0031113e48429de5d886c10e9200f68f32263a2fbf44a5992c2459fda7b8796ba796e3a0804fc25992ed2c9a5fe0580a6b809200ecde6caa0364b58be11564dcb9a616766dd7906db5636ee708b0204f38d309466d8d4a162965dd727e29f5a6c133e9b4ed5bafe803e479f9b2a7640c942c4a40b14ac7dc9828546052761a070f6404008f1ec3605836339c3da95a00b4fd81b2cabf88b51d2087d5b83e8c5b69bf96d8c72cbd278dad3bbb42b404b436f84ad688a22948adf60a81090f1e904291503c16e9f54b05fc76c881a5f95f0e732949e95d3f1bae2d3652a14fe0dda2d68879604657171856ef72637def2a96ac47d7b3fe86eb3198f5e0e626f06be86232305f2ae79ffcd2725e48208f9d8d63523f81915acc957563ab627cd6bc68c2a37d59fb0ed77a90aa9d085d6914a8ebada22a2c2d471b5163aeddd799d90fbb10ed6851ace2c4af504b7d572686700a59d6db46d5e42bb83f8e0c0ffe1dfa6582cc0b34c921ff6e85e83188d24906d5c08bb90069639e713051b3102b53e6f703e8210017878add5df68e6f2b108de279c5490e9eef5590185c4a1c744d4e00d244e1245a8805bd30407b1bc488db44870ccfd75a8af104df78efa2fb7ba31f048a263efdb3b63271fff4922bece9a71187108f65744a24f4947dc556b7440cb4fa45d296bb7f724588d1f245125b21ea063500029bd49650237f53899daf1312809552c81c5827341263cc807a29fe84746170cdfa1ff3838399a5645319bcaff674bb70efccdd88b3d3bb2f2d98111413585dc5d5bd5168f43b3f55e58972a5b2b9b3733febf02f931bd436648cb617c3794841aab961fe41277ab07812e1d3bc4ff6f4350a3e615bfba08c3b9480ef57904d3a16f7e916345202e3f93d11f7a7305170cb8c4eb9ac88ace8bbd1f377bdd5855d3162d6723d4435e84ce529b8f276a8927915ac759a0d04e5ca4a9d3da6291f0333b475df527e99fe38f7a4082662e8125936640c26dd1d17cf284ce6e2b17777a05aa0574f7793a6a062cc6f7263f7ab126b4528a17becfdec49ac0f7d8705aa1704af97fb861faa8a466161b2b5c08a5bacc79fe8500b913d65c8d3c52d1fd52d2ab2c9f52196e712455619c1cd3e0f391b274487944240e2ed8858dd0823c801094310024ae3fe4dd1cf5a2b6487b42cc5937bbafb193ee331d87e378258963d49b9da90899bbb4b88e79f78e866b0213f4719f67da7bcc2fce073c01e87c62ea3cdbcd589cfc41281f2f4c757c742d6d1e" diff --git a/swarm/storage/feed/binaryserializer.go b/swarm/storage/feed/binaryserializer.go index 4e4f67a09..d6a065553 100644 --- a/swarm/storage/feed/binaryserializer.go +++ b/swarm/storage/feed/binaryserializer.go @@ -16,7 +16,7 @@ package feed -import "github.com/ethereum/go-ethereum/common/hexutil" +import "github.com/dexon-foundation/dexon/common/hexutil" type binarySerializer interface { binaryPut(serializedData []byte) error diff --git a/swarm/storage/feed/binaryserializer_test.go b/swarm/storage/feed/binaryserializer_test.go index 37828d1c9..a9bdd7b32 100644 --- a/swarm/storage/feed/binaryserializer_test.go +++ b/swarm/storage/feed/binaryserializer_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/dexon-foundation/dexon/common/hexutil" ) // KV mocks a key value store diff --git a/swarm/storage/feed/cacheentry.go b/swarm/storage/feed/cacheentry.go index be42008e9..5d7ea11d6 100644 --- a/swarm/storage/feed/cacheentry.go +++ b/swarm/storage/feed/cacheentry.go @@ -21,7 +21,7 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage" ) const ( diff --git a/swarm/storage/feed/feed.go b/swarm/storage/feed/feed.go index b6ea665a6..93a9958a6 100644 --- a/swarm/storage/feed/feed.go +++ b/swarm/storage/feed/feed.go @@ -20,9 +20,9 @@ import ( "hash" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/dexon-foundation/dexon/swarm/storage" ) // Feed represents a particular user's stream of updates on a topic diff --git a/swarm/storage/feed/handler.go b/swarm/storage/feed/handler.go index 9e2640282..f79a55450 100644 --- a/swarm/storage/feed/handler.go +++ b/swarm/storage/feed/handler.go @@ -25,10 +25,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/storage" ) type Handler struct { diff --git a/swarm/storage/feed/handler_test.go b/swarm/storage/feed/handler_test.go index fb2ef3a6b..b6b8c56cb 100644 --- a/swarm/storage/feed/handler_test.go +++ b/swarm/storage/feed/handler_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/swarm/chunk" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" ) var ( diff --git a/swarm/storage/feed/id.go b/swarm/storage/feed/id.go index 7e17743c1..52bfe45a3 100644 --- a/swarm/storage/feed/id.go +++ b/swarm/storage/feed/id.go @@ -21,10 +21,10 @@ import ( "hash" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage" ) // ID uniquely identifies an update on the network. diff --git a/swarm/storage/feed/id_test.go b/swarm/storage/feed/id_test.go index e561ff9b4..ee0b4d0a8 100644 --- a/swarm/storage/feed/id_test.go +++ b/swarm/storage/feed/id_test.go @@ -3,7 +3,7 @@ package feed import ( "testing" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" ) func getTestID() *ID { diff --git a/swarm/storage/feed/lookup/epoch_test.go b/swarm/storage/feed/lookup/epoch_test.go index 0629f3d1d..d9e3e7adb 100644 --- a/swarm/storage/feed/lookup/epoch_test.go +++ b/swarm/storage/feed/lookup/epoch_test.go @@ -3,7 +3,7 @@ package lookup_test import ( "testing" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" ) func TestMarshallers(t *testing.T) { diff --git a/swarm/storage/feed/lookup/lookup_test.go b/swarm/storage/feed/lookup/lookup_test.go index d71e81e95..fc2096a4a 100644 --- a/swarm/storage/feed/lookup/lookup_test.go +++ b/swarm/storage/feed/lookup/lookup_test.go @@ -21,8 +21,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" ) type Data struct { diff --git a/swarm/storage/feed/query.go b/swarm/storage/feed/query.go index 8be78a952..785c2b561 100644 --- a/swarm/storage/feed/query.go +++ b/swarm/storage/feed/query.go @@ -20,8 +20,8 @@ import ( "fmt" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" ) // Query is used to specify constraints when performing an update lookup diff --git a/swarm/storage/feed/request.go b/swarm/storage/feed/request.go index 6968d8b9a..d00fa7fa6 100644 --- a/swarm/storage/feed/request.go +++ b/swarm/storage/feed/request.go @@ -21,10 +21,10 @@ import ( "encoding/json" "hash" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" ) // Request represents a request to sign or signed feed update message diff --git a/swarm/storage/feed/request_test.go b/swarm/storage/feed/request_test.go index f5de32b74..7d27bad5b 100644 --- a/swarm/storage/feed/request_test.go +++ b/swarm/storage/feed/request_test.go @@ -24,9 +24,9 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" ) func areEqualJSON(s1, s2 string) (bool, error) { diff --git a/swarm/storage/feed/sign.go b/swarm/storage/feed/sign.go index 5f0ea0b33..ded0d90b7 100644 --- a/swarm/storage/feed/sign.go +++ b/swarm/storage/feed/sign.go @@ -19,8 +19,8 @@ package feed import ( "crypto/ecdsa" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/crypto" ) const signatureLength = 65 diff --git a/swarm/storage/feed/testutil.go b/swarm/storage/feed/testutil.go index b513fa1f2..fd94ada23 100644 --- a/swarm/storage/feed/testutil.go +++ b/swarm/storage/feed/testutil.go @@ -22,8 +22,8 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/swarm/storage" ) const ( diff --git a/swarm/storage/feed/topic.go b/swarm/storage/feed/topic.go index 43a7b4ba4..005f54201 100644 --- a/swarm/storage/feed/topic.go +++ b/swarm/storage/feed/topic.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/dexon-foundation/dexon/common/bitutil" + "github.com/dexon-foundation/dexon/common/hexutil" + "github.com/dexon-foundation/dexon/swarm/storage" ) // TopicLength establishes the max length of a topic string diff --git a/swarm/storage/feed/topic_test.go b/swarm/storage/feed/topic_test.go index 0403204f7..75724b40e 100644 --- a/swarm/storage/feed/topic_test.go +++ b/swarm/storage/feed/topic_test.go @@ -3,7 +3,7 @@ package feed import ( "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/dexon-foundation/dexon/common/hexutil" ) func TestTopic(t *testing.T) { diff --git a/swarm/storage/feed/update.go b/swarm/storage/feed/update.go index 21c004ca4..5005b4439 100644 --- a/swarm/storage/feed/update.go +++ b/swarm/storage/feed/update.go @@ -20,7 +20,7 @@ import ( "fmt" "strconv" - "github.com/ethereum/go-ethereum/swarm/chunk" + "github.com/dexon-foundation/dexon/swarm/chunk" ) // ProtocolVersion defines the current version of the protocol that will be included in each update message diff --git a/swarm/storage/filestore_test.go b/swarm/storage/filestore_test.go index fb0f761a4..e9f6a9dc8 100644 --- a/swarm/storage/filestore_test.go +++ b/swarm/storage/filestore_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/dexon-foundation/dexon/swarm/testutil" ) const testDataSize = 0x0001000 diff --git a/swarm/storage/hasherstore.go b/swarm/storage/hasherstore.go index ff18e64c7..fcceef7bb 100644 --- a/swarm/storage/hasherstore.go +++ b/swarm/storage/hasherstore.go @@ -21,9 +21,9 @@ import ( "fmt" "sync/atomic" - "github.com/ethereum/go-ethereum/crypto/sha3" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/storage/encryption" + "github.com/dexon-foundation/dexon/crypto/sha3" + ch "github.com/dexon-foundation/dexon/swarm/chunk" + "github.com/dexon-foundation/dexon/swarm/storage/encryption" ) type hasherStore struct { diff --git a/swarm/storage/hasherstore_test.go b/swarm/storage/hasherstore_test.go index 22cf98d0e..2948024b7 100644 --- a/swarm/storage/hasherstore_test.go +++ b/swarm/storage/hasherstore_test.go @@ -21,9 +21,9 @@ import ( "context" "testing" - "github.com/ethereum/go-ethereum/swarm/storage/encryption" + "github.com/dexon-foundation/dexon/swarm/storage/encryption" - "github.com/ethereum/go-ethereum/common" + "github.com/dexon-foundation/dexon/common" ) func TestHasherStore(t *testing.T) { diff --git a/swarm/storage/ldbstore.go b/swarm/storage/ldbstore.go index bd4f6b916..1b474842a 100644 --- a/swarm/storage/ldbstore.go +++ b/swarm/storage/ldbstore.go @@ -34,10 +34,10 @@ import ( "io/ioutil" "sync" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/rlp" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/storage/mock" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/swarm/storage/ldbstore_test.go b/swarm/storage/ldbstore_test.go index e8b9ae39b..8f2e123b7 100644 --- a/swarm/storage/ldbstore_test.go +++ b/swarm/storage/ldbstore_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" + "github.com/dexon-foundation/dexon/common" + ch "github.com/dexon-foundation/dexon/swarm/chunk" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/storage/mock/mem" ldberrors "github.com/syndtr/goleveldb/leveldb/errors" ) diff --git a/swarm/storage/localstore.go b/swarm/storage/localstore.go index 111821ff6..ab92df2fe 100644 --- a/swarm/storage/localstore.go +++ b/swarm/storage/localstore.go @@ -21,9 +21,9 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/storage/mock" ) type LocalStoreParams struct { diff --git a/swarm/storage/localstore_test.go b/swarm/storage/localstore_test.go index 7a07726d1..304b5585c 100644 --- a/swarm/storage/localstore_test.go +++ b/swarm/storage/localstore_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - ch "github.com/ethereum/go-ethereum/swarm/chunk" + ch "github.com/dexon-foundation/dexon/swarm/chunk" ) var ( diff --git a/swarm/storage/memstore_test.go b/swarm/storage/memstore_test.go index 6850d2d69..c5717cd65 100644 --- a/swarm/storage/memstore_test.go +++ b/swarm/storage/memstore_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/swarm/log" ) func newTestMemStore() *MemStore { diff --git a/swarm/storage/mock/db/db.go b/swarm/storage/mock/db/db.go index 73ae199e8..05415fd92 100644 --- a/swarm/storage/mock/db/db.go +++ b/swarm/storage/mock/db/db.go @@ -27,8 +27,8 @@ import ( "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/swarm/storage/mock" ) // GlobalStore contains the LevelDB database that is storing diff --git a/swarm/storage/mock/db/db_test.go b/swarm/storage/mock/db/db_test.go index 782faaf35..30caf11a7 100644 --- a/swarm/storage/mock/db/db_test.go +++ b/swarm/storage/mock/db/db_test.go @@ -23,7 +23,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/storage/mock/test" + "github.com/dexon-foundation/dexon/swarm/storage/mock/test" ) // TestDBStore is running a test.MockStore tests diff --git a/swarm/storage/mock/mem/mem.go b/swarm/storage/mock/mem/mem.go index 3a0a2beb8..b79d3550f 100644 --- a/swarm/storage/mock/mem/mem.go +++ b/swarm/storage/mock/mem/mem.go @@ -27,8 +27,8 @@ import ( "io/ioutil" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/swarm/storage/mock" ) // GlobalStore stores all chunk data and also keys and node addresses relations. diff --git a/swarm/storage/mock/mem/mem_test.go b/swarm/storage/mock/mem/mem_test.go index adcefaabb..c758bef42 100644 --- a/swarm/storage/mock/mem/mem_test.go +++ b/swarm/storage/mock/mem/mem_test.go @@ -19,7 +19,7 @@ package mem import ( "testing" - "github.com/ethereum/go-ethereum/swarm/storage/mock/test" + "github.com/dexon-foundation/dexon/swarm/storage/mock/test" ) // TestGlobalStore is running test for a GlobalStore diff --git a/swarm/storage/mock/mock.go b/swarm/storage/mock/mock.go index 1fb71b70a..8bc8da4b9 100644 --- a/swarm/storage/mock/mock.go +++ b/swarm/storage/mock/mock.go @@ -36,7 +36,7 @@ import ( "errors" "io" - "github.com/ethereum/go-ethereum/common" + "github.com/dexon-foundation/dexon/common" ) // ErrNotFound indicates that the chunk is not found. diff --git a/swarm/storage/mock/rpc/rpc.go b/swarm/storage/mock/rpc/rpc.go index 8cd6c83a7..ef8320b9a 100644 --- a/swarm/storage/mock/rpc/rpc.go +++ b/swarm/storage/mock/rpc/rpc.go @@ -26,10 +26,10 @@ package rpc import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/rpc" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/storage/mock" ) // GlobalStore is rpc.Client that connects to a centralized mock store. diff --git a/swarm/storage/mock/rpc/rpc_test.go b/swarm/storage/mock/rpc/rpc_test.go index f62340ede..0f5430ac8 100644 --- a/swarm/storage/mock/rpc/rpc_test.go +++ b/swarm/storage/mock/rpc/rpc_test.go @@ -19,9 +19,9 @@ package rpc import ( "testing" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" - "github.com/ethereum/go-ethereum/swarm/storage/mock/test" + "github.com/dexon-foundation/dexon/rpc" + "github.com/dexon-foundation/dexon/swarm/storage/mock/mem" + "github.com/dexon-foundation/dexon/swarm/storage/mock/test" ) // TestDBStore is running test for a GlobalStore diff --git a/swarm/storage/mock/test/test.go b/swarm/storage/mock/test/test.go index 10180985f..10bfcc6fc 100644 --- a/swarm/storage/mock/test/test.go +++ b/swarm/storage/mock/test/test.go @@ -25,9 +25,9 @@ import ( "strconv" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage/mock" ) // MockStore creates NodeStore instances from provided GlobalStorer, diff --git a/swarm/storage/netstore.go b/swarm/storage/netstore.go index 16bc48a9a..b015dbdff 100644 --- a/swarm/storage/netstore.go +++ b/swarm/storage/netstore.go @@ -24,8 +24,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/swarm/log" lru "github.com/hashicorp/golang-lru" ) diff --git a/swarm/storage/netstore_test.go b/swarm/storage/netstore_test.go index 8a09fa5ae..5871631df 100644 --- a/swarm/storage/netstore_test.go +++ b/swarm/storage/netstore_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/p2p/enode" - ch "github.com/ethereum/go-ethereum/swarm/chunk" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/p2p/enode" + ch "github.com/dexon-foundation/dexon/swarm/chunk" ) var sourcePeerID = enode.HexID("99d8594b52298567d2ca3f4c441a5ba0140ee9245e26460d01102a52773c73b9") diff --git a/swarm/storage/pyramid.go b/swarm/storage/pyramid.go index f74eef06b..980b30f38 100644 --- a/swarm/storage/pyramid.go +++ b/swarm/storage/pyramid.go @@ -25,8 +25,8 @@ import ( "sync" "time" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/log" + ch "github.com/dexon-foundation/dexon/swarm/chunk" + "github.com/dexon-foundation/dexon/swarm/log" ) /* diff --git a/swarm/storage/types.go b/swarm/storage/types.go index 42557766e..bb065df68 100644 --- a/swarm/storage/types.go +++ b/swarm/storage/types.go @@ -26,10 +26,10 @@ import ( "hash" "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/swarm/bmt" - ch "github.com/ethereum/go-ethereum/swarm/chunk" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/crypto/sha3" + "github.com/dexon-foundation/dexon/swarm/bmt" + ch "github.com/dexon-foundation/dexon/swarm/chunk" ) const MaxPO = 16 diff --git a/swarm/swap/swap.go b/swarm/swap/swap.go index 5d636dc20..60ffdbb87 100644 --- a/swarm/swap/swap.go +++ b/swarm/swap/swap.go @@ -22,10 +22,10 @@ import ( "strconv" "sync" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/protocols" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/state" ) // SwAP Swarm Accounting Protocol diff --git a/swarm/swap/swap_test.go b/swarm/swap/swap_test.go index f2e3ba168..a27300e3c 100644 --- a/swarm/swap/swap_test.go +++ b/swarm/swap/swap_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/dexon-foundation/dexon/log" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/protocols" + "github.com/dexon-foundation/dexon/p2p/simulations/adapters" + "github.com/dexon-foundation/dexon/swarm/state" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/swarm.go b/swarm/swarm.go index a4ff94051..26a9306fe 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -29,30 +29,30 @@ import ( "time" "unicode" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/api" - httpapi "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/fuse" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/stream" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed" - "github.com/ethereum/go-ethereum/swarm/storage/mock" - "github.com/ethereum/go-ethereum/swarm/swap" - "github.com/ethereum/go-ethereum/swarm/tracing" + "github.com/dexon-foundation/dexon/accounts/abi/bind" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/contracts/chequebook" + "github.com/dexon-foundation/dexon/contracts/ens" + "github.com/dexon-foundation/dexon/ethclient" + "github.com/dexon-foundation/dexon/metrics" + "github.com/dexon-foundation/dexon/p2p" + "github.com/dexon-foundation/dexon/p2p/enode" + "github.com/dexon-foundation/dexon/p2p/protocols" + "github.com/dexon-foundation/dexon/params" + "github.com/dexon-foundation/dexon/rpc" + "github.com/dexon-foundation/dexon/swarm/api" + httpapi "github.com/dexon-foundation/dexon/swarm/api/http" + "github.com/dexon-foundation/dexon/swarm/fuse" + "github.com/dexon-foundation/dexon/swarm/log" + "github.com/dexon-foundation/dexon/swarm/network" + "github.com/dexon-foundation/dexon/swarm/network/stream" + "github.com/dexon-foundation/dexon/swarm/pss" + "github.com/dexon-foundation/dexon/swarm/state" + "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/dexon-foundation/dexon/swarm/storage/feed" + "github.com/dexon-foundation/dexon/swarm/storage/mock" + "github.com/dexon-foundation/dexon/swarm/swap" + "github.com/dexon-foundation/dexon/swarm/tracing" ) var ( diff --git a/swarm/swarm_test.go b/swarm/swarm_test.go index d85eb9118..0fe586634 100644 --- a/swarm/swarm_test.go +++ b/swarm/swarm_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/dexon-foundation/dexon/common" + "github.com/dexon-foundation/dexon/crypto" + "github.com/dexon-foundation/dexon/rpc" + "github.com/dexon-foundation/dexon/swarm/api" ) // TestNewSwarm validates Swarm fields in repsect to the provided configuration. diff --git a/swarm/tracing/tracing.go b/swarm/tracing/tracing.go index f95fa41b8..935029651 100644 --- a/swarm/tracing/tracing.go +++ b/swarm/tracing/tracing.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/dexon-foundation/dexon/log" jaeger "github.com/uber/jaeger-client-go" jaegercfg "github.com/uber/jaeger-client-go/config" cli "gopkg.in/urfave/cli.v1" |