Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for Java based Android projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from Android too.
Under the hood the Android library is backed by a go-ethereum light node, meaning that given a not-too-old Android device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.
The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in Mobile: Introduction – Android archive. +
The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in Mobile: Introduction – Android archive.
Before connecting to the Ethereum network, download the {{.GethGenesis}} genesis json file and either store it in your Android project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.
Inside your Java code you can now import the geth archive and connect to Ethereum:
import org.ethereum.geth.*;@@ -287,7 +287,7 @@ node.start();
Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for ObjC/Swift based iOS projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from iOS too.
Under the hood the iOS library is backed by a go-ethereum light node, meaning that given a not-too-old Apple device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.
Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework. +
Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework.
Before connecting to the Ethereum network, download the {{.GethGenesis}} genesis json file and either store it in your iOS project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.
Inside your Swift code you can now import the geth framework and connect to Ethereum (ObjC should be analogous):
import Geth@@ -419,7 +419,7 @@ try! node?.start();
Puppeth is a tool to aid you in creating a new Ethereum network down to the genesis block, bootnodes, signers, ethstats server, crypto faucet, wallet browsers, block explorer, dashboard and more; without the hassle that it would normally entail to manually configure all these services one by one.
Puppeth uses ssh to dial in to remote servers, and builds its network components out of docker containers using docker-compose. The user is guided through the process via a command line wizard that does the heavy lifting and topology configuration automatically behind the scenes.
Puppeth is distributed as part of the Geth & Tools bundles, but can also be installed separately via:
go get github.com/ethereum/go-ethereum/cmd/puppeth+
Puppeth is distributed as part of the Geth & Tools bundles, but can also be installed separately via:
go get github.com/zhigui-projects/go-ethereum/cmd/puppeth
Copyright 2017. The go-ethereum Authors.
diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index 20b7afe236..f0f3b4c8e5 100644 --- a/cmd/puppeth/module_ethstats.go +++ b/cmd/puppeth/module_ethstats.go @@ -25,7 +25,7 @@ import ( "strings" "text/template" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // ethstatsDockerfile is the Dockerfile required to build an ethstats backend diff --git a/cmd/puppeth/module_explorer.go b/cmd/puppeth/module_explorer.go index bb43e5fe4e..6d958f42e4 100644 --- a/cmd/puppeth/module_explorer.go +++ b/cmd/puppeth/module_explorer.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // explorerDockerfile is the Dockerfile required to run a block explorer. diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go index 8365bf47d0..ef9319411e 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -26,8 +26,8 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/log" ) // faucetDockerfile is the Dockerfile required to build a faucet container to diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go index 35c0efc8ad..7579fea862 100644 --- a/cmd/puppeth/module_nginx.go +++ b/cmd/puppeth/module_nginx.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strconv" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // nginxDockerfile is theis the Dockerfile required to build an nginx reverse- diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go index 1e1767c04b..9629d38072 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -26,8 +26,8 @@ import ( "strings" "text/template" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/log" ) // nodeDockerfile is the Dockerfile required to run an Ethereum node. diff --git a/cmd/puppeth/module_wallet.go b/cmd/puppeth/module_wallet.go index 5e5032bedf..a37e2d50c3 100644 --- a/cmd/puppeth/module_wallet.go +++ b/cmd/puppeth/module_wallet.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // walletDockerfile is the Dockerfile required to run a web wallet. diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index f9b8fe4811..1d6306e055 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index 158261ce05..27caa5391e 100644 --- a/cmd/puppeth/ssh.go +++ b/cmd/puppeth/ssh.go @@ -28,7 +28,7 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard.go b/cmd/puppeth/wizard.go index b88a61de7d..0fddc206e8 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -30,9 +30,9 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index 5f781c4152..a7f788d43f 100644 --- a/cmd/puppeth/wizard_dashboard.go +++ b/cmd/puppeth/wizard_dashboard.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // deployDashboard queries the user for various input on deploying a web-service diff --git a/cmd/puppeth/wizard_ethstats.go b/cmd/puppeth/wizard_ethstats.go index fb2529c267..9bce527a73 100644 --- a/cmd/puppeth/wizard_ethstats.go +++ b/cmd/puppeth/wizard_ethstats.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // deployEthstats queries the user for various input on deploying an ethstats diff --git a/cmd/puppeth/wizard_explorer.go b/cmd/puppeth/wizard_explorer.go index 413511c1c3..7f58c9e4cc 100644 --- a/cmd/puppeth/wizard_explorer.go +++ b/cmd/puppeth/wizard_explorer.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // deployExplorer creates a new block explorer based on some user input. diff --git a/cmd/puppeth/wizard_faucet.go b/cmd/puppeth/wizard_faucet.go index 6f08408947..4879ec15a5 100644 --- a/cmd/puppeth/wizard_faucet.go +++ b/cmd/puppeth/wizard_faucet.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/accounts/keystore" + "github.com/zhigui-projects/go-ethereum/log" ) // deployFaucet queries the user for various input on deploying a faucet, after diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go index 6c4cd571fb..a00a2f02e3 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -25,10 +25,10 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/params" ) // makeGenesis creates a new genesis struct based on some user input. diff --git a/cmd/puppeth/wizard_intro.go b/cmd/puppeth/wizard_intro.go index 60aa0f7ffb..e612e1f11b 100644 --- a/cmd/puppeth/wizard_intro.go +++ b/cmd/puppeth/wizard_intro.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index a307c5ee3a..dba0a8dcd5 100644 --- a/cmd/puppeth/wizard_netstats.go +++ b/cmd/puppeth/wizard_netstats.go @@ -23,8 +23,8 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/log" "github.com/olekukonko/tablewriter" ) diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go index d780c550b1..8415d6e43b 100644 --- a/cmd/puppeth/wizard_network.go +++ b/cmd/puppeth/wizard_network.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // manageServers displays a list of servers the user can disconnect from, and an diff --git a/cmd/puppeth/wizard_nginx.go b/cmd/puppeth/wizard_nginx.go index 4eeae93a0b..42af337fac 100644 --- a/cmd/puppeth/wizard_nginx.go +++ b/cmd/puppeth/wizard_nginx.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // ensureVirtualHost checks whether a reverse-proxy is running on the specified diff --git a/cmd/puppeth/wizard_node.go b/cmd/puppeth/wizard_node.go index 9b22da4460..3f0ff710ff 100644 --- a/cmd/puppeth/wizard_node.go +++ b/cmd/puppeth/wizard_node.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/accounts/keystore" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/log" ) // deployNode creates a new node configuration based on some user input. diff --git a/cmd/puppeth/wizard_wallet.go b/cmd/puppeth/wizard_wallet.go index 7624d11e20..07894ef59e 100644 --- a/cmd/puppeth/wizard_wallet.go +++ b/cmd/puppeth/wizard_wallet.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // deployWallet creates a new web wallet based on some user input. diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index d0f993c5b8..e929049fea 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -26,7 +26,7 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/rlp" ) var ( diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go index 64c37a0b5e..d7b6669952 100644 --- a/cmd/swarm/config.go +++ b/cmd/swarm/config.go @@ -29,13 +29,13 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/cmd/utils" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/node" "github.com/naoina/toml" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" + bzzapi "github.com/zhigui-projects/go-ethereum/swarm/api" ) const SWARM_VERSION = "0.3" @@ -93,7 +93,7 @@ var tomlSettings = toml.Config{ MissingField: func(rt reflect.Type, field string) error { link := "" if unicode.IsUpper(rune(rt.Name()[0])) && rt.PkgPath() != "main" { - link = fmt.Sprintf(", check github.com/ethereum/go-ethereum/swarm/api/config.go for available fields") + link = fmt.Sprintf(", check github.com/zhigui-projects/go-ethereum/swarm/api/config.go for available fields") } return fmt.Errorf("field '%s' is not defined in %s%s", field, rt.String(), link) }, diff --git a/cmd/swarm/config_test.go b/cmd/swarm/config_test.go index d5011e3a70..e436775b78 100644 --- a/cmd/swarm/config_test.go +++ b/cmd/swarm/config_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm" + "github.com/zhigui-projects/go-ethereum/swarm/api" "github.com/docker/docker/pkg/reexec" ) diff --git a/cmd/swarm/db.go b/cmd/swarm/db.go index fe03f2d160..94e36d10ca 100644 --- a/cmd/swarm/db.go +++ b/cmd/swarm/db.go @@ -22,10 +22,10 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/cmd/utils" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/download.go b/cmd/swarm/download.go index c2418f744c..ec32bc7021 100644 --- a/cmd/swarm/download.go +++ b/cmd/swarm/download.go @@ -21,10 +21,10 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/zhigui-projects/go-ethereum/cmd/utils" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/swarm/api" + swarm "github.com/zhigui-projects/go-ethereum/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/export_test.go b/cmd/swarm/export_test.go index 525538ad75..89685245a2 100644 --- a/cmd/swarm/export_test.go +++ b/cmd/swarm/export_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/swarm" + "github.com/zhigui-projects/go-ethereum/swarm" ) // TestCLISwarmExportImport perform the following test: diff --git a/cmd/swarm/fs.go b/cmd/swarm/fs.go index 0124586cfe..e6f37a0420 100644 --- a/cmd/swarm/fs.go +++ b/cmd/swarm/fs.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/fuse" + "github.com/zhigui-projects/go-ethereum/cmd/utils" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/fuse" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/fs_test.go b/cmd/swarm/fs_test.go index 25705c0a49..f8fad2163e 100644 --- a/cmd/swarm/fs_test.go +++ b/cmd/swarm/fs_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" colorable "github.com/mattn/go-colorable" ) diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go index c82456b3cd..30a9555e77 100644 --- a/cmd/swarm/hash.go +++ b/cmd/swarm/hash.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/cmd/utils" + "github.com/zhigui-projects/go-ethereum/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go index 57b5517c6e..599de3abc6 100644 --- a/cmd/swarm/list.go +++ b/cmd/swarm/list.go @@ -22,8 +22,8 @@ import ( "strings" "text/tabwriter" - "github.com/ethereum/go-ethereum/cmd/utils" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/zhigui-projects/go-ethereum/cmd/utils" + swarm "github.com/zhigui-projects/go-ethereum/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 9877e9150d..d13dd2329f 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -28,21 +28,21 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/swarm" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" - swarmmetrics "github.com/ethereum/go-ethereum/swarm/metrics" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/accounts/keystore" + "github.com/zhigui-projects/go-ethereum/cmd/utils" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/console" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/internal/debug" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/swarm" + bzzapi "github.com/zhigui-projects/go-ethereum/swarm/api" + swarmmetrics "github.com/zhigui-projects/go-ethereum/swarm/metrics" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go index 82166edf6c..6099d5bf42 100644 --- a/cmd/swarm/manifest.go +++ b/cmd/swarm/manifest.go @@ -24,9 +24,9 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/zhigui-projects/go-ethereum/cmd/utils" + "github.com/zhigui-projects/go-ethereum/swarm/api" + swarm "github.com/zhigui-projects/go-ethereum/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index a70c4686dd..b0233a2161 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -27,13 +27,13 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/accounts/keystore" + "github.com/zhigui-projects/go-ethereum/internal/cmdtest" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm" ) func init() { diff --git a/cmd/swarm/swarm-smoke/main.go b/cmd/swarm/swarm-smoke/main.go index 87bc39816d..edb74595c9 100644 --- a/cmd/swarm/swarm-smoke/main.go +++ b/cmd/swarm/swarm-smoke/main.go @@ -20,7 +20,7 @@ import ( "os" "sort" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" colorable "github.com/mattn/go-colorable" cli "gopkg.in/urfave/cli.v1" diff --git a/cmd/swarm/swarm-smoke/upload_and_sync.go b/cmd/swarm/swarm-smoke/upload_and_sync.go index 7f9051e7fe..77f9e1b7b0 100644 --- a/cmd/swarm/swarm-smoke/upload_and_sync.go +++ b/cmd/swarm/swarm-smoke/upload_and_sync.go @@ -30,7 +30,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" "github.com/pborman/uuid" cli "gopkg.in/urfave/cli.v1" diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go index 8ba0e7c5f0..2780783f66 100644 --- a/cmd/swarm/upload.go +++ b/cmd/swarm/upload.go @@ -30,8 +30,8 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/zhigui-projects/go-ethereum/cmd/utils" + swarm "github.com/zhigui-projects/go-ethereum/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/upload_test.go b/cmd/swarm/upload_test.go index 2afc9b3a11..43d41312f5 100644 --- a/cmd/swarm/upload_test.go +++ b/cmd/swarm/upload_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/zhigui-projects/go-ethereum/log" + swarm "github.com/zhigui-projects/go-ethereum/swarm/api/client" colorable "github.com/mattn/go-colorable" ) diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 58d72f32ba..4c5ac9f862 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -27,16 +27,16 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/internal/debug" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index e5bf8724c1..cea2a9b8cd 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -27,7 +27,7 @@ import ( "path" "strings" - "github.com/ethereum/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index a191e44306..001b721958 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -29,35 +29,35 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/dashboard" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/les" - "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/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/accounts/keystore" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/fdlimit" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/consensus/clique" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/dashboard" + "github.com/zhigui-projects/go-ethereum/eth" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/eth/gasprice" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/ethstats" + "github.com/zhigui-projects/go-ethereum/les" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/metrics/influxdb" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/discv5" + "github.com/zhigui-projects/go-ethereum/p2p/nat" + "github.com/zhigui-projects/go-ethereum/p2p/netutil" + "github.com/zhigui-projects/go-ethereum/params" + whisper "github.com/zhigui-projects/go-ethereum/whisper/whisperv6" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go index 31b65c1da9..203fdbf807 100644 --- a/cmd/wnode/main.go +++ b/cmd/wnode/main.go @@ -35,16 +35,16 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/whisper/mailserver" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/zhigui-projects/go-ethereum/cmd/utils" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/console" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/nat" + "github.com/zhigui-projects/go-ethereum/whisper/mailserver" + whisper "github.com/zhigui-projects/go-ethereum/whisper/whisperv6" "golang.org/x/crypto/pbkdf2" ) diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index 9bd1de103a..7d09fad6bc 100644 --- a/common/bitutil/compress_test.go +++ b/common/bitutil/compress_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/debug.go b/common/debug.go index 61acd8ce70..4565be670d 100644 --- a/common/debug.go +++ b/common/debug.go @@ -26,7 +26,7 @@ import ( // Report gives off a warning requesting the user to submit an issue to the github tracker. func Report(extra ...interface{}) { - fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/ethereum/go-ethereum/issues") + fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/zhigui-projects/go-ethereum/issues") fmt.Fprintln(os.Stderr, extra...) _, file, line, _ := runtime.Caller(1) diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go index 80180d9186..fa8697070c 100644 --- a/common/hexutil/json_example_test.go +++ b/common/hexutil/json_example_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index be9810dc8c..11cf2077c5 100644 --- a/common/math/big_test.go +++ b/common/math/big_test.go @@ -22,7 +22,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/types.go b/common/types.go index 4d374ad246..018a9a0362 100644 --- a/common/types.go +++ b/common/types.go @@ -25,8 +25,8 @@ import ( "reflect" "strings" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" ) // Lengths of hashes and addresses in bytes. diff --git a/consensus/clique/api.go b/consensus/clique/api.go index b875eef012..83dc557b00 100644 --- a/consensus/clique/api.go +++ b/consensus/clique/api.go @@ -17,10 +17,10 @@ package clique import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/rpc" ) // API is a user facing RPC API to allow controlling the signer and voting diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index 01df4d5c78..c19f4bead4 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -25,20 +25,20 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/consensus/misc" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/rpc" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index 9ebdb8df15..1cfe008761 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -20,10 +20,10 @@ import ( "bytes" "encoding/json" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index 29a8379832..3c575ad449 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -22,13 +22,13 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" ) type testerVote struct { diff --git a/consensus/consensus.go b/consensus/consensus.go index 5774af1a78..b9eb231d2e 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -20,11 +20,11 @@ package consensus import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rpc" ) // ChainReader defines a small collection of methods needed to access the local diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go index fa1c2c8246..ca0ff79728 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -27,11 +27,11 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/bitutil" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/log" ) const ( diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index 841e39233f..f1e57758d2 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -25,9 +25,9 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/core/types" ) // Tests whether the dataset size calculator works correctly by cross checking the diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index 99eec82211..ac8a05d947 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -24,13 +24,13 @@ import ( "runtime" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/consensus/misc" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/params" set "gopkg.in/fatih/set.v0" ) diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index 438a99dd66..b28346ad9b 100644 --- a/consensus/ethash/consensus_test.go +++ b/consensus/ethash/consensus_test.go @@ -23,9 +23,9 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/params" ) type diffTest struct { diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index f79dd6c36b..daf9ca3cde 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -33,10 +33,10 @@ import ( "unsafe" mmap "github.com/edsrzf/mmap-go" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/rpc" "github.com/hashicorp/golang-lru/simplelru" ) diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index 31116da437..4a7b7492b0 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/types" ) // Tests that ethash works correctly in test mode. @@ -44,7 +44,7 @@ func TestTestMode(t *testing.T) { } // This test checks that cache lru logic doesn't crash under load. -// It reproduces https://github.com/ethereum/go-ethereum/issues/14943 +// It reproduces https://github.com/zhigui-projects/go-ethereum/issues/14943 func TestCacheFileEvict(t *testing.T) { tmpdir, err := ioutil.TempDir("", "ethash-test") if err != nil { diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go index b5e742d8bb..d7dbdcc561 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -24,10 +24,10 @@ import ( "runtime" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/log" ) // Seal implements consensus.Engine, attempting to find a nonce that satisfies diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index 9b22bd7a52..4010bb530a 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/params" ) var ( diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go index 4a5e7c37e0..864f05df99 100644 --- a/consensus/misc/forks.go +++ b/consensus/misc/forks.go @@ -19,9 +19,9 @@ package misc import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/params" ) // VerifyForkHashes verifies that blocks conforming to network hard-forks do have diff --git a/console/bridge.go b/console/bridge.go index b0b4d37985..a5d0149cd7 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/accounts/usbwallet" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/rpc" "github.com/robertkrimen/otto" ) diff --git a/console/console.go b/console/console.go index 56e03837ac..f04d434041 100644 --- a/console/console.go +++ b/console/console.go @@ -28,9 +28,9 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/internal/web3ext" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/internal/jsre" + "github.com/zhigui-projects/go-ethereum/internal/web3ext" + "github.com/zhigui-projects/go-ethereum/rpc" "github.com/mattn/go-colorable" "github.com/peterh/liner" "github.com/robertkrimen/otto" diff --git a/console/console_test.go b/console/console_test.go index 7b1629c032..27b07e24ee 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/eth" + "github.com/zhigui-projects/go-ethereum/internal/jsre" + "github.com/zhigui-projects/go-ethereum/node" ) const ( diff --git a/contracts/chequebook/api.go b/contracts/chequebook/api.go index b2b2365f31..58f554cd98 100644 --- a/contracts/chequebook/api.go +++ b/contracts/chequebook/api.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) const Version = "1.0" diff --git a/contracts/chequebook/cheque.go b/contracts/chequebook/cheque.go index 92bd896e0a..54c1b842aa 100644 --- a/contracts/chequebook/cheque.go +++ b/contracts/chequebook/cheque.go @@ -36,14 +36,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "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/log" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/contracts/chequebook/contract" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/swarm/services/swap/swap" ) // TODO(zelig): watch peer solvency and notify of bouncing cheques diff --git a/contracts/chequebook/cheque_test.go b/contracts/chequebook/cheque_test.go index 6b6b28e657..4a5825471c 100644 --- a/contracts/chequebook/cheque_test.go +++ b/contracts/chequebook/cheque_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/chequebook/contract" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind/backends" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/contracts/chequebook/contract" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/crypto" ) var ( diff --git a/contracts/chequebook/contract/chequebook.go b/contracts/chequebook/contract/chequebook.go index e275ac9b8d..54ad1cd669 100644 --- a/contracts/chequebook/contract/chequebook.go +++ b/contracts/chequebook/contract/chequebook.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/zhigui-projects/go-ethereum" + "github.com/zhigui-projects/go-ethereum/accounts/abi" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/event" ) // ChequebookABI is the input ABI used to generate the binding from. diff --git a/contracts/chequebook/gencode.go b/contracts/chequebook/gencode.go index 45f6d68f3e..689f817ac7 100644 --- a/contracts/chequebook/gencode.go +++ b/contracts/chequebook/gencode.go @@ -25,11 +25,11 @@ import ( "io/ioutil" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/contracts/chequebook/contract" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind/backends" + "github.com/zhigui-projects/go-ethereum/contracts/chequebook/contract" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/crypto" ) var ( diff --git a/contracts/ens/contract/ens.go b/contracts/ens/contract/ens.go index cbf6cb05b3..c9a5ddb5dc 100644 --- a/contracts/ens/contract/ens.go +++ b/contracts/ens/contract/ens.go @@ -6,12 +6,12 @@ package contract import ( "strings" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/zhigui-projects/go-ethereum" + "github.com/zhigui-projects/go-ethereum/accounts/abi" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/event" ) // ENSABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/contract/fifsregistrar.go b/contracts/ens/contract/fifsregistrar.go index a08380adfc..e3681e4e0c 100644 --- a/contracts/ens/contract/fifsregistrar.go +++ b/contracts/ens/contract/fifsregistrar.go @@ -6,10 +6,10 @@ package contract import ( "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/accounts/abi" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" ) // FIFSRegistrarABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/contract/publicresolver.go b/contracts/ens/contract/publicresolver.go index c567d5884a..e97cb7bd0c 100644 --- a/contracts/ens/contract/publicresolver.go +++ b/contracts/ens/contract/publicresolver.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/zhigui-projects/go-ethereum" + "github.com/zhigui-projects/go-ethereum/accounts/abi" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/event" ) // PublicResolverABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/ens.go b/contracts/ens/ens.go index 75d9d0e4b1..8cadd447cc 100644 --- a/contracts/ens/ens.go +++ b/contracts/ens/ens.go @@ -23,11 +23,11 @@ package ens import ( "strings" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens/contract" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/contracts/ens/contract" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" ) var ( diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index 6ad8447082..b9d1e04c54 100644 --- a/contracts/ens/ens_test.go +++ b/contracts/ens/ens_test.go @@ -20,11 +20,11 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/contracts/ens/contract" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind/backends" + "github.com/zhigui-projects/go-ethereum/contracts/ens/contract" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/crypto" ) var ( diff --git a/core/asm/asm.go b/core/asm/asm.go index ce22f93f92..3ffa364455 100644 --- a/core/asm/asm.go +++ b/core/asm/asm.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "fmt" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index c7a5440701..5de3d80dfc 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -22,8 +22,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index 748aebe407..0ed041328c 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -23,15 +23,15 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index 98958809b7..2d27065339 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -19,10 +19,10 @@ package core import ( "fmt" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/params" ) // BlockValidator is responsible for validating block headers, uncles and diff --git a/core/block_validator_test.go b/core/block_validator_test.go index 2a171218e3..3f290bfffa 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index 2f1e78423e..ecbb2bb384 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -27,21 +27,21 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/mclock" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/trie" "github.com/hashicorp/golang-lru" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 687209bfae..6b5deec32c 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -24,16 +24,16 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" ) // So we can deterministically seed different blockchains @@ -1231,7 +1231,7 @@ func TestEIP161AccountRemoval(t *testing.T) { // tests that under weird reorg conditions the blockchain and its internal header- // chain return the same latest block/header. // -// https://github.com/ethereum/go-ethereum/pull/15941 +// https://github.com/zhigui-projects/go-ethereum/pull/15941 func TestBlockchainHeaderchainReorgConsistency(t *testing.T) { // Generate a canonical chain to act as the main dataset engine := ethash.NewFaker() diff --git a/core/blocks.go b/core/blocks.go index f20ba4aaf2..629a8daf60 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -16,7 +16,7 @@ package core -import "github.com/ethereum/go-ethereum/common" +import "github.com/zhigui-projects/go-ethereum/common" // BadHashes represent a set of manually tracked bad hashes (usually hard forks) var BadHashes = map[common.Hash]bool{ diff --git a/core/bloombits/generator.go b/core/bloombits/generator.go index 540085450d..b63f1a432a 100644 --- a/core/bloombits/generator.go +++ b/core/bloombits/generator.go @@ -19,7 +19,7 @@ package bloombits import ( "errors" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/types" ) // errSectionOutOfBounds is returned if the user tried to add more bloom filters diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go index f9bcef96e0..b85853f4d3 100644 --- a/core/bloombits/generator_test.go +++ b/core/bloombits/generator_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/types" ) // Tests that batched bloom bits are correctly rotated from the input bloom diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go index 8d78adb759..893fcc66f4 100644 --- a/core/bloombits/matcher.go +++ b/core/bloombits/matcher.go @@ -26,8 +26,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/common/bitutil" + "github.com/zhigui-projects/go-ethereum/crypto" ) // bloomIndexes represents the bit indexes inside the bloom filter that belong diff --git a/core/bloombits/matcher_test.go b/core/bloombits/matcher_test.go index 7a5f78ef3a..1d40460245 100644 --- a/core/bloombits/matcher_test.go +++ b/core/bloombits/matcher_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) const testSectionSize = 4096 @@ -82,7 +82,7 @@ func TestMatcherRandom(t *testing.T) { // Tests that the matcher can properly find matches if the starting block is // shifter from a multiple of 8. This is needed to cover an optimisation with -// bitset matching https://github.com/ethereum/go-ethereum/issues/15309. +// bitset matching https://github.com/zhigui-projects/go-ethereum/issues/15309. func TestMatcherShifted(t *testing.T) { // Block 0 always matches in the tests, skip ahead of first 8 blocks with the // start to get a potential zero byte in the matcher bitset. diff --git a/core/chain_indexer.go b/core/chain_indexer.go index 0b927116d0..92c6cdb76e 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -23,12 +23,12 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/log" ) // ChainIndexerBackend defines the methods needed to process chain segments in diff --git a/core/chain_indexer_test.go b/core/chain_indexer_test.go index 550caf5567..80202770db 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index c1e4b4264a..dfa52c0eac 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -20,14 +20,14 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/consensus/misc" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" ) // BlockGen creates blocks for testing. diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 5015d1f48e..2e5434668c 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -20,12 +20,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" ) func ExampleGenerateChain() { diff --git a/core/dao_test.go b/core/dao_test.go index 284b1d98bd..5b4e705482 100644 --- a/core/dao_test.go +++ b/core/dao_test.go @@ -20,10 +20,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/events.go b/core/events.go index 8d200f2a29..b2a7a605d2 100644 --- a/core/events.go +++ b/core/events.go @@ -17,8 +17,8 @@ package core import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" ) // NewTxsEvent is posted when a batch of transactions enter the transaction pool. diff --git a/core/evm.go b/core/evm.go index 596ea95fb7..1b3cbd60c4 100644 --- a/core/evm.go +++ b/core/evm.go @@ -19,10 +19,10 @@ package core import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/gen_genesis.go b/core/gen_genesis.go index bb8ea1d6a2..dbc1981061 100644 --- a/core/gen_genesis.go +++ b/core/gen_genesis.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/params" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index 64fb9b9248..d315ed8568 100644 --- a/core/gen_genesis_account.go +++ b/core/gen_genesis_account.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index 9190e2ba22..0d5986f067 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -25,16 +25,16 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" ) //go:generate gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go diff --git a/core/genesis_test.go b/core/genesis_test.go index 2d7f94f8f8..be3cd61969 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -22,12 +22,12 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" ) func TestDefaultGenesisBlock(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index da6716d679..5fe75da3a1 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -26,13 +26,13 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/params" "github.com/hashicorp/golang-lru" ) diff --git a/core/helper_test.go b/core/helper_test.go index 051384d854..8129088c93 100644 --- a/core/helper_test.go +++ b/core/helper_test.go @@ -19,9 +19,9 @@ package core import ( "container/list" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" ) // Implement our EthTest Manager diff --git a/core/mkalloc.go b/core/mkalloc.go index 565e8c5826..2ce4a16f2b 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -34,8 +34,8 @@ import ( "sort" "strconv" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/rlp" ) type allocItem struct{ Addr, Balance *big.Int } diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go index da54328326..48decfbe97 100644 --- a/core/rawdb/accessors_chain.go +++ b/core/rawdb/accessors_chain.go @@ -21,10 +21,10 @@ import ( "encoding/binary" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/rlp" ) // ReadCanonicalHash retrieves the hash assigned to a canonical block number. diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go index 9ddae6e2b5..a5c299dd81 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_test.go @@ -21,11 +21,11 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/rlp" ) // Tests block header storage and retrieval operations. diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go index 4ff7e5bd35..28658d4874 100644 --- a/core/rawdb/accessors_indexes.go +++ b/core/rawdb/accessors_indexes.go @@ -17,10 +17,10 @@ package rawdb import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/rlp" ) // ReadTxLookupEntry retrieves the positional metadata associated with a transaction diff --git a/core/rawdb/accessors_indexes_test.go b/core/rawdb/accessors_indexes_test.go index d9c10e1490..6b63ffe792 100644 --- a/core/rawdb/accessors_indexes_test.go +++ b/core/rawdb/accessors_indexes_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" ) // Tests that positional lookup metadata can be stored and retrieved. diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go index 514328e87b..48857362d7 100644 --- a/core/rawdb/accessors_metadata.go +++ b/core/rawdb/accessors_metadata.go @@ -19,10 +19,10 @@ package rawdb import ( "encoding/json" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" ) // ReadDatabaseVersion retrieves the version number of the database. diff --git a/core/rawdb/schema.go b/core/rawdb/schema.go index ef597ef309..1f3de04fc5 100644 --- a/core/rawdb/schema.go +++ b/core/rawdb/schema.go @@ -20,8 +20,8 @@ package rawdb import ( "encoding/binary" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/metrics" ) // The fields below define the low level database schema prefixing. diff --git a/core/state/database.go b/core/state/database.go index c1b630991c..29625dcd1e 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -20,9 +20,9 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/trie" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/state/dump.go b/core/state/dump.go index 072dbbf053..5af5144b88 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -20,9 +20,9 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/trie" ) type DumpAccount struct { diff --git a/core/state/iterator.go b/core/state/iterator.go index 6a5c73d3d1..a12e7aef0c 100644 --- a/core/state/iterator.go +++ b/core/state/iterator.go @@ -20,9 +20,9 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/trie" ) // NodeIterator is an iterator to traverse the entire state trie post-order, diff --git a/core/state/iterator_test.go b/core/state/iterator_test.go index 9e46c851cd..a93cd51d9f 100644 --- a/core/state/iterator_test.go +++ b/core/state/iterator_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/ethdb" ) // Tests that the node iterator indeed walks over the entire database contents. diff --git a/core/state/journal.go b/core/state/journal.go index a03ca57dbc..baf73f97e4 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -19,7 +19,7 @@ package state import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) // journalEntry is a modification entry in the state change journal that can be diff --git a/core/state/managed_state.go b/core/state/managed_state.go index 1390ef4a00..de1fc790db 100644 --- a/core/state/managed_state.go +++ b/core/state/managed_state.go @@ -19,7 +19,7 @@ package state import ( "sync" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) type account struct { diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go index 3d9c4e8676..2aa8a3410c 100644 --- a/core/state/managed_state_test.go +++ b/core/state/managed_state_test.go @@ -19,8 +19,8 @@ package state import ( "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/ethdb" ) var addr = common.BytesToAddress([]byte("test")) diff --git a/core/state/state_object.go b/core/state/state_object.go index 091d24184a..a837cd0575 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -22,9 +22,9 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/rlp" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index 123559ea9b..5f27d86739 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" checker "gopkg.in/check.v1" ) diff --git a/core/state/statedb.go b/core/state/statedb.go index 92d394ae32..2e0f4154dc 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -23,12 +23,12 @@ import ( "sort" "sync" - "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/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/trie" ) type revision struct { @@ -471,7 +471,7 @@ func (self *StateDB) Copy() *StateDB { } // Copy the dirty states, logs, and preimages for addr := range self.journal.dirties { - // As documented [here](https://github.com/ethereum/go-ethereum/pull/16485#issuecomment-380438527), + // As documented [here](https://github.com/zhigui-projects/go-ethereum/pull/16485#issuecomment-380438527), // and in the Finalise-method, there is a case where an object is in the journal but not // in the stateObjects: OOG after touch on ripeMD prior to Byzantium. Thus, we need to check for // nil diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index e2b349de86..1225d5e6d6 100644 --- a/core/state/statedb_test.go +++ b/core/state/statedb_test.go @@ -30,9 +30,9 @@ import ( check "gopkg.in/check.v1" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" ) // Tests that updating a state trie does not leak any database writes prior to @@ -119,7 +119,7 @@ func TestIntermediateLeaks(t *testing.T) { // TestCopy tests that copying a statedb object indeed makes the original and // the copy independent of each other. This test is a regression test against -// https://github.com/ethereum/go-ethereum/pull/15549. +// https://github.com/zhigui-projects/go-ethereum/pull/15549. func TestCopy(t *testing.T) { // Create a random state test to copy and modify "independently" orig, _ := New(common.Hash{}, NewDatabase(ethdb.NewMemDatabase())) @@ -422,7 +422,7 @@ func (s *StateSuite) TestTouchDelete(c *check.C) { } // TestCopyOfCopy tests that modified objects are carried over to the copy, and the copy of the copy. -// See https://github.com/ethereum/go-ethereum/pull/15225#issuecomment-380191512 +// See https://github.com/zhigui-projects/go-ethereum/pull/15225#issuecomment-380191512 func TestCopyOfCopy(t *testing.T) { sdb, _ := New(common.Hash{}, NewDatabase(ethdb.NewMemDatabase())) addr := common.HexToAddress("aaaa") diff --git a/core/state/sync.go b/core/state/sync.go index c566e79073..5180d76ccb 100644 --- a/core/state/sync.go +++ b/core/state/sync.go @@ -19,9 +19,9 @@ package state import ( "bytes" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index 3177401608..0e33382340 100644 --- a/core/state/sync_test.go +++ b/core/state/sync_test.go @@ -21,10 +21,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/trie" ) // testAccount is the data associated with an account used by the state tests. diff --git a/core/state_processor.go b/core/state_processor.go index 8e238ce1f0..6cd6b93555 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -17,14 +17,14 @@ package core import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/consensus/misc" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/params" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/state_transition.go b/core/state_transition.go index 5654cd01ea..a0d4348a79 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -21,10 +21,10 @@ import ( "math" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/params" ) var ( diff --git a/core/tx_cacher.go b/core/tx_cacher.go index 6d989c83d9..bae7dd1486 100644 --- a/core/tx_cacher.go +++ b/core/tx_cacher.go @@ -19,7 +19,7 @@ package core import ( "runtime" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/types" ) // senderCacher is a concurrent tranaction sender recoverer anc cacher. diff --git a/core/tx_journal.go b/core/tx_journal.go index 1397e9fd34..5bdd73fde6 100644 --- a/core/tx_journal.go +++ b/core/tx_journal.go @@ -21,10 +21,10 @@ import ( "io" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/rlp" ) // errNoActiveJournal is returned if a transaction is attempted to be inserted diff --git a/core/tx_list.go b/core/tx_list.go index 287dda4c33..a9843afbf5 100644 --- a/core/tx_list.go +++ b/core/tx_list.go @@ -22,9 +22,9 @@ import ( "math/big" "sort" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/log" ) // nonceHeap is a heap.Interface implementation over 64bit unsigned integers for diff --git a/core/tx_list_test.go b/core/tx_list_test.go index d579f501af..3d7156ddb1 100644 --- a/core/tx_list_test.go +++ b/core/tx_list_test.go @@ -20,8 +20,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" ) // Tests that transactions can be added to strict lists and list contents and diff --git a/core/tx_pool.go b/core/tx_pool.go index 9c958e3b6f..854d49eafb 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/params" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 5a59205442..5d97e7b57d 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/params" ) // testTxPoolConfig is a transaction pool configuration without stateful disk diff --git a/core/types.go b/core/types.go index d0bbaf0aa7..855108f6b4 100644 --- a/core/types.go +++ b/core/types.go @@ -17,9 +17,9 @@ package core import ( - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" ) // Validator is an interface which defines the standard for block validation. It diff --git a/core/types/block.go b/core/types/block.go index ae1b4299d3..82408528f5 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -26,10 +26,10 @@ import ( "time" "unsafe" - "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/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/rlp" ) var ( diff --git a/core/types/block_test.go b/core/types/block_test.go index a35fbc25b1..2c59a0a283 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -23,8 +23,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index a76b6f33c5..30752ef20b 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index a28ac0e7af..f1b41c4633 100644 --- a/core/types/bloom9_test.go +++ b/core/types/bloom9_test.go @@ -54,7 +54,7 @@ func TestBloom(t *testing.T) { import ( "testing" - "github.com/ethereum/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go index 00c42c5bc6..c8793b7b60 100644 --- a/core/types/derive_sha.go +++ b/core/types/derive_sha.go @@ -19,9 +19,9 @@ package types import ( "bytes" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/trie" ) type DerivableList interface { diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 1b92cd9cf4..1d3acbca02 100644 --- a/core/types/gen_header_json.go +++ b/core/types/gen_header_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) var _ = (*headerMarshaling)(nil) diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 1b5ae3c653..2d63c756e9 100644 --- a/core/types/gen_log_json.go +++ b/core/types/gen_log_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index 5c807a4ccb..78565734a7 100644 --- a/core/types/gen_receipt_json.go +++ b/core/types/gen_receipt_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go index c27da67096..4bd6b5f67f 100644 --- a/core/types/gen_tx_json.go +++ b/core/types/gen_tx_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) var _ = (*txdataMarshaling)(nil) diff --git a/core/types/log.go b/core/types/log.go index b629b47ed5..0ab1b516e9 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -19,9 +19,9 @@ package types import ( "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/rlp" ) //go:generate gencodec -type Log -field-override logMarshaling -out gen_log_json.go diff --git a/core/types/log_test.go b/core/types/log_test.go index 0e56acfe4a..223886f23d 100644 --- a/core/types/log_test.go +++ b/core/types/log_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index 3d1fc95aab..4d0d3d3a03 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -22,9 +22,9 @@ import ( "io" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/rlp" ) //go:generate gencodec -type Receipt -field-override receiptMarshaling -out gen_receipt_json.go diff --git a/core/types/transaction.go b/core/types/transaction.go index b824a77f61..98e7b319ca 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -23,10 +23,10 @@ import ( "math/big" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/rlp" ) //go:generate gencodec -type txdata -field-override txdataMarshaling -out gen_tx_json.go diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index c195d23a32..862aa468be 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -22,9 +22,9 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/params" ) var ( diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 689fc38a9b..ff62414e7b 100644 --- a/core/types/transaction_signing_test.go +++ b/core/types/transaction_signing_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index b390f45c67..a7bf149a10 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -23,9 +23,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/vm/analysis.go b/core/vm/analysis.go index f9c4298d39..6db748ace5 100644 --- a/core/vm/analysis.go +++ b/core/vm/analysis.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) // destinations stores one map per contract (keyed by hash of code). diff --git a/core/vm/common.go b/core/vm/common.go index 17de38decb..c8db97ff3e 100644 --- a/core/vm/common.go +++ b/core/vm/common.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" ) // calculates the memory size required for a step diff --git a/core/vm/contract.go b/core/vm/contract.go index b466681dbd..33ab14706a 100644 --- a/core/vm/contract.go +++ b/core/vm/contract.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 237450ea96..c51ccfdc58 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -21,11 +21,11 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/bn256" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto/bn256" + "github.com/zhigui-projects/go-ethereum/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 96083337c9..0f69241204 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -21,7 +21,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/evm.go b/core/vm/evm.go index 69c8ec4787..5a7b16b454 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/params" ) // emptyCodeHash is used by create to ensure deployment is disallowed to already diff --git a/core/vm/gas.go b/core/vm/gas.go index bba7058c7e..d269b516c9 100644 --- a/core/vm/gas.go +++ b/core/vm/gas.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/params" ) // Gas costs diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 0764c67a4d..630baebf2b 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -17,9 +17,9 @@ package vm import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/params" ) // memoryGasCosts calculates the quadratic gas for memory expansion. It does so diff --git a/core/vm/gen_structlog.go b/core/vm/gen_structlog.go index ade3ca6318..68db60f02d 100644 --- a/core/vm/gen_structlog.go +++ b/core/vm/gen_structlog.go @@ -6,9 +6,9 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" ) var _ = (*structLogMarshaling)(nil) diff --git a/core/vm/instructions.go b/core/vm/instructions.go index 1ec13ba35f..0da23162bf 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -21,11 +21,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/params" ) var ( diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 1643da9679..ed986fb4c3 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/params" ) type twoOperandTest struct { diff --git a/core/vm/interface.go b/core/vm/interface.go index 1ef91cf1d6..2ec9af21ef 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index 0d6038cbbf..47766a57ce 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -20,8 +20,8 @@ import ( "fmt" "sync/atomic" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/params" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index 111a9b7981..e2b89e8477 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index 85acb8d6d3..3cf572667c 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -23,10 +23,10 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/core/types" ) // Storage represents a contract's storage. diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index 28830c445c..a3c07d0670 100644 --- a/core/vm/logger_test.go +++ b/core/vm/logger_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/params" ) type dummyContractRef struct { diff --git a/core/vm/memory.go b/core/vm/memory.go index 722862b1de..d49eb6771e 100644 --- a/core/vm/memory.go +++ b/core/vm/memory.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/common/math" ) // Memory implements a simple memory model for the ethereum virtual machine. diff --git a/core/vm/memory_table.go b/core/vm/memory_table.go index ab49ebb38b..e65fe65aa7 100644 --- a/core/vm/memory_table.go +++ b/core/vm/memory_table.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/common/math" ) func memorySha3(stack *Stack) *big.Int { diff --git a/core/vm/noop.go b/core/vm/noop.go index b71ead0d77..74e6388016 100644 --- a/core/vm/noop.go +++ b/core/vm/noop.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" ) func NoopCanTransfer(db StateDB, from common.Address, balance *big.Int) bool { diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index 31c9b9cf9d..c0ab2f7477 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -17,9 +17,9 @@ package runtime import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index cda49a34b4..e7a84998b4 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -21,12 +21,12 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" ) // Config is a basic type specifying certain configuration flags for running diff --git a/core/vm/runtime/runtime_example_test.go b/core/vm/runtime/runtime_example_test.go index b7d0ddc384..a8081f2a08 100644 --- a/core/vm/runtime/runtime_example_test.go +++ b/core/vm/runtime/runtime_example_test.go @@ -19,8 +19,8 @@ package runtime_test import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm/runtime" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index ef664bda30..845b7ce23d 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -21,11 +21,11 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/accounts/abi" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/ethdb" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index a4b1cfcd89..3e4210a1ef 100644 --- a/core/vm/stack_table.go +++ b/core/vm/stack_table.go @@ -19,7 +19,7 @@ package vm import ( "fmt" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/params" ) func makeStackFunc(pop, push int) stackValidationFunc { diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go index a8dfa8f67d..333e32db00 100644 --- a/crypto/bn256/bn256_fast.go +++ b/crypto/bn256/bn256_fast.go @@ -19,7 +19,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" +import "github.com/zhigui-projects/go-ethereum/crypto/bn256/cloudflare" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/crypto/bn256/bn256_fuzz.go b/crypto/bn256/bn256_fuzz.go index f360b0541f..6e43f1db2b 100644 --- a/crypto/bn256/bn256_fuzz.go +++ b/crypto/bn256/bn256_fuzz.go @@ -22,8 +22,8 @@ import ( "bytes" "math/big" - cloudflare "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" - google "github.com/ethereum/go-ethereum/crypto/bn256/google" + cloudflare "github.com/zhigui-projects/go-ethereum/crypto/bn256/cloudflare" + google "github.com/zhigui-projects/go-ethereum/crypto/bn256/google" ) // FuzzAdd fuzzez bn256 addition between the Google and Cloudflare libraries. diff --git a/crypto/bn256/bn256_slow.go b/crypto/bn256/bn256_slow.go index 61373763b8..d52c5983d2 100644 --- a/crypto/bn256/bn256_slow.go +++ b/crypto/bn256/bn256_slow.go @@ -19,7 +19,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import "github.com/ethereum/go-ethereum/crypto/bn256/google" +import "github.com/zhigui-projects/go-ethereum/crypto/bn256/google" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/crypto/crypto.go b/crypto/crypto.go index 619440e817..5448987a62 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -28,10 +28,10 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/rlp" ) var ( diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 177c19c0cf..f954ec267b 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -26,8 +26,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index f33f204d5b..2a345a10ad 100644 --- a/crypto/ecies/ecies_test.go +++ b/crypto/ecies/ecies_test.go @@ -40,7 +40,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto" ) var dumpEnc bool diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 6312daf5a1..2d0ffef402 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -42,7 +42,7 @@ import ( "fmt" "hash" - ethcrypto "github.com/ethereum/go-ethereum/crypto" + ethcrypto "github.com/zhigui-projects/go-ethereum/crypto" ) var ( diff --git a/crypto/secp256k1/curve.go b/crypto/secp256k1/curve.go index 6fdf2be6a4..93b32b604c 100644 --- a/crypto/secp256k1/curve.go +++ b/crypto/secp256k1/curve.go @@ -36,7 +36,7 @@ import ( "math/big" "unsafe" - "github.com/ethereum/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/common/math" ) /* diff --git a/crypto/secp256k1/secp256_test.go b/crypto/secp256k1/secp256_test.go index b608bcfcf1..484c0fdd07 100644 --- a/crypto/secp256k1/secp256_test.go +++ b/crypto/secp256k1/secp256_test.go @@ -24,8 +24,8 @@ import ( "encoding/hex" "testing" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/randentropy" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/crypto/randentropy" ) const TestCount = 1000 diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index 340bfc221e..84b09dfa3a 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -23,8 +23,8 @@ import ( "crypto/elliptic" "fmt" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/crypto/secp256k1" ) // Ecrecover returns the uncompressed public key that created the given signature. diff --git a/crypto/signature_test.go b/crypto/signature_test.go index aecff76bfb..0b7de79be4 100644 --- a/crypto/signature_test.go +++ b/crypto/signature_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" ) var ( diff --git a/dashboard/assets.go b/dashboard/assets.go index 521d134a6a..9e1e1fbbdf 100644 --- a/dashboard/assets.go +++ b/dashboard/assets.go @@ -31423,7 +31423,7 @@ var _bundleJs = []byte((((((((((`!function(modules) { }, _react2.default.createElement("span", { style: _common.styles.light }, "Commit "), _react2.default.createElement("a", { - href: "https://github.com/ethereum/go-ethereum/commit/" + general.commit, + href: "https://github.com/zhigui-projects/go-ethereum/commit/" + general.commit, target: "_blank", style: { color: "inherit", diff --git a/dashboard/cpu.go b/dashboard/cpu.go index c89879028d..d793d0484c 100644 --- a/dashboard/cpu.go +++ b/dashboard/cpu.go @@ -21,7 +21,7 @@ package dashboard import ( "syscall" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // getProcessCPUTime retrieves the process' CPU time since program startup. diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go index 399fa34c08..304130ffa9 100644 --- a/dashboard/dashboard.go +++ b/dashboard/dashboard.go @@ -33,11 +33,11 @@ import ( "time" "github.com/elastic/gosigar" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rpc" "golang.org/x/net/websocket" ) diff --git a/eth/api.go b/eth/api.go index 0b6da456f6..8fac514910 100644 --- a/eth/api.go +++ b/eth/api.go @@ -26,19 +26,19 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/internal/ethapi" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/miner" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/trie" ) // PublicEthereumAPI provides an API to access Ethereum full node-related diff --git a/eth/api_backend.go b/eth/api_backend.go index 016087dfe8..c1ab799b91 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -20,21 +20,21 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/bloombits" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/eth/gasprice" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rpc" ) // EthAPIBackend implements ethapi.Backend for full nodes diff --git a/eth/api_test.go b/eth/api_test.go index 47b062a40c..6284a45e59 100644 --- a/eth/api_test.go +++ b/eth/api_test.go @@ -21,9 +21,9 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/ethdb" ) var dumper = spew.ConfigState{Indent: " "} diff --git a/eth/api_tracer.go b/eth/api_tracer.go index 623e5ed1bd..057aabc9a1 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -26,19 +26,19 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/eth/tracers" + "github.com/zhigui-projects/go-ethereum/internal/ethapi" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/trie" ) const ( diff --git a/eth/backend.go b/eth/backend.go index a18abdfb56..9eef726128 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -25,30 +25,30 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/consensus/clique" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/bloombits" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/eth/filters" + "github.com/zhigui-projects/go-ethereum/eth/gasprice" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/internal/ethapi" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/miner" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/rpc" ) type LesServer interface { diff --git a/eth/bloombits.go b/eth/bloombits.go index 954239d141..692e9fff9c 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -19,14 +19,14 @@ package eth import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/bitutil" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/bloombits" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" ) const ( diff --git a/eth/config.go b/eth/config.go index 426d2bf1ef..8f343598ad 100644 --- a/eth/config.go +++ b/eth/config.go @@ -24,13 +24,13 @@ import ( "runtime" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/eth/gasprice" + "github.com/zhigui-projects/go-ethereum/params" ) // DefaultConfig contains default settings for use on the Ethereum main net. diff --git a/eth/downloader/api.go b/eth/downloader/api.go index 91c6322d41..ddbdbdbe97 100644 --- a/eth/downloader/api.go +++ b/eth/downloader/api.go @@ -20,9 +20,9 @@ import ( "context" "sync" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/zhigui-projects/go-ethereum" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/rpc" ) // PublicDownloaderAPI provides an API which gives information about the current synchronisation status. diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index fbde9c6caa..4f08113ab3 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -25,15 +25,15 @@ import ( "sync/atomic" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + ethereum "github.com/zhigui-projects/go-ethereum" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/params" ) var ( diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index d1a9a8694b..1fdece14c9 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -25,15 +25,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/trie" ) var ( diff --git a/eth/downloader/fakepeer.go b/eth/downloader/fakepeer.go index 59832facaa..ffafd7a9fd 100644 --- a/eth/downloader/fakepeer.go +++ b/eth/downloader/fakepeer.go @@ -19,11 +19,11 @@ package downloader import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" ) // FakePeer is a mock downloader peer that operates on a local database instance diff --git a/eth/downloader/metrics.go b/eth/downloader/metrics.go index d4eb337946..b2ee07d1c6 100644 --- a/eth/downloader/metrics.go +++ b/eth/downloader/metrics.go @@ -19,7 +19,7 @@ package downloader import ( - "github.com/ethereum/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index 428a60f8a1..b55b6dff03 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -29,9 +29,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/log" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index 984dd13d68..dcd6763cc5 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -25,10 +25,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/metrics" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index 8d33dfec74..62526cded9 100644 --- a/eth/downloader/statesync.go +++ b/eth/downloader/statesync.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/trie" ) // stateReq represents a batch of state fetch requests grouped together into diff --git a/eth/downloader/types.go b/eth/downloader/types.go index ff70bfa0e3..175ae46caf 100644 --- a/eth/downloader/types.go +++ b/eth/downloader/types.go @@ -19,7 +19,7 @@ package downloader import ( "fmt" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/types" ) // peerDropFn is a callback type for dropping a peer detected as malicious. diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go index 6383596dce..6d6c4b6989 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -22,10 +22,10 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/log" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index 3d4f0d1e59..aca722a2a5 100644 --- a/eth/fetcher/fetcher_test.go +++ b/eth/fetcher/fetcher_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" ) var ( diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go index d68d12f000..f1b53326db 100644 --- a/eth/fetcher/metrics.go +++ b/eth/fetcher/metrics.go @@ -19,7 +19,7 @@ package fetcher import ( - "github.com/ethereum/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/metrics" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index 592ad3b82f..e8c2f54ec7 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -25,13 +25,13 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/zhigui-projects/go-ethereum" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/rpc" ) var ( diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 02229a7549..5b51551440 100644 --- a/eth/filters/api_test.go +++ b/eth/filters/api_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index faffaa70b7..8bc71f5c9d 100644 --- a/eth/filters/bench_test.go +++ b/eth/filters/bench_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/bitutil" + "github.com/zhigui-projects/go-ethereum/core/bloombits" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 7000d74fa4..7c5c572b1f 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -20,13 +20,13 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/bloombits" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/rpc" ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index 4e999cda85..bbf4934510 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,14 +25,14 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/zhigui-projects/go-ethereum" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/rpc" ) // Type determines the kind of filter and is used to put the filter in to diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index ff1af85a80..cac795da98 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -25,17 +25,17 @@ import ( "testing" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/zhigui-projects/go-ethereum" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/bloombits" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rpc" ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index ccabe955cf..8021bca85b 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -23,15 +23,15 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/params" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 54325692c6..697e6f4880 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -22,11 +22,11 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/internal/ethapi" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rpc" ) var maxPrice = big.NewInt(500 * params.Shannon) diff --git a/eth/gen_config.go b/eth/gen_config.go index 4f2e82d941..dfb2072cba 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -5,12 +5,12 @@ package eth import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/eth/gasprice" ) var _ = (*configMarshaling)(nil) diff --git a/eth/handler.go b/eth/handler.go index f2d2eaf1c7..81f3dc7b50 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -26,20 +26,20 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/fetcher" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/consensus/misc" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/eth/fetcher" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" ) const ( diff --git a/eth/handler_test.go b/eth/handler_test.go index fee4114eb6..a6375bd92f 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -23,18 +23,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/params" ) // Tests that protocol versions and modes of operations are matched up properly. diff --git a/eth/helper_test.go b/eth/helper_test.go index 3d2ab0aba1..b29413ea17 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -27,18 +27,18 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/params" ) var ( diff --git a/eth/metrics.go b/eth/metrics.go index 0533a2a875..1e4080158e 100644 --- a/eth/metrics.go +++ b/eth/metrics.go @@ -17,8 +17,8 @@ package eth import ( - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/p2p" ) var ( diff --git a/eth/peer.go b/eth/peer.go index 953aca17b9..e9e4ec49aa 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rlp" "gopkg.in/fatih/set.v0" ) diff --git a/eth/protocol.go b/eth/protocol.go index 0e90e6a2ef..d932c8a724 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -21,11 +21,11 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocol_test.go b/eth/protocol_test.go index aa43dfa920..249a110d2b 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rlp" ) func init() { diff --git a/eth/sync.go b/eth/sync.go index e49e40087e..d0149cd44f 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -21,11 +21,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p/discover" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index 88c10c7f74..a731eafb0d 100644 --- a/eth/sync_test.go +++ b/eth/sync_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" ) // Tests that fast sync gets disabled as soon as a real block is successfully diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index 4cec9e633c..772f7c2e71 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -25,11 +25,11 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" duktape "gopkg.in/olebedev/go-duktape.v3" ) diff --git a/eth/tracers/tracer_test.go b/eth/tracers/tracer_test.go index 117c376b81..ba48cf901a 100644 --- a/eth/tracers/tracer_test.go +++ b/eth/tracers/tracer_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/params" ) type account struct{} diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index 4e1ef23ad2..930b702560 100644 --- a/eth/tracers/tracers.go +++ b/eth/tracers/tracers.go @@ -21,7 +21,7 @@ import ( "strings" "unicode" - "github.com/ethereum/go-ethereum/eth/tracers/internal/tracers" + "github.com/zhigui-projects/go-ethereum/eth/tracers/internal/tracers" ) // all contains all the built in JavaScript tracers by name. diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go index d25fc459a1..d1c68a7afb 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -25,15 +25,15 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/tests" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/tests" ) // To generate a new callTracer test, copy paste the makeTest method below into diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index b40837c8cc..c5059b4027 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -24,12 +24,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index 178eb2be98..edf7195aba 100644 --- a/ethclient/ethclient_test.go +++ b/ethclient/ethclient_test.go @@ -16,7 +16,7 @@ package ethclient -import "github.com/ethereum/go-ethereum" +import "github.com/zhigui-projects/go-ethereum" // Verify that Client implements the ethereum interfaces. var ( diff --git a/ethclient/signer.go b/ethclient/signer.go index 74a93f1e2f..a0c3574936 100644 --- a/ethclient/signer.go +++ b/ethclient/signer.go @@ -20,8 +20,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" ) // senderFromServer is a types.Signer that remembers the sender address returned by the RPC diff --git a/ethdb/database.go b/ethdb/database.go index e32c912f93..1d164d2e86 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/filter" diff --git a/ethdb/database_test.go b/ethdb/database_test.go index 2deb50988c..94126ada2c 100644 --- a/ethdb/database_test.go +++ b/ethdb/database_test.go @@ -25,7 +25,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/ethdb" ) func newTestLDB() (*ethdb.LDBDatabase, func()) { diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go index f28ff54818..9f77e19baa 100644 --- a/ethdb/memory_database.go +++ b/ethdb/memory_database.go @@ -20,7 +20,7 @@ import ( "errors" "sync" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) /* diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index 9f3d7237e9..3a02947469 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -30,17 +30,17 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/mclock" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/eth" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/les" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rpc" "golang.org/x/net/websocket" ) diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 9b5ad50df5..9ab6a875ac 100644 --- a/event/example_feed_test.go +++ b/event/example_feed_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/ethereum/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index 825a8deeac..a43bbea1ef 100644 --- a/event/example_scope_test.go +++ b/event/example_scope_test.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/event" ) // This example demonstrates how SubscriptionScope can be used to control the lifetime of diff --git a/event/example_subscription_test.go b/event/example_subscription_test.go index 5c76b55d98..026e43c890 100644 --- a/event/example_subscription_test.go +++ b/event/example_subscription_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/ethereum/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index d03f465075..0077758d22 100644 --- a/event/subscription.go +++ b/event/subscription.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/zhigui-projects/go-ethereum/common/mclock" ) // Subscription represents a stream of events. The carrier of the events is typically a diff --git a/interfaces.go b/interfaces.go index a8b48c93d7..f77ef823ce 100644 --- a/interfaces.go +++ b/interfaces.go @@ -22,8 +22,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" ) // NotFound is returned by API methods if the requested item does not exist. diff --git a/internal/debug/api.go b/internal/debug/api.go index 86a4218f6a..cc17bb334a 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -34,7 +34,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 5eb58e9eef..2f9758512b 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -24,10 +24,10 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/log/term" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/exp" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log/term" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/metrics/exp" "github.com/fjl/memsize/memsizeui" colorable "github.com/mattn/go-colorable" "gopkg.in/urfave/cli.v1" diff --git a/internal/debug/trace.go b/internal/debug/trace.go index cab5deaafd..531d15e97c 100644 --- a/internal/debug/trace.go +++ b/internal/debug/trace.go @@ -23,7 +23,7 @@ import ( "os" "runtime/trace" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index 61ddff688c..70939c8019 100644 --- a/internal/ethapi/addrlock.go +++ b/internal/ethapi/addrlock.go @@ -19,7 +19,7 @@ package ethapi import ( "sync" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index a465a59046..0201cb8552 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -26,22 +26,22 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/accounts/keystore" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/rpc" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) @@ -424,7 +424,7 @@ func signHash(data []byte) []byte { // // The key used to calculate the signature is decrypted with the given password. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_sign +// https://github.com/zhigui-projects/go-ethereum/wiki/Management-APIs#personal_sign func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr common.Address, passwd string) (hexutil.Bytes, error) { // Look up the wallet containing the requested signer account := accounts.Account{Address: addr} @@ -451,7 +451,7 @@ func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr c // Note, the signature must conform to the secp256k1 curve R, S and V values, where // the V value must be be 27 or 28 for legacy reasons. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_ecRecover +// https://github.com/zhigui-projects/go-ethereum/wiki/Management-APIs#personal_ecRecover func (s *PrivateAccountAPI) EcRecover(ctx context.Context, data, sig hexutil.Bytes) (common.Address, error) { if len(sig) != 65 { return common.Address{}, fmt.Errorf("signature must be 65 bytes long") diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index c9ffe230c6..f774263f17 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -21,17 +21,17 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rpc" ) // Backend interface provides the common API services (that are provided by diff --git a/internal/guide/guide_test.go b/internal/guide/guide_test.go index 9c7ad16d18..aee0283f84 100644 --- a/internal/guide/guide_test.go +++ b/internal/guide/guide_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/accounts/keystore" + "github.com/zhigui-projects/go-ethereum/core/types" ) // Tests that the account management snippets work correctly. diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index 4c7664f1cc..6326b6bc34 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -26,8 +26,8 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/jsre/deps" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/internal/jsre/deps" "github.com/robertkrimen/otto" ) diff --git a/les/api_backend.go b/les/api_backend.go index dea33c4702..7b0c1550dc 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -20,22 +20,22 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/bloombits" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/eth/gasprice" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/light" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rpc" ) type LesApiBackend struct { diff --git a/les/backend.go b/les/backend.go index 35f67f29f8..e19a9aaa0a 100644 --- a/les/backend.go +++ b/les/backend.go @@ -22,28 +22,28 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - rpc "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/bloombits" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/eth" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/eth/filters" + "github.com/zhigui-projects/go-ethereum/eth/gasprice" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/internal/ethapi" + "github.com/zhigui-projects/go-ethereum/light" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discv5" + "github.com/zhigui-projects/go-ethereum/params" + rpc "github.com/zhigui-projects/go-ethereum/rpc" ) type LightEthereum struct { diff --git a/les/bloombits.go b/les/bloombits.go index 2871a90064..5e0f2b5c37 100644 --- a/les/bloombits.go +++ b/les/bloombits.go @@ -19,8 +19,8 @@ package les import ( "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/light" + "github.com/zhigui-projects/go-ethereum/common/bitutil" + "github.com/zhigui-projects/go-ethereum/light" ) const ( diff --git a/les/fetcher.go b/les/fetcher.go index cc539c42bf..93ae19f7b4 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/mclock" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/light" + "github.com/zhigui-projects/go-ethereum/log" ) const ( diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index d50eb809cc..b79180f571 100644 --- a/les/flowcontrol/control.go +++ b/les/flowcontrol/control.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/zhigui-projects/go-ethereum/common/mclock" ) const fcTimeConst = time.Millisecond diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go index 28cc6f0fe7..c99bcc9fff 100644 --- a/les/flowcontrol/manager.go +++ b/les/flowcontrol/manager.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/zhigui-projects/go-ethereum/common/mclock" ) const rcConst = 1000000 diff --git a/les/handler.go b/les/handler.go index a1c16cb875..1116132a5d 100644 --- a/les/handler.go +++ b/les/handler.go @@ -27,23 +27,23 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/light" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/discv5" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/trie" ) const ( diff --git a/les/handler_test.go b/les/handler_test.go index 31aad3ed45..301978f73e 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -23,19 +23,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/light" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/trie" ) func expectResponse(r p2p.MsgReader, msgcode, reqID, bv uint64, data interface{}) error { diff --git a/les/helper_test.go b/les/helper_test.go index 8fd01a39e0..5f8942b2ef 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -25,20 +25,20 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/eth" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/les/flowcontrol" + "github.com/zhigui-projects/go-ethereum/light" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/params" ) var ( diff --git a/les/metrics.go b/les/metrics.go index c282a62a1a..e6bc3f7e09 100644 --- a/les/metrics.go +++ b/les/metrics.go @@ -17,8 +17,8 @@ package les import ( - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index f8412aaad7..71c5d5a324 100644 --- a/les/odr.go +++ b/les/odr.go @@ -19,10 +19,10 @@ package les import ( "context" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/light" + "github.com/zhigui-projects/go-ethereum/log" ) // LesOdr implements light.OdrBackend diff --git a/les/odr_requests.go b/les/odr_requests.go index 075fcd92ca..9dd1b8fc53 100644 --- a/les/odr_requests.go +++ b/les/odr_requests.go @@ -23,15 +23,15 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/light" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/trie" ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index 983f7262b0..1602efb213 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -23,18 +23,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/eth" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/light" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" ) type odrTestFn func(ctx context.Context, db ethdb.Database, config *params.ChainConfig, bc *core.BlockChain, lc *light.LightChain, bhash common.Hash) []byte diff --git a/les/peer.go b/les/peer.go index eb7452e276..fb5d8eab14 100644 --- a/les/peer.go +++ b/les/peer.go @@ -26,13 +26,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/eth" + "github.com/zhigui-projects/go-ethereum/les/flowcontrol" + "github.com/zhigui-projects/go-ethereum/light" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rlp" ) var ( diff --git a/les/protocol.go b/les/protocol.go index ee4c223988..bc2888e156 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -26,12 +26,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto/secp256k1" + "github.com/zhigui-projects/go-ethereum/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/request_test.go b/les/request_test.go index ba2f603d8b..32a8c12157 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/eth" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/light" ) var testBankSecureTrieKey = secAddr(testBankAddress) diff --git a/les/retrieve.go b/les/retrieve.go index a9037a38ef..87d2ff0edb 100644 --- a/les/retrieve.go +++ b/les/retrieve.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/zhigui-projects/go-ethereum/common/mclock" ) var ( diff --git a/les/server.go b/les/server.go index fca6124c9c..5cb03a0c70 100644 --- a/les/server.go +++ b/les/server.go @@ -23,18 +23,18 @@ import ( "math" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/eth" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/les/flowcontrol" + "github.com/zhigui-projects/go-ethereum/light" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discv5" + "github.com/zhigui-projects/go-ethereum/rlp" ) type LesServer struct { diff --git a/les/serverpool.go b/les/serverpool.go index 1a4c752293..33a38c8c61 100644 --- a/les/serverpool.go +++ b/les/serverpool.go @@ -27,13 +27,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common/mclock" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/discv5" + "github.com/zhigui-projects/go-ethereum/rlp" ) const ( diff --git a/les/sync.go b/les/sync.go index 1ac6455852..9e381303bd 100644 --- a/les/sync.go +++ b/les/sync.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/light" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/light" ) // syncer is responsible for periodically synchronising with the network, both diff --git a/les/txrelay.go b/les/txrelay.go index 7a02cc837e..b4bd538955 100644 --- a/les/txrelay.go +++ b/les/txrelay.go @@ -19,8 +19,8 @@ package les import ( "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" ) type ltrInfo struct { diff --git a/light/lightchain.go b/light/lightchain.go index 30b9bd89a6..e43c83cc25 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -24,17 +24,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" "github.com/hashicorp/golang-lru" ) diff --git a/light/lightchain_test.go b/light/lightchain_test.go index c0aa51da29..e00949b17d 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -21,13 +21,13 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" ) // So we can deterministically seed different blockchains diff --git a/light/nodeset.go b/light/nodeset.go index 6f25219c13..6f0a911705 100644 --- a/light/nodeset.go +++ b/light/nodeset.go @@ -20,10 +20,10 @@ import ( "errors" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/rlp" ) // NodeSet stores a set of trie nodes. It implements trie.Database and can also diff --git a/light/odr.go b/light/odr.go index 8f1e50b817..15e2c4e2cd 100644 --- a/light/odr.go +++ b/light/odr.go @@ -22,11 +22,11 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" ) // NoOdr is the default context passed to an ODR capable function when the ODR diff --git a/light/odr_test.go b/light/odr_test.go index 3e7ac10118..a69cd77453 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -24,19 +24,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/trie" ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index 620af63835..0469aea487 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -20,12 +20,12 @@ import ( "bytes" "context" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/rlp" ) var sha3_nil = crypto.Keccak256Hash(nil) diff --git a/light/postprocess.go b/light/postprocess.go index 2090a9d044..c90f12f401 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -22,16 +22,16 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/bitutil" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/trie" ) const ( diff --git a/light/trie.go b/light/trie.go index c07e99461c..90a2db717e 100644 --- a/light/trie.go +++ b/light/trie.go @@ -21,12 +21,12 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/trie" ) func NewState(ctx context.Context, head *types.Header, odr OdrBackend) *state.StateDB { diff --git a/light/trie_test.go b/light/trie_test.go index 84c6f162fb..f67cfba7c3 100644 --- a/light/trie_test.go +++ b/light/trie_test.go @@ -23,13 +23,13 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/trie" ) func TestNodeIterator(t *testing.T) { diff --git a/light/txpool.go b/light/txpool.go index 767a797bdc..be44382388 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -22,16 +22,16 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/rawdb" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" ) const ( diff --git a/light/txpool_test.go b/light/txpool_test.go index ccbd83a943..7d935d17f6 100644 --- a/light/txpool_test.go +++ b/light/txpool_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" ) type testTxRelay struct { diff --git a/log/format.go b/log/format.go index 0d4732cc0f..0fe0bddb53 100644 --- a/log/format.go +++ b/log/format.go @@ -22,7 +22,7 @@ const ( // locationTrims are trimmed for display to avoid unwieldy log lines. var locationTrims = []string{ - "github.com/ethereum/go-ethereum/", + "github.com/zhigui-projects/go-ethereum/", } // PrintOrigins sets or unsets log location (file:line) printing for terminal diff --git a/metrics/exp/exp.go b/metrics/exp/exp.go index 625ffd4e8a..c7d0741cd2 100644 --- a/metrics/exp/exp.go +++ b/metrics/exp/exp.go @@ -8,7 +8,7 @@ import ( "net/http" "sync" - "github.com/ethereum/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/metrics" ) type exp struct { diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go index 31a5c21b5f..db6ced484c 100644 --- a/metrics/influxdb/influxdb.go +++ b/metrics/influxdb/influxdb.go @@ -5,8 +5,8 @@ import ( uurl "net/url" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/metrics" "github.com/influxdata/influxdb/client" ) diff --git a/metrics/librato/librato.go b/metrics/librato/librato.go index 2138e01ae8..52006f1e1b 100644 --- a/metrics/librato/librato.go +++ b/metrics/librato/librato.go @@ -7,7 +7,7 @@ import ( "regexp" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/metrics" ) // a regexp for extracting the unit from time.Duration.String diff --git a/metrics/metrics.go b/metrics/metrics.go index 2356f2b148..5cd422a0af 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // Enabled is checked by the constructor functions for all of the diff --git a/miner/agent.go b/miner/agent.go index e3cebbd2e2..23673bfd55 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -21,8 +21,8 @@ import ( "sync/atomic" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/log" ) type CpuAgent struct { diff --git a/miner/miner.go b/miner/miner.go index d9256e9787..7230e2d39a 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -21,17 +21,17 @@ import ( "fmt" "sync/atomic" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/params" ) // Backend wraps all methods required for mining. diff --git a/miner/remote_agent.go b/miner/remote_agent.go index 287e7530c3..854726ae81 100644 --- a/miner/remote_agent.go +++ b/miner/remote_agent.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/log" ) type hashrate struct { diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index 7a4fc7cc5a..aa88065522 100644 --- a/miner/unconfirmed.go +++ b/miner/unconfirmed.go @@ -20,9 +20,9 @@ import ( "container/ring" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/log" ) // headerRetriever is used by the unconfirmed block set to verify whether a previously diff --git a/miner/unconfirmed_test.go b/miner/unconfirmed_test.go index 456af1764a..578cffb8d8 100644 --- a/miner/unconfirmed_test.go +++ b/miner/unconfirmed_test.go @@ -19,8 +19,8 @@ package miner import ( "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" ) // noopHeaderRetriever is an implementation of headerRetriever that always diff --git a/miner/worker.go b/miner/worker.go index ff48ecabc3..98aff751b7 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -24,17 +24,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/consensus" + "github.com/zhigui-projects/go-ethereum/consensus/misc" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/params" "gopkg.in/fatih/set.v0" ) diff --git a/mobile/accounts.go b/mobile/accounts.go index 4d979bffff..c367b899e7 100644 --- a/mobile/accounts.go +++ b/mobile/accounts.go @@ -23,10 +23,10 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/accounts/keystore" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" ) const ( diff --git a/mobile/android_test.go b/mobile/android_test.go index 3d3bd66d08..2210456b94 100644 --- a/mobile/android_test.go +++ b/mobile/android_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/build" + "github.com/zhigui-projects/go-ethereum/internal/build" ) // androidTestClass is a Java class to do some lightweight tests against the Android @@ -207,7 +207,7 @@ func TestAndroid(t *testing.T) { } } // Generate the mobile bindings for Geth and add the tester class - gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/ethereum/go-ethereum/mobile") + gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/zhigui-projects/go-ethereum/mobile") if output, err := gobind.CombinedOutput(); err != nil { t.Logf("%s", output) t.Fatalf("failed to run gomobile bind: %v", err) diff --git a/mobile/big.go b/mobile/big.go index dd7b158786..695a953afc 100644 --- a/mobile/big.go +++ b/mobile/big.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) // A BigInt represents a signed multi-precision integer. diff --git a/mobile/bind.go b/mobile/bind.go index d6e621a258..5e65bfad15 100644 --- a/mobile/bind.go +++ b/mobile/bind.go @@ -22,10 +22,10 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/accounts/abi" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" ) // Signer is an interaface defining the callback when a contract requires a diff --git a/mobile/common.go b/mobile/common.go index 047d8e1f65..ba5a911493 100644 --- a/mobile/common.go +++ b/mobile/common.go @@ -24,7 +24,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) // Hash represents the 32 byte Keccak256 hash of arbitrary data. diff --git a/mobile/discover.go b/mobile/discover.go index 9b3c93ccd9..8fe88cf468 100644 --- a/mobile/discover.go +++ b/mobile/discover.go @@ -22,7 +22,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/p2p/discv5" + "github.com/zhigui-projects/go-ethereum/p2p/discv5" ) // Enode represents a host on the network. diff --git a/mobile/ethclient.go b/mobile/ethclient.go index 66399c6b56..e8467d2c17 100644 --- a/mobile/ethclient.go +++ b/mobile/ethclient.go @@ -21,8 +21,8 @@ package geth import ( "math/big" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethclient" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/ethclient" ) // EthereumClient provides access to the Ethereum APIs. diff --git a/mobile/ethereum.go b/mobile/ethereum.go index 35a43d274d..36bd1d533e 100644 --- a/mobile/ethereum.go +++ b/mobile/ethereum.go @@ -21,8 +21,8 @@ package geth import ( "errors" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" + ethereum "github.com/zhigui-projects/go-ethereum" + "github.com/zhigui-projects/go-ethereum/common" ) // Subscription represents an event subscription where events are diff --git a/mobile/geth.go b/mobile/geth.go index 63ef062345..ea25ad3107 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -24,18 +24,18 @@ import ( "fmt" "path/filepath" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/eth" + "github.com/zhigui-projects/go-ethereum/eth/downloader" + "github.com/zhigui-projects/go-ethereum/ethclient" + "github.com/zhigui-projects/go-ethereum/ethstats" + "github.com/zhigui-projects/go-ethereum/internal/debug" + "github.com/zhigui-projects/go-ethereum/les" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/nat" + "github.com/zhigui-projects/go-ethereum/params" + whisper "github.com/zhigui-projects/go-ethereum/whisper/whisperv6" ) // NodeConfig represents the collection of configuration values to fine tune the Geth diff --git a/mobile/init.go b/mobile/init.go index 2025d85edc..e77d410903 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -22,7 +22,7 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) func init() { diff --git a/mobile/interface.go b/mobile/interface.go index ac0c26088a..fca9a64cb4 100644 --- a/mobile/interface.go +++ b/mobile/interface.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) // Interface represents a wrapped version of Go's interface{}, with the capacity diff --git a/mobile/logger.go b/mobile/logger.go index 7078c4fd2c..de218039c7 100644 --- a/mobile/logger.go +++ b/mobile/logger.go @@ -19,7 +19,7 @@ package geth import ( "os" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // SetVerbosity sets the global verbosity level (between 0 and 6 - see logger/verbosity.go). diff --git a/mobile/p2p.go b/mobile/p2p.go index a80d9fff2e..f4b168e85e 100644 --- a/mobile/p2p.go +++ b/mobile/p2p.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p" ) // NodeInfo represents pi short summary of the information known about the host. diff --git a/mobile/params.go b/mobile/params.go index 45fe870ee3..4dcbdf788a 100644 --- a/mobile/params.go +++ b/mobile/params.go @@ -21,9 +21,9 @@ package geth import ( "encoding/json" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/p2p/discv5" + "github.com/zhigui-projects/go-ethereum/params" ) // MainnetGenesis returns the JSON spec to use for the main Ethereum network. It diff --git a/mobile/types.go b/mobile/types.go index f32b4918f3..d5d61f4d81 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -23,9 +23,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/rlp" ) // A Nonce is a 64-bit hash which proves (combined with the mix-hash) that diff --git a/mobile/vm.go b/mobile/vm.go index 72093e3d5b..7c529a2683 100644 --- a/mobile/vm.go +++ b/mobile/vm.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/types" ) // Log represents a contract log event. These events are generated by the LOG diff --git a/node/api.go b/node/api.go index 117b76b6d8..6febb65032 100644 --- a/node/api.go +++ b/node/api.go @@ -22,12 +22,12 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/rpc" ) // PrivateAdminAPI is the collection of administrative API methods exposed only diff --git a/node/config.go b/node/config.go index 486eddf925..c4d0c63fab 100644 --- a/node/config.go +++ b/node/config.go @@ -25,14 +25,14 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/accounts/keystore" + "github.com/zhigui-projects/go-ethereum/accounts/usbwallet" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" ) const ( diff --git a/node/config_test.go b/node/config_test.go index b81d3d6120..e3c3db2563 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -24,8 +24,8 @@ import ( "runtime" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index 8875605807..84c315be7a 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,8 +22,8 @@ import ( "path/filepath" "runtime" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/nat" ) const ( diff --git a/node/node.go b/node/node.go index c4368189f7..55a71a6e56 100644 --- a/node/node.go +++ b/node/node.go @@ -26,13 +26,13 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/internal/debug" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rpc" "github.com/prometheus/prometheus/util/flock" ) diff --git a/node/node_example_test.go b/node/node_example_test.go index ee06f4065c..b6dc1ec33e 100644 --- a/node/node_example_test.go +++ b/node/node_example_test.go @@ -20,9 +20,9 @@ import ( "fmt" "log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rpc" ) // SampleService is a trivial network service that can be attached to a node for diff --git a/node/node_test.go b/node/node_test.go index e51900bd1e..c56a881a0d 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rpc" ) var ( diff --git a/node/service.go b/node/service.go index afc43e8486..b41c98ea70 100644 --- a/node/service.go +++ b/node/service.go @@ -19,11 +19,11 @@ package node import ( "reflect" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rpc" ) // ServiceContext is a collection of service independent options inherited from diff --git a/node/utils_test.go b/node/utils_test.go index 9801b1ed45..7f8401730e 100644 --- a/node/utils_test.go +++ b/node/utils_test.go @@ -22,8 +22,8 @@ package node import ( "reflect" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rpc" ) // NoopService is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index d8feceb9f3..c948428af6 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -24,9 +24,9 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index 2a7941fc65..5183049180 100644 --- a/p2p/dial_test.go +++ b/p2p/dial_test.go @@ -24,8 +24,8 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/netutil" ) func init() { diff --git a/p2p/discover/database.go b/p2p/discover/database.go index 22554145f4..f08476cad4 100644 --- a/p2p/discover/database.go +++ b/p2p/discover/database.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/discover/node.go b/p2p/discover/node.go index 3b0c84115c..d50742612c 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -31,9 +31,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto/secp256k1" ) const NodeIDBits = 512 diff --git a/p2p/discover/node_test.go b/p2p/discover/node_test.go index ed8db4dc65..cbbc8fbe47 100644 --- a/p2p/discover/node_test.go +++ b/p2p/discover/node_test.go @@ -28,8 +28,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" ) func ExampleNewNode() { diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index 1bb52399fb..b117b86377 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -25,7 +25,7 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index 8803daa56e..5ffd80fe03 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -32,10 +32,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p/netutil" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index ed55ebd9a9..62b17cf123 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -28,8 +28,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index 0ff47c5e46..94c648df32 100644 --- a/p2p/discover/udp.go +++ b/p2p/discover/udp.go @@ -25,11 +25,11 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p/nat" + "github.com/zhigui-projects/go-ethereum/p2p/netutil" + "github.com/zhigui-projects/go-ethereum/rlp" ) // Errors diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index b4363a12b8..77f6bae0fb 100644 --- a/p2p/discover/udp_test.go +++ b/p2p/discover/udp_test.go @@ -34,9 +34,9 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/rlp" ) func init() { diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index 3c2d5744c3..9c3c0e2921 100644 --- a/p2p/discv5/database.go +++ b/p2p/discv5/database.go @@ -28,9 +28,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/discv5/metrics.go b/p2p/discv5/metrics.go index cb11d7eacf..33fb25514c 100644 --- a/p2p/discv5/metrics.go +++ b/p2p/discv5/metrics.go @@ -1,6 +1,6 @@ package discv5 -import "github.com/ethereum/go-ethereum/metrics" +import "github.com/zhigui-projects/go-ethereum/metrics" var ( ingressTrafficMeter = metrics.NewRegisteredMeter("discv5/InboundTraffic", nil) diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index 9b0bd0c80a..7c2693b7b8 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -24,13 +24,13 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/mclock" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p/netutil" + "github.com/zhigui-projects/go-ethereum/rlp" ) var ( diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go index 001d193cc9..0994f0edcb 100644 --- a/p2p/discv5/net_test.go +++ b/p2p/discv5/net_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go index 3d47485122..58452d190d 100644 --- a/p2p/discv5/node.go +++ b/p2p/discv5/node.go @@ -30,8 +30,8 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" ) // Node represents a host on the network. diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go index ce4ad9e4d4..b12d7dfe9d 100644 --- a/p2p/discv5/node_test.go +++ b/p2p/discv5/node_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" ) func ExampleNewNode() { diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index 4fb5f657ae..08a5c987fa 100644 --- a/p2p/discv5/ntp.go +++ b/p2p/discv5/ntp.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) const ( diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go index 543faecd48..4b3610a7c7 100644 --- a/p2p/discv5/sim_test.go +++ b/p2p/discv5/sim_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) // In this test, nodes try to randomly resolve each other. diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go index c8d234b936..ff2a67bf94 100644 --- a/p2p/discv5/table.go +++ b/p2p/discv5/table.go @@ -29,7 +29,7 @@ import ( "net" "sort" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) const ( diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go index a29943dab9..223c249eb7 100644 --- a/p2p/discv5/table_test.go +++ b/p2p/discv5/table_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" ) type nullTransport struct{} diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go index ae4b18e7cd..a378322f1a 100644 --- a/p2p/discv5/ticket.go +++ b/p2p/discv5/ticket.go @@ -25,10 +25,10 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/mclock" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" ) const ( diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go index 609a41297f..dbc4be9670 100644 --- a/p2p/discv5/topic.go +++ b/p2p/discv5/topic.go @@ -23,8 +23,8 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common/mclock" + "github.com/zhigui-projects/go-ethereum/log" ) const ( diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go index ba79993f29..b57b432937 100644 --- a/p2p/discv5/topic_test.go +++ b/p2p/discv5/topic_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/mclock" ) func TestTopicRadius(t *testing.T) { diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index 49e1cb811a..9c728eccad 100644 --- a/p2p/discv5/udp.go +++ b/p2p/discv5/udp.go @@ -24,12 +24,12 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p/nat" + "github.com/zhigui-projects/go-ethereum/p2p/netutil" + "github.com/zhigui-projects/go-ethereum/rlp" ) const Version = 4 diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go index 62184aa9d3..fd9de85e7a 100644 --- a/p2p/discv5/udp_test.go +++ b/p2p/discv5/udp_test.go @@ -26,9 +26,9 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/rlp" ) func init() { diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index 48683471d2..8382619bb7 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -34,7 +34,7 @@ import ( "io" "sort" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/rlp" ) const SizeLimit = 300 // maximum encoded size of a node record in bytes diff --git a/p2p/enr/enr_test.go b/p2p/enr/enr_test.go index d1d0887563..c9f7c77565 100644 --- a/p2p/enr/enr_test.go +++ b/p2p/enr/enr_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index 71c7653a28..3498a81eff 100644 --- a/p2p/enr/entries.go +++ b/p2p/enr/entries.go @@ -22,8 +22,8 @@ import ( "io" "net" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/enr/idscheme.go b/p2p/enr/idscheme.go index efaf68041d..88cb2d8848 100644 --- a/p2p/enr/idscheme.go +++ b/p2p/enr/idscheme.go @@ -21,10 +21,10 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/rlp" ) // Registry of known identity schemes. diff --git a/p2p/message.go b/p2p/message.go index a4eac54d33..267ea1cc79 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -25,9 +25,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index 2d52fd1fd1..8bf77823cc 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -21,7 +21,7 @@ package p2p import ( "net" - "github.com/ethereum/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/metrics" ) var ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index a254648c66..c82142cb65 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/peer.go b/p2p/peer.go index eb2d34441c..bb8ead4c9f 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common/mclock" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/rlp" ) var ( diff --git a/p2p/protocol.go b/p2p/protocol.go index ee747ba23d..13273eca6a 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -19,7 +19,7 @@ package p2p import ( "fmt" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/discover" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/protocols/protocol.go b/p2p/protocols/protocol.go index d5c0375ac7..bdfaa85060 100644 --- a/p2p/protocols/protocol.go +++ b/p2p/protocols/protocol.go @@ -36,9 +36,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/p2p" ) // error codes used by this protocol scheme diff --git a/p2p/protocols/protocol_test.go b/p2p/protocols/protocol_test.go index aaae7502b5..22bbe11b97 100644 --- a/p2p/protocols/protocol_test.go +++ b/p2p/protocols/protocol_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" + p2ptest "github.com/zhigui-projects/go-ethereum/p2p/testing" ) // handshake message type diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 149eda689c..9da3aed4d4 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -35,12 +35,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/crypto/secp256k1" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto/ecies" + "github.com/zhigui-projects/go-ethereum/crypto/secp256k1" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/rlp" "github.com/golang/snappy" ) diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index 7ae8007740..0fd93d34d9 100644 --- a/p2p/rlpx_test.go +++ b/p2p/rlpx_test.go @@ -31,12 +31,12 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "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/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto/ecies" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/pipes" + "github.com/zhigui-projects/go-ethereum/rlp" ) func TestSharedSecret(t *testing.T) { diff --git a/p2p/server.go b/p2p/server.go index cdb5b1926e..9c2cbff190 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/mclock" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/discv5" + "github.com/zhigui-projects/go-ethereum/p2p/nat" + "github.com/zhigui-projects/go-ethereum/p2p/netutil" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index 10c36528eb..8da7f774f7 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p/discover" ) func init() { diff --git a/p2p/simulations/adapters/docker.go b/p2p/simulations/adapters/docker.go index d145c46b3a..e5a03711c2 100644 --- a/p2p/simulations/adapters/docker.go +++ b/p2p/simulations/adapters/docker.go @@ -28,8 +28,8 @@ import ( "strings" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p/discover" ) var ( diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index e64cebc2a7..c20d9eaa4c 100644 --- a/p2p/simulations/adapters/exec.go +++ b/p2p/simulations/adapters/exec.go @@ -35,11 +35,11 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index b68d08f392..d6686ee034 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -23,13 +23,13 @@ import ( "net" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/pipes" + "github.com/zhigui-projects/go-ethereum/rpc" ) // SimAdapter is a NodeAdapter which creates in-memory simulation nodes and diff --git a/p2p/simulations/adapters/inproc_test.go b/p2p/simulations/adapters/inproc_test.go index e1e092f6e1..d153c36aa8 100644 --- a/p2p/simulations/adapters/inproc_test.go +++ b/p2p/simulations/adapters/inproc_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/pipes" ) func TestTCPPipe(t *testing.T) { diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index 2c4b9dd8f2..19b3340ac8 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -26,11 +26,11 @@ import ( "strconv" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/rpc" ) // Node represents a node in a simulation network which is created by a diff --git a/p2p/simulations/examples/ping-pong.go b/p2p/simulations/examples/ping-pong.go index 6a0ead53a5..556fc65f36 100644 --- a/p2p/simulations/examples/ping-pong.go +++ b/p2p/simulations/examples/ping-pong.go @@ -25,13 +25,13 @@ import ( "sync/atomic" "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/discover" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/rpc" ) var adapterType = flag.String("adapter", "sim", `node adapter to use (one of "sim", "exec" or "docker")`) diff --git a/p2p/simulations/http.go b/p2p/simulations/http.go index 24001f1949..9fdadd3810 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -29,11 +29,11 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/rpc" "github.com/julienschmidt/httprouter" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/http_test.go b/p2p/simulations/http_test.go index 732d49f546..5e19d9e268 100644 --- a/p2p/simulations/http_test.go +++ b/p2p/simulations/http_test.go @@ -27,12 +27,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/rpc" ) // testService implements the node.Service interface and provides protocols diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index 389b1e3ec3..02bdd5e28a 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" ) //a map of mocker names to its function diff --git a/p2p/simulations/mocker_test.go b/p2p/simulations/mocker_test.go index de8ec0b337..40457266f2 100644 --- a/p2p/simulations/mocker_test.go +++ b/p2p/simulations/mocker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/discover" ) func TestMocker(t *testing.T) { diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index 0fb7485ad0..b60cc22048 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -24,11 +24,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/event" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" ) var DialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index f178bac502..cbfb4b8694 100644 --- a/p2p/simulations/network_test.go +++ b/p2p/simulations/network_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" ) // TestNetworkSimulation creates a multi-node simulation network with each node diff --git a/p2p/simulations/simulation.go b/p2p/simulations/simulation.go index 28886e924a..f3b692cd1d 100644 --- a/p2p/simulations/simulation.go +++ b/p2p/simulations/simulation.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/discover" ) // Simulation provides a framework for running actions in a simulated network diff --git a/p2p/testing/peerpool.go b/p2p/testing/peerpool.go index ed00396e23..71217eec89 100644 --- a/p2p/testing/peerpool.go +++ b/p2p/testing/peerpool.go @@ -20,8 +20,8 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p/discover" ) type TestPeer interface { diff --git a/p2p/testing/protocolsession.go b/p2p/testing/protocolsession.go index e3ec41ad67..24e7589b2a 100644 --- a/p2p/testing/protocolsession.go +++ b/p2p/testing/protocolsession.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" ) var errTimedOut = errors.New("timed out") diff --git a/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go index 636613c57a..63f6461663 100644 --- a/p2p/testing/protocoltester.go +++ b/p2p/testing/protocoltester.go @@ -32,14 +32,14 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "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/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/rpc" ) // ProtocolTester is the tester environment used for unit testing protocol diff --git a/params/config.go b/params/config.go index 6e6a5cb8b2..8034dfa4b9 100644 --- a/params/config.go +++ b/params/config.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) // Genesis hashes to enforce below configs on. diff --git a/params/dao.go b/params/dao.go index da3c8dfc99..357276de02 100644 --- a/params/dao.go +++ b/params/dao.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) // DAOForkBlockExtra is the block header extra-data field to set for the DAO fork diff --git a/rpc/client.go b/rpc/client.go index 1c88cfab84..62b2d90974 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -33,7 +33,7 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 8276a9eadd..2ee9bae719 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -22,7 +22,7 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/rpc" ) // In this example, our client whishes to track the latest 'block number' diff --git a/rpc/client_test.go b/rpc/client_test.go index 4f354d389e..211e6a0250 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -31,7 +31,7 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) func TestClientRequest(t *testing.T) { diff --git a/rpc/endpoints.go b/rpc/endpoints.go index 692c62d3a4..c554023752 100644 --- a/rpc/endpoints.go +++ b/rpc/endpoints.go @@ -19,7 +19,7 @@ package rpc import ( "net" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) // StartHTTPEndpoint starts the HTTP RPC endpoint, configured with cors/vhosts/modules diff --git a/rpc/ipc.go b/rpc/ipc.go index b05e503d74..ccb07fcb35 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -20,8 +20,8 @@ import ( "context" "net" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p/netutil" ) // ServeListener accepts connections on l, serving JSON-RPC on them. diff --git a/rpc/json.go b/rpc/json.go index a523eeb8ef..02391c32b8 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) const ( diff --git a/rpc/server.go b/rpc/server.go index 8925419fe0..4bf9c7cd9e 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -25,7 +25,7 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types.go b/rpc/types.go index f2375604ed..a0c367e90b 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/hexutil" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types_test.go b/rpc/types_test.go index 68b6d3c54f..195d00df67 100644 --- a/rpc/types_test.go +++ b/rpc/types_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - "github.com/ethereum/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index a6e1cec28a..8f9baea520 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -29,7 +29,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" "golang.org/x/net/websocket" "gopkg.in/fatih/set.v0" ) diff --git a/signer/core/abihelper.go b/signer/core/abihelper.go index 1d4fbc7dc2..c73059ecb1 100644 --- a/signer/core/abihelper.go +++ b/signer/core/abihelper.go @@ -22,8 +22,8 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/accounts/abi" + "github.com/zhigui-projects/go-ethereum/common" "bytes" "os" diff --git a/signer/core/abihelper_test.go b/signer/core/abihelper_test.go index 8bb5776691..3e87da8300 100644 --- a/signer/core/abihelper_test.go +++ b/signer/core/abihelper_test.go @@ -25,8 +25,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/accounts/abi" + "github.com/zhigui-projects/go-ethereum/common" ) func verify(t *testing.T, jsondata, calldata string, exp []interface{}) { diff --git a/signer/core/api.go b/signer/core/api.go index 9a2a49ccc6..9272c0ea68 100644 --- a/signer/core/api.go +++ b/signer/core/api.go @@ -25,15 +25,15 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/accounts/keystore" + "github.com/zhigui-projects/go-ethereum/accounts/usbwallet" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/internal/ethapi" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/rlp" ) // ExternalAPI defines the external API through which signing requests are made. @@ -374,7 +374,7 @@ func (api *SignerAPI) SignTransaction(ctx context.Context, args SendTxArgs, meth // // The key used to calculate the signature is decrypted with the given password. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_sign +// https://github.com/zhigui-projects/go-ethereum/wiki/Management-APIs#personal_sign func (api *SignerAPI) Sign(ctx context.Context, addr common.MixedcaseAddress, data hexutil.Bytes) (hexutil.Bytes, error) { sighash, msg := SignHash(data) // We make the request prior to looking up if we actually have the account, to prevent @@ -413,7 +413,7 @@ func (api *SignerAPI) Sign(ctx context.Context, addr common.MixedcaseAddress, da // Note, the signature must conform to the secp256k1 curve R, S and V values, where // the V value must be be 27 or 28 for legacy reasons. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_ecRecover +// https://github.com/zhigui-projects/go-ethereum/wiki/Management-APIs#personal_ecRecover func (api *SignerAPI) EcRecover(ctx context.Context, data, sig hexutil.Bytes) (common.Address, error) { if len(sig) != 65 { return common.Address{}, fmt.Errorf("signature must be 65 bytes long") diff --git a/signer/core/api_test.go b/signer/core/api_test.go index 50ad021987..bc6a73a17b 100644 --- a/signer/core/api_test.go +++ b/signer/core/api_test.go @@ -27,13 +27,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/accounts/keystore" + "github.com/zhigui-projects/go-ethereum/cmd/utils" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/internal/ethapi" + "github.com/zhigui-projects/go-ethereum/rlp" ) //Used for testing diff --git a/signer/core/auditlog.go b/signer/core/auditlog.go index d0ba733d2f..dc9db34f1e 100644 --- a/signer/core/auditlog.go +++ b/signer/core/auditlog.go @@ -21,11 +21,11 @@ import ( "encoding/json" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/internal/ethapi" + "github.com/zhigui-projects/go-ethereum/log" ) type AuditLogger struct { diff --git a/signer/core/cliui.go b/signer/core/cliui.go index 2f969669c2..629f31d940 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -25,9 +25,9 @@ import ( "sync" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/internal/ethapi" + "github.com/zhigui-projects/go-ethereum/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/signer/core/stdioui.go b/signer/core/stdioui.go index 5640ed03bd..2c02d195fa 100644 --- a/signer/core/stdioui.go +++ b/signer/core/stdioui.go @@ -21,9 +21,9 @@ import ( "context" "sync" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/internal/ethapi" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/rpc" ) type StdIOUI struct { diff --git a/signer/core/types.go b/signer/core/types.go index 2acc0a4f4a..48361ab4fc 100644 --- a/signer/core/types.go +++ b/signer/core/types.go @@ -22,10 +22,10 @@ import ( "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/core/types" ) type Accounts []Account diff --git a/signer/core/validation.go b/signer/core/validation.go index 288456df87..34fdab6fbe 100644 --- a/signer/core/validation.go +++ b/signer/core/validation.go @@ -22,7 +22,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) // The validation package contains validation checks for transactions @@ -124,7 +124,7 @@ func (v *Validator) validate(msgs *ValidationMessages, txargs *SendTxArgs, metho if txargs.To == nil { //Contract creation should contain sufficient data to deploy a contract // A typical error is omitting sender due to some quirk in the javascript call - // e.g. https://github.com/ethereum/go-ethereum/issues/16106 + // e.g. https://github.com/zhigui-projects/go-ethereum/issues/16106 if len(data) == 0 { if txargs.Value.ToInt().Cmp(big.NewInt(0)) > 0 { // Sending ether into black hole diff --git a/signer/core/validation_test.go b/signer/core/validation_test.go index 2b33a8630b..0d32b0eb87 100644 --- a/signer/core/validation_test.go +++ b/signer/core/validation_test.go @@ -21,8 +21,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) func hexAddr(a string) common.Address { return common.BytesToAddress(common.FromHex(a)) } diff --git a/signer/rules/rules.go b/signer/rules/rules.go index 711e2dddec..187b7856ce 100644 --- a/signer/rules/rules.go +++ b/signer/rules/rules.go @@ -22,12 +22,12 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/rules/deps" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/internal/ethapi" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/signer/core" + "github.com/zhigui-projects/go-ethereum/signer/rules/deps" + "github.com/zhigui-projects/go-ethereum/signer/storage" "github.com/robertkrimen/otto" ) diff --git a/signer/rules/rules_test.go b/signer/rules/rules_test.go index b6060eba73..3472dd965d 100644 --- a/signer/rules/rules_test.go +++ b/signer/rules/rules_test.go @@ -22,13 +22,13 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/zhigui-projects/go-ethereum/accounts" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/internal/ethapi" + "github.com/zhigui-projects/go-ethereum/signer/core" + "github.com/zhigui-projects/go-ethereum/signer/storage" ) const JS = ` diff --git a/signer/storage/aes_gcm_storage.go b/signer/storage/aes_gcm_storage.go index 225276667f..5c2a31afb7 100644 --- a/signer/storage/aes_gcm_storage.go +++ b/signer/storage/aes_gcm_storage.go @@ -26,7 +26,7 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" ) type storedCredential struct { diff --git a/signer/storage/aes_gcm_storage_test.go b/signer/storage/aes_gcm_storage_test.go index 77804905ac..e263f2ad45 100644 --- a/signer/storage/aes_gcm_storage_test.go +++ b/signer/storage/aes_gcm_storage_test.go @@ -22,8 +22,8 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/log" "github.com/mattn/go-colorable" ) diff --git a/swarm/api/api.go b/swarm/api/api.go index 36f19998af..f9d0e5f977 100644 --- a/swarm/api/api.go +++ b/swarm/api/api.go @@ -30,14 +30,14 @@ 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/multihash" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mru" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/contracts/ens" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/multihash" + "github.com/zhigui-projects/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/swarm/storage/mru" ) var ( diff --git a/swarm/api/api_test.go b/swarm/api/api_test.go index e607dd4fc3..62af295732 100644 --- a/swarm/api/api_test.go +++ b/swarm/api/api_test.go @@ -26,10 +26,10 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) func testAPI(t *testing.T, f func(*API, bool)) { diff --git a/swarm/api/client/client.go b/swarm/api/client/client.go index ef6222435f..0beb51e3ff 100644 --- a/swarm/api/client/client.go +++ b/swarm/api/client/client.go @@ -34,7 +34,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/zhigui-projects/go-ethereum/swarm/api" ) var ( diff --git a/swarm/api/client/client_test.go b/swarm/api/client/client_test.go index a878bff174..a7c312d1f2 100644 --- a/swarm/api/client/client_test.go +++ b/swarm/api/client/client_test.go @@ -25,9 +25,9 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - swarmhttp "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/zhigui-projects/go-ethereum/swarm/api" + swarmhttp "github.com/zhigui-projects/go-ethereum/swarm/api/http" + "github.com/zhigui-projects/go-ethereum/swarm/testutil" ) func serverFunc(api *api.API) testutil.TestServer { diff --git a/swarm/api/config.go b/swarm/api/config.go index 939285e09c..222ab57c0f 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/discover" - "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/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/contracts/ens" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/network" + "github.com/zhigui-projects/go-ethereum/swarm/pss" + "github.com/zhigui-projects/go-ethereum/swarm/services/swap" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) const ( diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go index bd7e1d8705..d3990428b9 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/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" ) func TestConfig(t *testing.T) { diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go index 297cbec79f..1d72cb54d0 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/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) const maxParallelFiles = 5 diff --git a/swarm/api/filesystem_test.go b/swarm/api/filesystem_test.go index 915dc4e0b9..1f4c68e137 100644 --- a/swarm/api/filesystem_test.go +++ b/swarm/api/filesystem_test.go @@ -23,8 +23,8 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) var testDownloadDir, _ = ioutil.TempDir(os.TempDir(), "bzz-test") diff --git a/swarm/api/http/error.go b/swarm/api/http/error.go index 5fff7575e8..21fcc364d6 100644 --- a/swarm/api/http/error.go +++ b/swarm/api/http/error.go @@ -28,10 +28,10 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" - l "github.com/ethereum/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/swarm/api" + l "github.com/zhigui-projects/go-ethereum/swarm/log" ) //templateMap holds a mapping of an HTTP error code to a template diff --git a/swarm/api/http/error_test.go b/swarm/api/http/error_test.go index 86eff86b23..fbbdf4d041 100644 --- a/swarm/api/http/error_test.go +++ b/swarm/api/http/error_test.go @@ -25,7 +25,7 @@ import ( "golang.org/x/net/html" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/zhigui-projects/go-ethereum/swarm/testutil" ) func TestError(t *testing.T) { diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go index be8ea39856..a7ac6a34cc 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/zhigui-projects/go-ethereum/swarm/log" ) /* http roundtripper to register for bzz url scheme -see https://github.com/ethereum/go-ethereum/issues/2040 +see https://github.com/zhigui-projects/go-ethereum/issues/2040 Usage: import ( - "github.com/ethereum/go-ethereum/common/httpclient" - "github.com/ethereum/go-ethereum/swarm/api/http" + "github.com/zhigui-projects/go-ethereum/common/httpclient" + "github.com/zhigui-projects/go-ethereum/swarm/api/http" ) client := httpclient.New() // for (private) swarm proxy running locally diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go index ba8b2b7ba9..5ac0ff5e6f 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -38,13 +38,13 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "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/mru" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/swarm/api" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/swarm/storage/mru" "github.com/pborman/uuid" "github.com/rs/cors" ) diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go index 9fb21f7a35..60b100324c 100644 --- a/swarm/api/http/server_test.go +++ b/swarm/api/http/server_test.go @@ -29,14 +29,14 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "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/multihash" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/swarm/api" + swarm "github.com/zhigui-projects/go-ethereum/swarm/api/client" + "github.com/zhigui-projects/go-ethereum/swarm/multihash" + "github.com/zhigui-projects/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/swarm/testutil" ) func init() { diff --git a/swarm/api/http/templates.go b/swarm/api/http/templates.go index ffd8164930..b9d193ec13 100644 --- a/swarm/api/http/templates.go +++ b/swarm/api/http/templates.go @@ -20,7 +20,7 @@ import ( "html/template" "path" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/zhigui-projects/go-ethereum/swarm/api" ) type htmlListData struct { diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index 28597636ee..246496c21c 100644 --- a/swarm/api/manifest.go +++ b/swarm/api/manifest.go @@ -26,9 +26,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) const ( diff --git a/swarm/api/manifest_test.go b/swarm/api/manifest_test.go index d65f023f85..acde99773b 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/zhigui-projects/go-ethereum/swarm/storage" ) func manifest(paths ...string) (manifestReader storage.LazySectionReader) { diff --git a/swarm/api/storage.go b/swarm/api/storage.go index 6ab4af6c4b..968ee91ee2 100644 --- a/swarm/api/storage.go +++ b/swarm/api/storage.go @@ -19,7 +19,7 @@ package api import ( "path" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) type Response struct { diff --git a/swarm/api/testapi.go b/swarm/api/testapi.go index 4c7d0982ba..2c79dfcc16 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/zhigui-projects/go-ethereum/swarm/network" ) type Control struct { diff --git a/swarm/api/uri.go b/swarm/api/uri.go index 14965e0d93..28a7224d9d 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/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) //matches hex swarm hashes diff --git a/swarm/api/uri_test.go b/swarm/api/uri_test.go index ea649e273c..dc20e3b409 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/zhigui-projects/go-ethereum/swarm/storage" ) func TestParseURI(t *testing.T) { diff --git a/swarm/bmt/bmt_test.go b/swarm/bmt/bmt_test.go index e074d90e73..e0d3904d72 100644 --- a/swarm/bmt/bmt_test.go +++ b/swarm/bmt/bmt_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" ) // the actual data length generated (could be longer than max datalength of the BMT) diff --git a/swarm/fuse/fuse_dir.go b/swarm/fuse/fuse_dir.go index 7f66451f10..7b897aa337 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/zhigui-projects/go-ethereum/swarm/log" "golang.org/x/net/context" ) diff --git a/swarm/fuse/fuse_file.go b/swarm/fuse/fuse_file.go index 80c26fe05f..fbda2e230a 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/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/storage" "golang.org/x/net/context" ) diff --git a/swarm/fuse/swarmfs.go b/swarm/fuse/swarmfs.go index c7aa983b7d..562bc4a48d 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/zhigui-projects/go-ethereum/swarm/api" ) const ( diff --git a/swarm/fuse/swarmfs_test.go b/swarm/fuse/swarmfs_test.go index ed2021c4e0..bcca264581 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/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/swarm/api" + "github.com/zhigui-projects/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/fuse/swarmfs_unix.go b/swarm/fuse/swarmfs_unix.go index 74dd84a903..8306989ac3 100644 --- a/swarm/fuse/swarmfs_unix.go +++ b/swarm/fuse/swarmfs_unix.go @@ -29,9 +29,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/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/swarm/api" + "github.com/zhigui-projects/go-ethereum/swarm/log" ) var ( diff --git a/swarm/fuse/swarmfs_util.go b/swarm/fuse/swarmfs_util.go index 9bbb0f6ac0..d83ed628d4 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/zhigui-projects/go-ethereum/swarm/log" ) func externalUnmount(mountPoint string) error { diff --git a/swarm/log/log.go b/swarm/log/log.go index ce372632e8..c7e632c121 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/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/metrics" ) const ( diff --git a/swarm/metrics/flags.go b/swarm/metrics/flags.go index 795fc402ff..37d210eee7 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/zhigui-projects/go-ethereum/cmd/utils" + gethmetrics "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/metrics/influxdb" + "github.com/zhigui-projects/go-ethereum/swarm/log" "gopkg.in/urfave/cli.v1" ) diff --git a/swarm/network/discovery.go b/swarm/network/discovery.go index c0868410c7..5b78f62fc3 100644 --- a/swarm/network/discovery.go +++ b/swarm/network/discovery.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/swarm/pot" + "github.com/zhigui-projects/go-ethereum/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 0427d81cad..a2db4403df 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/zhigui-projects/go-ethereum/p2p/testing" ) /*** diff --git a/swarm/network/hive.go b/swarm/network/hive.go index a54a17d29d..4be57e9823 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/discover" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/state" ) /* diff --git a/swarm/network/hive_test.go b/swarm/network/hive_test.go index c2abfb2aad..9200708c64 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/zhigui-projects/go-ethereum/p2p/testing" + "github.com/zhigui-projects/go-ethereum/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 0177d449c4..a9e127c60b 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/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/pot" ) /* diff --git a/swarm/network/kademlia_test.go b/swarm/network/kademlia_test.go index b60e1e9a39..dc4d69690d 100644 --- a/swarm/network/kademlia_test.go +++ b/swarm/network/kademlia_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/pot" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/swarm/pot" ) func init() { diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go index 39673f5a1d..b63c3a1aa1 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/discover" - "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/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/protocols" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/state" ) const ( diff --git a/swarm/network/protocol_test.go b/swarm/network/protocol_test.go index c28bc863e3..4b6ff86baa 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/discover" - "github.com/ethereum/go-ethereum/p2p/protocols" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/protocols" + p2ptest "github.com/zhigui-projects/go-ethereum/p2p/testing" ) var ( diff --git a/swarm/network/simulations/discovery/discovery_test.go b/swarm/network/simulations/discovery/discovery_test.go index acf3479e52..b50f1c964d 100644 --- a/swarm/network/simulations/discovery/discovery_test.go +++ b/swarm/network/simulations/discovery/discovery_test.go @@ -31,15 +31,15 @@ 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" - "github.com/ethereum/go-ethereum/p2p/discover" - "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/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/swarm/network" + "github.com/zhigui-projects/go-ethereum/swarm/state" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/network/simulations/overlay.go b/swarm/network/simulations/overlay.go index 9419de0c6f..7712f6ec8f 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/discover" - "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/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/swarm/network" + "github.com/zhigui-projects/go-ethereum/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 4d4eb6c371..bb8411d28a 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/discover" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations" + "github.com/zhigui-projects/go-ethereum/swarm/log" ) var ( diff --git a/swarm/network/stream/common_test.go b/swarm/network/stream/common_test.go index 9d1f997f29..d3393a0ce3 100644 --- a/swarm/network/stream/common_test.go +++ b/swarm/network/stream/common_test.go @@ -29,19 +29,19 @@ 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" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mock" - "github.com/ethereum/go-ethereum/swarm/storage/mock/db" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" + p2ptest "github.com/zhigui-projects/go-ethereum/p2p/testing" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/network" + "github.com/zhigui-projects/go-ethereum/swarm/state" + "github.com/zhigui-projects/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/swarm/storage/mock" + "github.com/zhigui-projects/go-ethereum/swarm/storage/mock/db" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/network/stream/delivery.go b/swarm/network/stream/delivery.go index 75aabad6c3..59d6e56976 100644 --- a/swarm/network/stream/delivery.go +++ b/swarm/network/stream/delivery.go @@ -20,12 +20,12 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/network" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) const ( diff --git a/swarm/network/stream/delivery_test.go b/swarm/network/stream/delivery_test.go index b03028c888..517bf32335 100644 --- a/swarm/network/stream/delivery_test.go +++ b/swarm/network/stream/delivery_test.go @@ -26,15 +26,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - streamTesting "github.com/ethereum/go-ethereum/swarm/network/stream/testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations" + p2ptest "github.com/zhigui-projects/go-ethereum/p2p/testing" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/network" + streamTesting "github.com/zhigui-projects/go-ethereum/swarm/network/stream/testing" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) func TestStreamerRetrieveRequest(t *testing.T) { diff --git a/swarm/network/stream/intervals/dbstore_test.go b/swarm/network/stream/intervals/dbstore_test.go index 6716e593ab..07a7f4f6f1 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/zhigui-projects/go-ethereum/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 0ab14c065c..558c2c97d3 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/zhigui-projects/go-ethereum/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 4e2721cb0f..645d292e32 100644 --- a/swarm/network/stream/intervals_test.go +++ b/swarm/network/stream/intervals_test.go @@ -26,15 +26,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" - "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" - streamTesting "github.com/ethereum/go-ethereum/swarm/network/stream/testing" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/network" + streamTesting "github.com/zhigui-projects/go-ethereum/swarm/network/stream/testing" + "github.com/zhigui-projects/go-ethereum/swarm/state" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) var ( diff --git a/swarm/network/stream/messages.go b/swarm/network/stream/messages.go index 5668a73e9d..0b81ac1cae 100644 --- a/swarm/network/stream/messages.go +++ b/swarm/network/stream/messages.go @@ -22,10 +22,10 @@ import ( "sync" "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/storage" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/swarm/log" + bv "github.com/zhigui-projects/go-ethereum/swarm/network/bitvector" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) // Stream defines a unique stream identifier. diff --git a/swarm/network/stream/peer.go b/swarm/network/stream/peer.go index 29984a9115..04d1ea3097 100644 --- a/swarm/network/stream/peer.go +++ b/swarm/network/stream/peer.go @@ -22,13 +22,13 @@ 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/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/p2p/protocols" + "github.com/zhigui-projects/go-ethereum/swarm/log" + pq "github.com/zhigui-projects/go-ethereum/swarm/network/priorityqueue" + "github.com/zhigui-projects/go-ethereum/swarm/network/stream/intervals" + "github.com/zhigui-projects/go-ethereum/swarm/state" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) var sendTimeout = 30 * time.Second diff --git a/swarm/network/stream/snapshot_retrieval_test.go b/swarm/network/stream/snapshot_retrieval_test.go index 59c776c302..6b70313caa 100644 --- a/swarm/network/stream/snapshot_retrieval_test.go +++ b/swarm/network/stream/snapshot_retrieval_test.go @@ -25,13 +25,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "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" - streamTesting "github.com/ethereum/go-ethereum/swarm/network/stream/testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/network" + streamTesting "github.com/zhigui-projects/go-ethereum/swarm/network/stream/testing" + "github.com/zhigui-projects/go-ethereum/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 ff1c39319d..4119be0228 100644 --- a/swarm/network/stream/snapshot_sync_test.go +++ b/swarm/network/stream/snapshot_sync_test.go @@ -29,17 +29,17 @@ 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/discover" - "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" - streamTesting "github.com/ethereum/go-ethereum/swarm/network/stream/testing" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/network" + streamTesting "github.com/zhigui-projects/go-ethereum/swarm/network/stream/testing" + "github.com/zhigui-projects/go-ethereum/swarm/pot" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) const testMinProxBinSize = 2 diff --git a/swarm/network/stream/stream.go b/swarm/network/stream/stream.go index 9b4658c51e..5de2b32e22 100644 --- a/swarm/network/stream/stream.go +++ b/swarm/network/stream/stream.go @@ -23,17 +23,17 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "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/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/protocols" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/network" + "github.com/zhigui-projects/go-ethereum/swarm/network/stream/intervals" + "github.com/zhigui-projects/go-ethereum/swarm/pot" + "github.com/zhigui-projects/go-ethereum/swarm/state" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) const ( diff --git a/swarm/network/stream/streamer_test.go b/swarm/network/stream/streamer_test.go index 44622c9955..7d1a141022 100644 --- a/swarm/network/stream/streamer_test.go +++ b/swarm/network/stream/streamer_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto/sha3" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + p2ptest "github.com/zhigui-projects/go-ethereum/p2p/testing" ) func TestStreamerSubscribe(t *testing.T) { diff --git a/swarm/network/stream/syncer.go b/swarm/network/stream/syncer.go index 5510b2409e..e417701b55 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/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) const ( diff --git a/swarm/network/stream/syncer_test.go b/swarm/network/stream/syncer_test.go index 68e20841df..b41e99e75d 100644 --- a/swarm/network/stream/syncer_test.go +++ b/swarm/network/stream/syncer_test.go @@ -27,14 +27,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - streamTesting "github.com/ethereum/go-ethereum/swarm/network/stream/testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/network" + streamTesting "github.com/zhigui-projects/go-ethereum/swarm/network/stream/testing" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) const dataChunkCount = 200 diff --git a/swarm/network/stream/testing/testing.go b/swarm/network/stream/testing/testing.go index d584ec3974..7dab13d641 100644 --- a/swarm/network/stream/testing/testing.go +++ b/swarm/network/stream/testing/testing.go @@ -27,14 +27,14 @@ 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/p2p/simulations/adapters" - "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/storage" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/network" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) type Simulation struct { diff --git a/swarm/network_test.go b/swarm/network_test.go index c291fce3b6..53b212f1dd 100644 --- a/swarm/network_test.go +++ b/swarm/network_test.go @@ -28,16 +28,16 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/swarm/api" + "github.com/zhigui-projects/go-ethereum/swarm/network" + "github.com/zhigui-projects/go-ethereum/swarm/storage" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/pot/address.go b/swarm/pot/address.go index 3974ebcaac..2c44630354 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/zhigui-projects/go-ethereum/common" ) var ( diff --git a/swarm/pot/pot_test.go b/swarm/pot/pot_test.go index aeb23dfc6b..2fa8606b4d 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/zhigui-projects/go-ethereum/swarm/log" ) const ( diff --git a/swarm/pss/api.go b/swarm/pss/api.go index eba7bb722c..a0c45af27d 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/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/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 532a223842..0ee9b5a088 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/discover" - "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/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/protocols" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/pss" ) const ( diff --git a/swarm/pss/client/client_test.go b/swarm/pss/client/client_test.go index f360698778..643eeb297a 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/discover" - "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/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/simulations" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/network" + "github.com/zhigui-projects/go-ethereum/swarm/pss" + "github.com/zhigui-projects/go-ethereum/swarm/state" + whisper "github.com/zhigui-projects/go-ethereum/whisper/whisperv5" ) type protoCtrl struct { diff --git a/swarm/pss/client/doc.go b/swarm/pss/client/doc.go index 080af45a9a..7b9e8502fd 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/zhigui-projects/go-ethereum/swarm/pss/client" +// "github.com/zhigui-projects/go-ethereum/p2p/protocols" +// "github.com/zhigui-projects/go-ethereum/p2p" +// "github.com/zhigui-projects/go-ethereum/swarm/pot" +// "github.com/zhigui-projects/go-ethereum/swarm/log" // ) // // type FooMsg struct { diff --git a/swarm/pss/handshake.go b/swarm/pss/handshake.go index 3b44847ecc..f7963b1ed9 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/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/log" ) const ( diff --git a/swarm/pss/handshake_test.go b/swarm/pss/handshake_test.go index 0fc7e798ff..99325469ab 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/zhigui-projects/go-ethereum/swarm/log" ) // asymmetrical key exchange between two directly connected peers diff --git a/swarm/pss/ping.go b/swarm/pss/ping.go index 2ef0729187..b706245f5c 100644 --- a/swarm/pss/ping.go +++ b/swarm/pss/ping.go @@ -22,9 +22,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/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/protocols" + "github.com/zhigui-projects/go-ethereum/swarm/log" ) // Generic ping protocol implementation for diff --git a/swarm/pss/protocol.go b/swarm/pss/protocol.go index bf23e49daf..4214c53a52 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/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/protocols" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/swarm/log" ) const ( diff --git a/swarm/pss/protocol_test.go b/swarm/pss/protocol_test.go index 0b6ea33cae..b55bad8cfc 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/discover" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/swarm/log" ) type protoCtrl struct { diff --git a/swarm/pss/pss.go b/swarm/pss/pss.go index 77191b25a0..ae2c100b4f 100644 --- a/swarm/pss/pss.go +++ b/swarm/pss/pss.go @@ -25,18 +25,18 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "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/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/protocols" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/network" + "github.com/zhigui-projects/go-ethereum/swarm/pot" + "github.com/zhigui-projects/go-ethereum/swarm/storage" + whisper "github.com/zhigui-projects/go-ethereum/whisper/whisperv5" ) const ( diff --git a/swarm/pss/pss_test.go b/swarm/pss/pss_test.go index a59a5e4270..db37b06c47 100644 --- a/swarm/pss/pss_test.go +++ b/swarm/pss/pss_test.go @@ -34,22 +34,22 @@ 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/discover" - "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/state" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/metrics/influxdb" + "github.com/zhigui-projects/go-ethereum/node" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/protocols" + "github.com/zhigui-projects/go-ethereum/p2p/simulations" + "github.com/zhigui-projects/go-ethereum/p2p/simulations/adapters" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/network" + "github.com/zhigui-projects/go-ethereum/swarm/state" + whisper "github.com/zhigui-projects/go-ethereum/whisper/whisperv5" ) var ( diff --git a/swarm/pss/types.go b/swarm/pss/types.go index 1e33ecdcac..9e37ebcdf1 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/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/swarm/storage" + whisper "github.com/zhigui-projects/go-ethereum/whisper/whisperv5" ) const ( diff --git a/swarm/services/swap/swap.go b/swarm/services/swap/swap.go index 91fa54fcf0..5c6dcc76c0 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/zhigui-projects/go-ethereum/accounts/abi/bind" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/contracts/chequebook" + "github.com/zhigui-projects/go-ethereum/contracts/chequebook/contract" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/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 0afca9ab30..0247d7a5f2 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/zhigui-projects/go-ethereum/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 d0e34f8a54..3b53e421be 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/zhigui-projects/go-ethereum/common" ) type testInPayment struct { diff --git a/swarm/storage/chunker.go b/swarm/storage/chunker.go index 5780742e38..f4f2ae1b0d 100644 --- a/swarm/storage/chunker.go +++ b/swarm/storage/chunker.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/swarm/log" ) /* diff --git a/swarm/storage/chunker_test.go b/swarm/storage/chunker_test.go index d8be13ef6b..e2f11d7ab2 100644 --- a/swarm/storage/chunker_test.go +++ b/swarm/storage/chunker_test.go @@ -25,7 +25,7 @@ import ( "io" "testing" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" ) /* diff --git a/swarm/storage/common.go b/swarm/storage/common.go index d86cb69144..5440c74297 100644 --- a/swarm/storage/common.go +++ b/swarm/storage/common.go @@ -18,7 +18,7 @@ package storage import ( "sync" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/log" ) // PutChunks adds chunks to localstore diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go index c6e97d68fc..1b7897da87 100644 --- a/swarm/storage/common_test.go +++ b/swarm/storage/common_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/log" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/storage/database.go b/swarm/storage/database.go index 3b5d003de1..3a733aef69 100644 --- a/swarm/storage/database.go +++ b/swarm/storage/database.go @@ -22,7 +22,7 @@ package storage import ( "fmt" - "github.com/ethereum/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/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 5ea546d6bf..325df08cb5 100644 --- a/swarm/storage/encryption/encryption_test.go +++ b/swarm/storage/encryption/encryption_test.go @@ -21,8 +21,8 @@ import ( "crypto/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" ) var expectedTransformedHex = "470c6c67ba1820d5cb4c23ccef22aa2417a323dc97e5f5dced930d74f2932fd178df80ddf129f4f8a4ccec0225c1c2e6765cbbd92bbad8413c50d93d53f7b2fec975d6f29468eccdaf6458f7a3306a7bc207211ea7f9ee5e6951ce6874aef09eb7ff9bed0aa00920b4dcc105e5f1f8dfbdb0564751311d6ceaca1e4e6d988097582638106404c03cfaef8db0e46674d9e8192c1b62d1cd952389cab3a8dee9329fdb059bafd9bae3df3a6b5a9a10961a0333016c99ee3d65cf18ea8ea7b4c386d59dcbf317460d517d5b55504b5992ffb9c3d7c49ebe1fe3ab7b00ad84b1d76d95f8165141260e6980b2ffe8a0000c36dd77ace4c7a781887f831f740d92d8b4848f1b9e237877b988b5a3e23d7b07b2c8eda0ea9fa748ab10bb6bfd7447b66f44e528d24eff31defdecddaf2bb5e6b8e2aa3d2f1a83de44e0ee3789b75dadba1375b7f3a8f7f1eb2d9b78ad1844d425fb76ea6ba45eabe88f1e062d7552d8c7d44c9c66c2753c41892cb675fd1d564b5f4746e76aa4b24ad121a907b8786715483067f46f1cd4a3dad5125f58c3d348db776e99e8a562ebe603e0e98509c72118ee81259b43f1f770dc9220dddbe4d12d2ffabdad76663d1cf30304eacbb43e9bbe0e4f95aae8609bf8a0786e56e0d20d4875d17cec644ca16824424c6c0700e5082ad5288d1a9fec637b75d24c270086a3606b97cc3240314ac123c04ff4d67ef547504f0eeea5e6252f9b5b75e47d32e583c4dee95ac84b6f03fef412e24c09697d6f7bc8408c2118c524f8e277b82658a5869d6d69d7fde469be27ea33fa22b47f3276f60580f2a05b0fbceb67949d2c8e6d8b097ceef6781d962866b23bc71b54597dd05caafbd533ff4e0013f0fc7e202782ba1e6ccd11242a5bc823af9ad0d5bcb8b78d0ce150fc6f8b97c66f9337adaf3878cbb70733044fd14f318d8e389940d07e0593e35f46dc84e7a9a75dadda153bbe5755af0683cfd262ce3797b1bc648a4e5cef5d9aa47d08cf78c6c9dd872096deb856680d5d932abfd5f2024f908ab84d19b762fdcd31209b1d9adf9cbab904bc58f5b00d5a3e0eb2ade52c7c9a678aadedb1b9257263e6145d34ebcc250d0867e2fdc2ed23b4a8e8aa580424308b543b76595f7e09127e8c301d3f6c228e656df2b5e63a89d634db2f87249025ad3b53d2703d6b93c4ab6b1dee4f9b4d2a0b383ed87458e0e1b2a3c04f9a08b885d856ea7ca9abda9a9c8bd28ecce78675b16829493dbeb66963a3665a8386bc4b97d13cfacacfa80b12e36b598d4f09ab7847481a95b35a937bd4f0107598844fc518c4134e8ca55cec024773dcf0a17c71f602406363dcc03912f23cffad9c611e34605fb03fea3d84aac33886efed6c53d455c786231436c01524cd41e2b6c35b339feaa94d7df0b3572db5595c05a1d4a96e1a17e814cea965be81786784af5697b5c7909fd7701d0f5d991f469e20fbc39536239c7a53278c0b1189253d3d978d54b51d33e0c8ac03ca1f08cfd440130944ae9d353b0b7f263a3a27d15290f35c0ad7cf62e8429ebfa10f5471987c53c5d574c9aebb935bdb8339fee9e1030b3f2845c36272642233afba71f81f10322057b51a33b434a4bc45530581c4a636895fc773e20cf6b8a6cef060920310f4cb79f735fc14e758f646b0cf3bf0ce1f1479788f5b73507203d54022c7afd805d46f45e7ede96b2660869939440d7d575fbf372a7f63421728343dfd88c5fa29ea3f15b68fe360f54afa0681093f2c82888d6babf9558159383c1a76264deec2d7fccb20dbd3ab4b3f137fb3dcf253fb6953df2f663d08e8b39909c9dbff98d49377ce0ce03c580b5e1bca6fcf58aceda42b00b1f478cff2995d47c82f2d5a3dc0e9718a0a46d8330353f2039e68d9565d29e77efea91e058ae03140a4b58b297ae664c9f0e7af78f3633f4aeabd95fd367ac5c67eb63fa2bd7035f4adfe3ab8502952d1675b47118b2006b4a5a1b2a3d03aa670862adc5f1ad1b39f0e4a08e2412128e0ef5fa84366b4b50992cc139e7837f8d65f8eae3c8dc2730f2ef1e1585ce95b0fe354c6c853526558a1732171b6017254ba0f0c22273b55caa2ee680791fb34e22bf897a0998156083c83d03310956b1f947ef474c90b2d7e20beae27f5d33b79ad6d9b1b0188e3cf850108f3a02f9386a314b97fb6c946e572e40024da3e4784c523cf2a70e45f6c0f8f35e9b279aecee183ccb30477ee4f5d57c246ab9918495159307935340a92bd46d6519bcc51af4a785a7eb7fa6eae9def89e2411efd2cb2c33f4d605b77af1ae298967fd846453e8b0a55c57706e79d7badd93268d93be27790bbb051496552b094f37bf96843cdf7604dc7f696976bebbe3561c7bd4b3f2843bd07e34a3c3acf0d6c755014a3e9d922dabdbc892511b6af3214958b3531baceab9082c2b4e19ef802b99db2cfa4076ba681efae8a9546582e4cbf07000fb3903727261b93d1bd08809ddc41b2a61b0bfa6b9210b8731394fd9084bc1406bcdd0992410e90f749a087edafb76f6617209855269bb5c89711d2830ea99f2a0e548991ef8dd3e62ced239dff4e9d8c1e834fb57078dc2a4322acc1ea1dbe64064db4cc2a7cdc32884cb7c31aa3c95634356b4d32f1c92fa039e5ed18c1af6605e2f66e5383fa1fcc610a3cc1eef5fe6296ac378f2440d0bd3c77d458af0bfa6b64cedd0301b116efafbbb8f9e88d4bedf56d11cfe0967fc06932e1f232c7daf2c73b58c52daa82dc22b2290147e358348f991f1473c4e63ac943cabc429f5689da8aee6801fd941778966da87fe137b033a0231a90a2ac759efbcb7c52de8e8f27bcc4e5bcb560524d17b0345727f8092e22b6a0e03ceee355085d4fe81568b5b8b84b69870dd333c9b3bdca45db7e43b876a217819928fec31f3ca4c44c4f03a91d578f9ed883bf1247a10eefe42279484af6f70719e193b07a14fc7d93fd6cee9e883a81cc51b53044fa2f1b2525c10e23fb988b31559e1fae4c082d905486d984d2f1e87c40976a571f92e4fdf09e23cad561d9cd3d1ca94e778d08b82852dbe9bab2c7f147c6078504c30fc3fe749fca95ed23791dcf6b935ab0ed08645c481cd2b7969258405f183593617c0d24ebe79bc6c87df65ddc25f933b12a641cc95cf321c1b2edf5db5813a98d99fd1760b5fac19c2b47c2a750e96da49c97276cf31cbd73e1e93ef6990fdf1b08a3e7963dffcf65aa6496727f6be5d9225cfbbadfd6a3a06a454acbb80e761699be97b9caeb71dc3c20a2c253f349ee190b9d8c1ff95751a281ed88b098e4a78fae8249232d4280daf46580ca6c14411f8c4d0e8fa44f8808a5a2dda36d35f79aa77c1c4c615216ec309aa5f3caff3a449b9740baad11e525a5651416a12dd4688897b5ee5e1e8361a87269e9be0789ea7564f64752788f3ac57bda4aa45582d8dabc4d44759639984514d9b151004bf0d9d3140becde41603ffd9d412ec08a1b2f7262862a761d7ce5b91a239d68cdfe7c615b62217422c5a224e652cffdbbe7b41064c9375bbf2c23b63130afedd93987c1f1e4a1623a77d3ef4960fd232afc7d12159c8f1245984e4bd390685668f10da77bf5f6130a5d405a42fb02d0048d63ca48cd4901f3704975b0493714c78de33c1a969993529bac13e310ee098a7b1e8e93b4fcb269773a1521defef98f403f79a8e24e1594b8dc6055223b79b4d7009498c02790a37dd3a9ac7168b11568877ee852395165f87d881355327e57ba48be948b1325824244a552ca80c2ecb79a04a199f0b6a58b455327d998a67ebae414394928161a311de9d3d7f1fc99c0bc35b0a814e7821d2d6958129775c56fdd9b28b6e43a3132a95eb64805f9941b0c5ca2078c37bc7a4d43ddcbc6e8c66de2ef51c714a81913bebeb8f9c6aa14da7e71854870fba9f093aa77abeb23e8d37f3a50135a3f894d1cdf647d3dceb3f16ad4b4f01dffe99d74cd1f18d37735ac69287df0a8b49b2fc3773bf426c881b64a1241c1143e39b6dca59e28c116947aac39585dd81f6fe3832f97d873884738982976f9f29aa6463662cc81c2abbd5eafbb3d9800ba811410a521065d61ad01cfde2c2d98f5fa0ec63e8b01ec6a2d738a1f6cf8c99725079aa51ed3dc7630deeea0b27ee8edbfa19bdb8504cf80a1ca74ea6777fa8786fd76d4ab019c00da35278bf49be5a42aff264875b69bab9e7f3f9299f2ea6a883fc5fd77e34debf414ce8af37a3e9a7de05f33bc547899d25a13389d9048be8b2b7c9b836b401eac9c53ba3d44a14e683a6b378248fdedcbfbc408e5ec83a6c3f769533ae90e339222d80d433ae820fca43d80bca7fbd9d6e5eb760271c74a95a35a853285f7dcfe10182af922508501d269cc53ed38756e8d202b25782ec208a39981ef6c9e9342eb6cee2142471574ab39ebdbbf140f64e305d6f6aa73d49d5bb765347a27ebd0ba1bdcaa8a383526b41f3361faddafec726e185cc223f8465472d7a53ad2d74717960ba5684bc692f773e680d0247f9de1650c046ea56fa18c1c3fb6636327f863f37dca86867c57cc643ff6b7973f97c91716502c33f0dc66176357315f09064c70df7db026413567ac9ec7605acd80606d962f7463359998b92f8a33ccffc80f6e162c1b5a65404e0cc4e37688ded910e6ae5f774e3238a1248b05c53486d149734dd1e38073603df0aa4a4f01fd0c1a0e82b6a513f7d22d1b09ff107923462fbfffbf5fb1f2c043e305917eee1f7f18f62dc604a1d39e5bf675dca67da52f95d312b31be7720efd391bf4794f0555b299325b5dfea9eb00e695861634ad28717cffff266e30c864ba844b0c3fd88bd0cee4d929530c2bb3663c5170a15a66c412ff2fed2d962dd0ff145f19f8085931cbd6bde4c11c9c2debfbdb6748d1a6dabf1404762343d468944a0495026091bc44c69dad971890b7221e1eac2e985097d344a4e2375938aa93806ad1715be8d05f4068ec67ef411e704b01851b7427c4137e6dadedfbb25378ecf1c6b749214f2655cf43fdbb72cb842aaab3074cd792f30f96e874d92f2ef62667d81ccd663dfd969c18dff790b6b7b261f0a03baa85bfd7db72baffe2ddc4cc3985183301a77daa826b1f76f6b6f2ac075c6a2b86609e4d26eb08f3ed6f341d7946966e654ed2c30a629ff81a57014a84105a9ad36a525033f16e3e60d639bf8f89ae6cfdbcdb41e93859354957dcfe9a847757c3cd946d8994cda126f146b77119bbc87c49ce79ad844715cd9bb0c7a4f800fce14c81d175aed59fce0377e62c6e597ab5acf1b3b7100403f371c19dd0f131c4c572e57e3e13743f9bac24a6a177d71f03c5d185bb7e163ec5866dda629340a964bc442d423ad7bc5187f3da68d1498dfe9f1815b31bae11df3585ece230cc3521f7a0b4b3360ddf898984b528afff75f229915f1f2d5c4491c65e2f38d26c0de7dc483860da7bf52859fdbc21946badec0bbf00ba8143b8b7289cfb7096d3405e3183e56f1cbb8c48f25d058530894d0302cdce7c43ea31768b5b610820c97f6e9a8e31a8e9c4624117d213a03ef7d655513cffd8fb5606fc8790692c99828a47382e3e37b9c1317028f5c9d196ff3c2f09435df7614fb37ea20b2371c52b6c4667799922010edeb28001de2a137889db4d3dbf0a406ba90f3631be485ec5e4110b01502f557f15026716030fb6384499adee3cfc44015638e05b206ce3cbc3cbf21b7dd1dcb3b932629e7cd4f4f6b148f37f976803644e5ce792583daf39608a3cd02ff2f47e9bc6" diff --git a/swarm/storage/hasherstore.go b/swarm/storage/hasherstore.go index e659c3681e..7110ddcfba 100644 --- a/swarm/storage/hasherstore.go +++ b/swarm/storage/hasherstore.go @@ -20,8 +20,8 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/swarm/storage/encryption" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/swarm/storage/encryption" ) type chunkEncryption struct { diff --git a/swarm/storage/hasherstore_test.go b/swarm/storage/hasherstore_test.go index ccb37524a0..e8c668e540 100644 --- a/swarm/storage/hasherstore_test.go +++ b/swarm/storage/hasherstore_test.go @@ -20,9 +20,9 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/swarm/storage/encryption" + "github.com/zhigui-projects/go-ethereum/swarm/storage/encryption" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) func TestHasherStore(t *testing.T) { diff --git a/swarm/storage/ldbstore.go b/swarm/storage/ldbstore.go index 178b1ebc40..4b3728b9f5 100644 --- a/swarm/storage/ldbstore.go +++ b/swarm/storage/ldbstore.go @@ -33,10 +33,10 @@ import ( "sort" "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/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/storage/mock" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/opt" ) diff --git a/swarm/storage/ldbstore_test.go b/swarm/storage/ldbstore_test.go index 2c706a75bd..cfce18a1b9 100644 --- a/swarm/storage/ldbstore_test.go +++ b/swarm/storage/ldbstore_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/storage/mock/mem" ldberrors "github.com/syndtr/goleveldb/leveldb/errors" ) diff --git a/swarm/storage/localstore.go b/swarm/storage/localstore.go index 4c57086faf..ed81052628 100644 --- a/swarm/storage/localstore.go +++ b/swarm/storage/localstore.go @@ -22,9 +22,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/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/storage/mock" ) type LocalStoreParams struct { diff --git a/swarm/storage/memstore_test.go b/swarm/storage/memstore_test.go index 5c68a4b4be..13d84dfea9 100644 --- a/swarm/storage/memstore_test.go +++ b/swarm/storage/memstore_test.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/log" ) func newTestMemStore() *MemStore { diff --git a/swarm/storage/mock/db/db.go b/swarm/storage/mock/db/db.go index 43bfa24f05..d9b841a9c6 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/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/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 782faaf35c..dc6c61d2e4 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/zhigui-projects/go-ethereum/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 8878309d0e..c9cf67d0ed 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/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/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 adcefaabb4..f8b0dba384 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/zhigui-projects/go-ethereum/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 81340f9274..ec8d509e5f 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/zhigui-projects/go-ethereum/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 6e735f6988..f6a98f7529 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/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/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 52b634a445..c5b432ef69 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/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/storage/mock/mem" + "github.com/zhigui-projects/go-ethereum/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 02da3af553..eb55200001 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/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/swarm/storage/mock" ) // MockStore creates NodeStore instances from provided GlobalStorer, diff --git a/swarm/storage/mru/resource.go b/swarm/storage/mru/resource.go index 1e92a5e929..772ad75c5a 100644 --- a/swarm/storage/mru/resource.go +++ b/swarm/storage/mru/resource.go @@ -29,13 +29,13 @@ import ( "golang.org/x/net/idna" - "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/crypto" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/multihash" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/contracts/ens" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/multihash" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) const ( diff --git a/swarm/storage/mru/resource_sign.go b/swarm/storage/mru/resource_sign.go index c6185a3bbc..c0af28a254 100644 --- a/swarm/storage/mru/resource_sign.go +++ b/swarm/storage/mru/resource_sign.go @@ -19,8 +19,8 @@ package mru import ( "crypto/ecdsa" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" ) // Signs resource updates diff --git a/swarm/storage/mru/resource_test.go b/swarm/storage/mru/resource_test.go index aa1860359d..01d7bcd175 100644 --- a/swarm/storage/mru/resource_test.go +++ b/swarm/storage/mru/resource_test.go @@ -30,17 +30,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/contracts/ens/contract" - "github.com/ethereum/go-ethereum/core" - "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/multihash" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind/backends" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/contracts/ens" + "github.com/zhigui-projects/go-ethereum/contracts/ens/contract" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/swarm/multihash" + "github.com/zhigui-projects/go-ethereum/swarm/storage" ) var ( diff --git a/swarm/storage/netstore.go b/swarm/storage/netstore.go index 6a205cfa44..6dc0e1fcd1 100644 --- a/swarm/storage/netstore.go +++ b/swarm/storage/netstore.go @@ -19,7 +19,7 @@ package storage import ( "time" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/log" ) var ( diff --git a/swarm/storage/netstore_test.go b/swarm/storage/netstore_test.go index 432a799d86..e428d0f4e5 100644 --- a/swarm/storage/netstore_test.go +++ b/swarm/storage/netstore_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/network" + "github.com/zhigui-projects/go-ethereum/swarm/network" ) var ( diff --git a/swarm/storage/pyramid.go b/swarm/storage/pyramid.go index 01172cb77a..79d123721a 100644 --- a/swarm/storage/pyramid.go +++ b/swarm/storage/pyramid.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/log" ) /* diff --git a/swarm/storage/types.go b/swarm/storage/types.go index b75f64205f..f355010b9d 100644 --- a/swarm/storage/types.go +++ b/swarm/storage/types.go @@ -26,9 +26,9 @@ import ( "io" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/swarm/bmt" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/swarm/bmt" ) const MaxPO = 16 diff --git a/swarm/swarm.go b/swarm/swarm.go index 90360264ee..3c7dd7a619 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -28,28 +28,28 @@ 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/discover" - "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/mock" - "github.com/ethereum/go-ethereum/swarm/storage/mru" + "github.com/zhigui-projects/go-ethereum/accounts/abi/bind" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/contracts/chequebook" + "github.com/zhigui-projects/go-ethereum/contracts/ens" + "github.com/zhigui-projects/go-ethereum/ethclient" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/protocols" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/api" + httpapi "github.com/zhigui-projects/go-ethereum/swarm/api/http" + "github.com/zhigui-projects/go-ethereum/swarm/fuse" + "github.com/zhigui-projects/go-ethereum/swarm/log" + "github.com/zhigui-projects/go-ethereum/swarm/network" + "github.com/zhigui-projects/go-ethereum/swarm/network/stream" + "github.com/zhigui-projects/go-ethereum/swarm/pss" + "github.com/zhigui-projects/go-ethereum/swarm/state" + "github.com/zhigui-projects/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/swarm/storage/mock" + "github.com/zhigui-projects/go-ethereum/swarm/storage/mru" ) var ( diff --git a/swarm/swarm_test.go b/swarm/swarm_test.go index f82a9c6fac..fceb6fb0ea 100644 --- a/swarm/swarm_test.go +++ b/swarm/swarm_test.go @@ -25,10 +25,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/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/swarm/api" ) // TestNewSwarm validates Swarm fields in repsect to the provided configuration. diff --git a/swarm/testutil/http.go b/swarm/testutil/http.go index debf0b14b5..91fb9be17c 100644 --- a/swarm/testutil/http.go +++ b/swarm/testutil/http.go @@ -25,10 +25,10 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mru" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/swarm/api" + "github.com/zhigui-projects/go-ethereum/swarm/storage" + "github.com/zhigui-projects/go-ethereum/swarm/storage/mru" ) type TestServer interface { diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 2db47da57f..02c752f18c 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -24,17 +24,17 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index 20294cc9d5..7f5d28c30d 100644 --- a/tests/difficulty_test.go +++ b/tests/difficulty_test.go @@ -21,8 +21,8 @@ import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/params" ) var ( diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 00d699cf75..508a9d25a3 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -20,11 +20,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/consensus/ethash" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/params" ) //go:generate gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index 5cfd4bd0ae..cfc68f39f3 100644 --- a/tests/gen_btheader.go +++ b/tests/gen_btheader.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index 88f36ce999..07105d0596 100644 --- a/tests/gen_difficultytest.go +++ b/tests/gen_difficultytest.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index 1d4baf2fd7..782dcfde73 100644 --- a/tests/gen_stenv.go +++ b/tests/gen_stenv.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 451ffcbf43..7daa4cb583 100644 --- a/tests/gen_sttransaction.go +++ b/tests/gen_sttransaction.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/gen_tttransaction.go b/tests/gen_tttransaction.go index 2948842d97..06ced6e29e 100644 --- a/tests/gen_tttransaction.go +++ b/tests/gen_tttransaction.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" ) var _ = (*ttTransactionMarshaling)(nil) diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go index a5f01cf456..1196cb5558 100644 --- a/tests/gen_vmexec.go +++ b/tests/gen_vmexec.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" ) var _ = (*vmExecMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index af65f92069..20a0a33c4e 100644 --- a/tests/init.go +++ b/tests/init.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/params" ) // Forks table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index 26e919d24b..d493b4af39 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -29,7 +29,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index 58ef8a6428..e9744b9ca7 100644 --- a/tests/rlp_test_util.go +++ b/tests/rlp_test_util.go @@ -24,7 +24,7 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index adec4feb2b..9b8bc42222 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/core/vm" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 84581fae18..4b1dcd26db 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -23,18 +23,18 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" ) // StateTest checks transaction processing without block context. diff --git a/tests/transaction_test.go b/tests/transaction_test.go index 42ad81877e..c48568b180 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 8c3dac088c..1533219b53 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/core/types" + "github.com/zhigui-projects/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/tests/vm_test.go b/tests/vm_test.go index c9f5e225e9..e7057360d2 100644 --- a/tests/vm_test.go +++ b/tests/vm_test.go @@ -19,7 +19,7 @@ package tests import ( "testing" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/core/vm" ) func TestVM(t *testing.T) { diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index cb81c5b94e..e187f4ea8b 100644 --- a/tests/vm_test_util.go +++ b/tests/vm_test_util.go @@ -22,15 +22,15 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/core" + "github.com/zhigui-projects/go-ethereum/core/state" + "github.com/zhigui-projects/go-ethereum/core/vm" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/params" ) // VMTest checks EVM execution without block or transaction context. diff --git a/trie/database.go b/trie/database.go index df7fc01eab..0c240ff72f 100644 --- a/trie/database.go +++ b/trie/database.go @@ -22,11 +22,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/rlp" ) var ( diff --git a/trie/errors.go b/trie/errors.go index 567b80078c..1ca242eb08 100644 --- a/trie/errors.go +++ b/trie/errors.go @@ -19,7 +19,7 @@ package trie import ( "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index 7b1d7793fa..c96c46a86f 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -20,9 +20,9 @@ import ( "hash" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto/sha3" + "github.com/zhigui-projects/go-ethereum/rlp" ) type hasher struct { diff --git a/trie/iterator.go b/trie/iterator.go index 00b890eb89..7348abff3f 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,8 +21,8 @@ import ( "container/heap" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/rlp" ) // Iterator is a key-value trie iterator that traverses a Trie. diff --git a/trie/iterator_test.go b/trie/iterator_test.go index 2a510b1c2d..71bb677c8a 100644 --- a/trie/iterator_test.go +++ b/trie/iterator_test.go @@ -22,8 +22,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/ethdb" ) func TestIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index a06f1b3898..157aee739b 100644 --- a/trie/node.go +++ b/trie/node.go @@ -21,8 +21,8 @@ import ( "io" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/rlp" ) var indices = []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "[17]"} diff --git a/trie/proof.go b/trie/proof.go index 6cb8f4d5f7..fac8bcd343 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -20,11 +20,11 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/rlp" ) // Prove constructs a merkle proof for key. The result contains all encoded nodes diff --git a/trie/proof_test.go b/trie/proof_test.go index 996f874781..cb81e958d8 100644 --- a/trie/proof_test.go +++ b/trie/proof_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" ) func init() { diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 6a50cfd5a6..de8b28e74a 100644 --- a/trie/secure_trie.go +++ b/trie/secure_trie.go @@ -19,8 +19,8 @@ package trie import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/log" ) // SecureTrie wraps a trie with key hashing. In a secure trie, all diff --git a/trie/secure_trie_test.go b/trie/secure_trie_test.go index d16d999684..a72e9b28a9 100644 --- a/trie/secure_trie_test.go +++ b/trie/secure_trie_test.go @@ -22,9 +22,9 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" ) func newEmptySecure() *SecureTrie { diff --git a/trie/sync.go b/trie/sync.go index ccec80c9e3..efb9b738fa 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -20,8 +20,8 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/ethdb" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/trie/sync_test.go b/trie/sync_test.go index c76779e5c7..e58270e32a 100644 --- a/trie/sync_test.go +++ b/trie/sync_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/ethdb" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/trie.go b/trie/trie.go index 4284e30ad4..1f19e65133 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -21,10 +21,10 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/metrics" ) var ( diff --git a/trie/trie_test.go b/trie/trie_test.go index f8e5fd12a1..f079a02e73 100644 --- a/trie/trie_test.go +++ b/trie/trie_test.go @@ -30,10 +30,10 @@ import ( "testing/quick" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/ethdb" + "github.com/zhigui-projects/go-ethereum/rlp" ) func init() { diff --git a/whisper/mailserver/mailserver.go b/whisper/mailserver/mailserver.go index d32eaddec3..2ae8d77234 100644 --- a/whisper/mailserver/mailserver.go +++ b/whisper/mailserver/mailserver.go @@ -20,11 +20,11 @@ import ( "encoding/binary" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/rlp" + whisper "github.com/zhigui-projects/go-ethereum/whisper/whisperv6" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/whisper/mailserver/server_test.go b/whisper/mailserver/server_test.go index edb817cc75..6e61c9053e 100644 --- a/whisper/mailserver/server_test.go +++ b/whisper/mailserver/server_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + whisper "github.com/zhigui-projects/go-ethereum/whisper/whisperv6" ) const powRequirement = 0.00001 diff --git a/whisper/shhclient/client.go b/whisper/shhclient/client.go index a814154e47..4f911fdd8a 100644 --- a/whisper/shhclient/client.go +++ b/whisper/shhclient/client.go @@ -19,10 +19,10 @@ package shhclient import ( "context" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/zhigui-projects/go-ethereum" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/rpc" + whisper "github.com/zhigui-projects/go-ethereum/whisper/whisperv6" ) // Client defines typed wrappers for the Whisper v6 RPC API. diff --git a/whisper/whisperv5/api.go b/whisper/whisperv5/api.go index 2ce4642202..350e5e785d 100644 --- a/whisper/whisperv5/api.go +++ b/whisper/whisperv5/api.go @@ -24,12 +24,12 @@ 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/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/rpc" ) var ( diff --git a/whisper/whisperv5/benchmarks_test.go b/whisper/whisperv5/benchmarks_test.go index dcfbcb56d8..033013e9e1 100644 --- a/whisper/whisperv5/benchmarks_test.go +++ b/whisper/whisperv5/benchmarks_test.go @@ -19,7 +19,7 @@ package whisperv5 import ( "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto" ) func BenchmarkDeriveKeyMaterial(b *testing.B) { diff --git a/whisper/whisperv5/envelope.go b/whisper/whisperv5/envelope.go index 169cbba9dd..4a99270cc3 100644 --- a/whisper/whisperv5/envelope.go +++ b/whisper/whisperv5/envelope.go @@ -26,11 +26,11 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto/ecies" + "github.com/zhigui-projects/go-ethereum/rlp" ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv5/filter.go b/whisper/whisperv5/filter.go index 3190334ebb..ee7377d2b5 100644 --- a/whisper/whisperv5/filter.go +++ b/whisper/whisperv5/filter.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" ) type Filter struct { diff --git a/whisper/whisperv5/filter_test.go b/whisper/whisperv5/filter_test.go index 01034a3513..98a6977b7b 100644 --- a/whisper/whisperv5/filter_test.go +++ b/whisper/whisperv5/filter_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" ) var seed int64 diff --git a/whisper/whisperv5/gen_criteria_json.go b/whisper/whisperv5/gen_criteria_json.go index 1c0e389ad9..899a5aafd1 100644 --- a/whisper/whisperv5/gen_criteria_json.go +++ b/whisper/whisperv5/gen_criteria_json.go @@ -5,7 +5,7 @@ package whisperv5 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv5/gen_message_json.go b/whisper/whisperv5/gen_message_json.go index b4c4274d07..880833c694 100644 --- a/whisper/whisperv5/gen_message_json.go +++ b/whisper/whisperv5/gen_message_json.go @@ -5,7 +5,7 @@ package whisperv5 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv5/gen_newmessage_json.go b/whisper/whisperv5/gen_newmessage_json.go index 97ffb64ad3..5d9016700c 100644 --- a/whisper/whisperv5/gen_newmessage_json.go +++ b/whisper/whisperv5/gen_newmessage_json.go @@ -5,7 +5,7 @@ package whisperv5 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv5/message.go b/whisper/whisperv5/message.go index 35711d724b..942fd9839a 100644 --- a/whisper/whisperv5/message.go +++ b/whisper/whisperv5/message.go @@ -27,10 +27,10 @@ import ( "errors" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto/ecies" + "github.com/zhigui-projects/go-ethereum/log" ) // MessageParams specifies the exact way a message should be wrapped into an Envelope. diff --git a/whisper/whisperv5/message_test.go b/whisper/whisperv5/message_test.go index 2edf945df0..fdee9dfec8 100644 --- a/whisper/whisperv5/message_test.go +++ b/whisper/whisperv5/message_test.go @@ -21,8 +21,8 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv5/peer.go b/whisper/whisperv5/peer.go index da07631992..bf6a11b760 100644 --- a/whisper/whisperv5/peer.go +++ b/whisper/whisperv5/peer.go @@ -20,10 +20,10 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rlp" set "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv5/peer_test.go b/whisper/whisperv5/peer_test.go index 256a670aa4..f72a92f36c 100644 --- a/whisper/whisperv5/peer_test.go +++ b/whisper/whisperv5/peer_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/nat" ) var keys = []string{ diff --git a/whisper/whisperv5/topic.go b/whisper/whisperv5/topic.go index c4eda1db42..0ccde85135 100644 --- a/whisper/whisperv5/topic.go +++ b/whisper/whisperv5/topic.go @@ -19,8 +19,8 @@ package whisperv5 import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) // TopicType represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv5/whisper.go b/whisper/whisperv5/whisper.go index cec233cb04..d6c2135643 100644 --- a/whisper/whisperv5/whisper.go +++ b/whisper/whisperv5/whisper.go @@ -26,11 +26,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rpc" "github.com/syndtr/goleveldb/leveldb/errors" "golang.org/x/crypto/pbkdf2" "golang.org/x/sync/syncmap" diff --git a/whisper/whisperv5/whisper_test.go b/whisper/whisperv5/whisper_test.go index 8af085292a..2050a2b7dc 100644 --- a/whisper/whisperv5/whisper_test.go +++ b/whisper/whisperv5/whisper_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" ) func TestWhisperBasic(t *testing.T) { diff --git a/whisper/whisperv6/api.go b/whisper/whisperv6/api.go index d729e79c35..0956d7aa70 100644 --- a/whisper/whisperv6/api.go +++ b/whisper/whisperv6/api.go @@ -24,12 +24,12 @@ 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/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/rpc" ) // List of errors diff --git a/whisper/whisperv6/api_test.go b/whisper/whisperv6/api_test.go index 004a41c949..4c88657252 100644 --- a/whisper/whisperv6/api_test.go +++ b/whisper/whisperv6/api_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" set "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv6/benchmarks_test.go b/whisper/whisperv6/benchmarks_test.go index 0473179da5..02358b28e2 100644 --- a/whisper/whisperv6/benchmarks_test.go +++ b/whisper/whisperv6/benchmarks_test.go @@ -20,7 +20,7 @@ import ( "crypto/sha256" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto" "golang.org/x/crypto/pbkdf2" ) diff --git a/whisper/whisperv6/envelope.go b/whisper/whisperv6/envelope.go index c42d1fa8ac..ff7336ccd9 100644 --- a/whisper/whisperv6/envelope.go +++ b/whisper/whisperv6/envelope.go @@ -26,11 +26,11 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/math" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto/ecies" + "github.com/zhigui-projects/go-ethereum/rlp" ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv6/envelope_test.go b/whisper/whisperv6/envelope_test.go index 410b250a3f..69625a4bcd 100644 --- a/whisper/whisperv6/envelope_test.go +++ b/whisper/whisperv6/envelope_test.go @@ -22,7 +22,7 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto" ) func TestEnvelopeOpenAcceptsOnlyOneKeyTypeInFilter(t *testing.T) { diff --git a/whisper/whisperv6/filter.go b/whisper/whisperv6/filter.go index 2f170ddebe..339e5373a0 100644 --- a/whisper/whisperv6/filter.go +++ b/whisper/whisperv6/filter.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" ) // Filter represents a Whisper message filter diff --git a/whisper/whisperv6/filter_test.go b/whisper/whisperv6/filter_test.go index 0bb7986c39..18d6b580a0 100644 --- a/whisper/whisperv6/filter_test.go +++ b/whisper/whisperv6/filter_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" ) var seed int64 diff --git a/whisper/whisperv6/gen_criteria_json.go b/whisper/whisperv6/gen_criteria_json.go index 1a428d6df7..e6f817868e 100644 --- a/whisper/whisperv6/gen_criteria_json.go +++ b/whisper/whisperv6/gen_criteria_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv6/gen_message_json.go b/whisper/whisperv6/gen_message_json.go index 6218f5df6e..a4c6d03b7a 100644 --- a/whisper/whisperv6/gen_message_json.go +++ b/whisper/whisperv6/gen_message_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv6/gen_newmessage_json.go b/whisper/whisperv6/gen_newmessage_json.go index 75a1279ae3..693dfc4762 100644 --- a/whisper/whisperv6/gen_newmessage_json.go +++ b/whisper/whisperv6/gen_newmessage_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv6/message.go b/whisper/whisperv6/message.go index 2d4e862441..22ea42752b 100644 --- a/whisper/whisperv6/message.go +++ b/whisper/whisperv6/message.go @@ -28,10 +28,10 @@ import ( mrand "math/rand" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/crypto/ecies" + "github.com/zhigui-projects/go-ethereum/log" ) // MessageParams specifies the exact way a message should be wrapped diff --git a/whisper/whisperv6/message_test.go b/whisper/whisperv6/message_test.go index 0a5c1c8533..9c5a9f8f9f 100644 --- a/whisper/whisperv6/message_test.go +++ b/whisper/whisperv6/message_test.go @@ -23,9 +23,9 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv6/peer.go b/whisper/whisperv6/peer.go index 2bf1c905b2..451c0fa403 100644 --- a/whisper/whisperv6/peer.go +++ b/whisper/whisperv6/peer.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rlp" set "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv6/peer_test.go b/whisper/whisperv6/peer_test.go index 0c9b380901..491b390113 100644 --- a/whisper/whisperv6/peer_test.go +++ b/whisper/whisperv6/peer_test.go @@ -28,12 +28,12 @@ import ( "net" - "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/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/p2p/discover" + "github.com/zhigui-projects/go-ethereum/p2p/nat" ) var keys = []string{ diff --git a/whisper/whisperv6/topic.go b/whisper/whisperv6/topic.go index 4dd8f283c3..befea4ebc6 100644 --- a/whisper/whisperv6/topic.go +++ b/whisper/whisperv6/topic.go @@ -19,8 +19,8 @@ package whisperv6 import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common/hexutil" ) // TopicType represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go index 3418c7bf7d..30ef6509b2 100644 --- a/whisper/whisperv6/whisper.go +++ b/whisper/whisperv6/whisper.go @@ -26,12 +26,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/zhigui-projects/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/crypto" + "github.com/zhigui-projects/go-ethereum/log" + "github.com/zhigui-projects/go-ethereum/p2p" + "github.com/zhigui-projects/go-ethereum/rlp" + "github.com/zhigui-projects/go-ethereum/rpc" "github.com/syndtr/goleveldb/leveldb/errors" "golang.org/x/crypto/pbkdf2" "golang.org/x/sync/syncmap" diff --git a/whisper/whisperv6/whisper_test.go b/whisper/whisperv6/whisper_test.go index 7fe256309e..eb48c75539 100644 --- a/whisper/whisperv6/whisper_test.go +++ b/whisper/whisperv6/whisper_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/zhigui-projects/go-ethereum/common" "golang.org/x/crypto/pbkdf2" )