diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b0bad225a4c6..72dee4361bae 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,7 +2,7 @@ Before you do a feature request please check and make sure that it isn't possible through some other means. The JavaScript enabled console is a powerful feature -in the right hands. Please check our [Bitchin' tricks](https://github.com/teamnsrg/go-ethereum/wiki/bitchin-tricks) wiki page for more info +in the right hands. Please check our [Bitchin' tricks](https://github.com/teamnsrg/ethereum-p2p/wiki/bitchin-tricks) wiki page for more info and help. ## Contributing @@ -11,6 +11,6 @@ If you'd like to contribute to go-ethereum please fork, fix, commit and send a pull request. Commits which do not comply with the coding standards are ignored (use gofmt!). -See [Developers' Guide](https://github.com/teamnsrg/go-ethereum/wiki/Developers'-Guide) +See [Developers' Guide](https://github.com/teamnsrg/ethereum-p2p/wiki/Developers'-Guide) for more details on configuring your environment, testing, and dependency management. diff --git a/.travis.yml b/.travis.yml index 2c4ae4326c34..946c9bcb3fd1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: github.com/teamnsrg/go-ethereum +go_import_path: github.com/teamnsrg/ethereum-p2p sudo: false matrix: include: diff --git a/README.md b/README.md index 8ed37ce8aaeb..5e068301dc3a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Official golang implementation of the Ethereum protocol. [![API Reference]( https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667 -)](https://godoc.org/github.com/teamnsrg/go-ethereum) +)](https://godoc.org/github.com/teamnsrg/ethereum-p2p) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/go-ethereum?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) Automated builds are available for stable releases and the unstable master branch. @@ -13,7 +13,7 @@ Binary archives are published at https://geth.ethereum.org/downloads/. ## Building the source For prerequisites and detailed build instructions please read the -[Installation Instructions](https://github.com/teamnsrg/go-ethereum/wiki/Building-Ethereum) +[Installation Instructions](https://github.com/teamnsrg/ethereum-p2p/wiki/Building-Ethereum) on the wiki. Building geth requires both a Go (version 1.7 or later) and a C compiler. @@ -32,8 +32,8 @@ The go-ethereum project comes with several wrappers/executables found in the `cm | Command | Description | |:----------:|-------------| -| **`geth`** | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default) archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as a gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `geth --help` and the [CLI Wiki page](https://github.com/teamnsrg/go-ethereum/wiki/Command-Line-Options) for command line options. | -| `abigen` | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI) with expanded functionality if the contract bytecode is also available. However it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://github.com/teamnsrg/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. | +| **`geth`** | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default) archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as a gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `geth --help` and the [CLI Wiki page](https://github.com/teamnsrg/ethereum-p2p/wiki/Command-Line-Options) for command line options. | +| `abigen` | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI) with expanded functionality if the contract bytecode is also available. However it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://github.com/teamnsrg/ethereum-p2p/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. | | `bootnode` | Stripped down version of our Ethereum client implementation that only takes part in the network node discovery protocol, but does not run any of the higher level application protocols. It can be used as a lightweight bootstrap node to aid in finding peers in private networks. | | `evm` | Developer utility version of the EVM (Ethereum Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode. Its purpose is to allow isolated, fine-grained debugging of EVM opcodes (e.g. `evm --code 60ff60ff --debug`). | | `gethrpctest` | Developer utility tool to support our [ethereum/rpc-test](https://github.com/ethereum/rpc-tests) test suite which validates baseline conformity to the [Ethereum JSON RPC](https://github.com/ethereum/wiki/wiki/JSON-RPC) specs. Please see the [test suite's readme](https://github.com/ethereum/rpc-tests/blob/master/README.md) for details. | @@ -44,7 +44,7 @@ The go-ethereum project comes with several wrappers/executables found in the `cm ## Running geth Going through all the possible command line flags is out of scope here (please consult our -[CLI Wiki page](https://github.com/teamnsrg/go-ethereum/wiki/Command-Line-Options)), but we've +[CLI Wiki page](https://github.com/teamnsrg/ethereum-p2p/wiki/Command-Line-Options)), but we've enumerated a few common parameter combos to get you up to speed quickly on how you can run your own Geth instance. @@ -66,9 +66,9 @@ This command will: * Bump the memory allowance of the database to 512MB (`--cache=512`), which can help significantly in sync times especially for HDD users. This flag is optional and you can set it as high or as low as you'd like, though we'd recommend the 512MB - 2GB range. - * Start up Geth's built-in interactive [JavaScript console](https://github.com/teamnsrg/go-ethereum/wiki/JavaScript-Console), + * Start up Geth's built-in interactive [JavaScript console](https://github.com/teamnsrg/ethereum-p2p/wiki/JavaScript-Console), (via the trailing `console` subcommand) through which you can invoke all official [`web3` methods](https://github.com/ethereum/wiki/wiki/JavaScript-API) - as well as Geth's own [management APIs](https://github.com/teamnsrg/go-ethereum/wiki/Management-APIs). + as well as Geth's own [management APIs](https://github.com/teamnsrg/ethereum-p2p/wiki/Management-APIs). This too is optional and if you leave it out you can always attach to an already running Geth instance with `geth attach`. @@ -137,7 +137,7 @@ Do not forget `--rpcaddr 0.0.0.0`, if you want to access RPC from other containe As a developer, sooner rather than later you'll want to start interacting with Geth and the Ethereum network via your own programs and not manually through the console. To aid this, Geth has built in support for a JSON-RPC based APIs ([standard APIs](https://github.com/ethereum/wiki/wiki/JSON-RPC) and -[Geth specific APIs](https://github.com/teamnsrg/go-ethereum/wiki/Management-APIs)). These can be +[Geth specific APIs](https://github.com/teamnsrg/ethereum-p2p/wiki/Management-APIs)). These can be exposed via HTTP, WebSockets and IPC (unix sockets on unix based platforms, and named pipes on Windows). The IPC interface is enabled by default and exposes all the APIs supported by Geth, whereas the HTTP @@ -290,7 +290,7 @@ Please make sure your contributions adhere to our coding guidelines: * Commit messages should be prefixed with the package(s) they modify. * E.g. "eth, rpc: make trace configs optional" -Please see the [Developers' Guide](https://github.com/teamnsrg/go-ethereum/wiki/Developers'-Guide) +Please see the [Developers' Guide](https://github.com/teamnsrg/ethereum-p2p/wiki/Developers'-Guide) for more details on configuring your environment, managing project dependencies and testing procedures. ## License diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go index 849095cd6f20..6fbe81025c08 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" ) const jsondata = ` diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index d6d5acee5a71..9cc15b2a610a 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -22,10 +22,10 @@ import ( "io" "io/ioutil" - "github.com/teamnsrg/go-ethereum/accounts/keystore" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/accounts/keystore" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" ) // NewTransactor is a utility method to easily create a transaction signer from diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go index ba1333a7a1fd..760cc3f3deec 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/teamnsrg/go-ethereum" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 9cdcee5f06f2..76c674668471 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -24,17 +24,17 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) // This nil assignment ensures compile time that SimulatedBackend implements bind.ContractBackend. diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index a88936792714..72e1ecd575e4 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -22,11 +22,11 @@ import ( "fmt" "math/big" - "github.com/teamnsrg/go-ethereum" - "github.com/teamnsrg/go-ethereum/accounts/abi" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p" + "github.com/teamnsrg/ethereum-p2p/accounts/abi" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" ) // SignerFn is a signer function callback when a contract requires a method to diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go index 26e17c323b13..36431fe028a5 100644 --- a/accounts/abi/bind/bind.go +++ b/accounts/abi/bind/bind.go @@ -17,7 +17,7 @@ // Package bind generates Ethereum contract Go bindings. // // Detailed usage document and tutorial available on the go-ethereum Wiki page: -// https://github.com/teamnsrg/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts +// https://github.com/teamnsrg/ethereum-p2p/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts package bind import ( @@ -28,7 +28,7 @@ import ( "text/template" "unicode" - "github.com/teamnsrg/go-ethereum/accounts/abi" + "github.com/teamnsrg/ethereum-p2p/accounts/abi" "golang.org/x/tools/imports" ) diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index 4d2ff1f4754c..e6dcad91063e 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -16,7 +16,7 @@ package bind -import "github.com/teamnsrg/go-ethereum/accounts/abi" +import "github.com/teamnsrg/ethereum-p2p/accounts/abi" // tmplData is the data structure required to fill the binding template. type tmplData struct { diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index 370d926e2eb8..d8517361c854 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/log" ) // WaitMined waits for tx to be mined on the blockchain. diff --git a/accounts/abi/bind/util_test.go b/accounts/abi/bind/util_test.go index 54cc1d69be47..9db05884f13d 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind/backends" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind/backends" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/event.go b/accounts/abi/event.go index af41814bf110..640e976b79fc 100644 --- a/accounts/abi/event.go +++ b/accounts/abi/event.go @@ -21,8 +21,8 @@ import ( "reflect" "strings" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" ) // Event is an event potentially triggered by the EVM's LOG mechanism. The Event diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go index eb9e0ddd836a..5b210080cfa5 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -20,8 +20,8 @@ import ( "strings" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" ) func TestEventId(t *testing.T) { diff --git a/accounts/abi/method.go b/accounts/abi/method.go index 44819820407a..d8d0f350fc40 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -21,7 +21,7 @@ import ( "reflect" "strings" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/crypto" ) // Callable method given a `Name` and whether the method is a constant. diff --git a/accounts/abi/numbers.go b/accounts/abi/numbers.go index 9c28ac7027c1..4d68923c8991 100644 --- a/accounts/abi/numbers.go +++ b/accounts/abi/numbers.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" ) var ( diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index e80b853a93cc..a13e9ba4c2f2 100644 --- a/accounts/abi/pack.go +++ b/accounts/abi/pack.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" ) // packBytesSlice packs the given bytes as [L, V] as the canonical representation diff --git a/accounts/abi/pack_test.go b/accounts/abi/pack_test.go index c5e1d8b133db..e605d08163ff 100644 --- a/accounts/abi/pack_test.go +++ b/accounts/abi/pack_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) func TestPack(t *testing.T) { diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index 105a8eceea67..22379f43957f 100644 --- a/accounts/abi/type_test.go +++ b/accounts/abi/type_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) // typeWithoutStringer is a alias for the Type type which simply doesn't implement diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go index cf737a432f9d..c526b1269cce 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -22,7 +22,7 @@ import ( "math/big" "reflect" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) // unpacker is a utility interface that enables us to have diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index b1229cdfb2b3..795b7f1e3723 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) type unpackTest struct { diff --git a/accounts/accounts.go b/accounts/accounts.go index ee5ca27fe202..4d1002c3273a 100644 --- a/accounts/accounts.go +++ b/accounts/accounts.go @@ -20,10 +20,10 @@ package accounts import ( "math/big" - ethereum "github.com/teamnsrg/go-ethereum" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/event" + ethereum "github.com/teamnsrg/ethereum-p2p" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/event" ) // Account represents an Ethereum account located at a specific location defined diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go index 7d5cdbf2d36e..04097e4e2c43 100644 --- a/accounts/keystore/account_cache.go +++ b/accounts/keystore/account_cache.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/log" "gopkg.in/fatih/set.v0" ) diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index 19e0ce518ecf..0a65b127a006 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -29,8 +29,8 @@ import ( "github.com/cespare/cp" "github.com/davecgh/go-spew/spew" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/common" ) var ( diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go index 9f368585542a..1e6e6a9134d9 100644 --- a/accounts/keystore/file_cache.go +++ b/accounts/keystore/file_cache.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" set "gopkg.in/fatih/set.v0" ) diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go index 28f21485a47a..1aed3ec74510 100644 --- a/accounts/keystore/key.go +++ b/accounts/keystore/key.go @@ -30,9 +30,9 @@ import ( "time" "github.com/pborman/uuid" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" ) const ( diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 865161c35213..d53509d99198 100644 --- a/accounts/keystore/keystore.go +++ b/accounts/keystore/keystore.go @@ -33,11 +33,11 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/event" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/event" ) var ( diff --git a/accounts/keystore/keystore_passphrase.go b/accounts/keystore/keystore_passphrase.go index 92c9eb8e3bd4..5f452e3b1edd 100644 --- a/accounts/keystore/keystore_passphrase.go +++ b/accounts/keystore/keystore_passphrase.go @@ -37,10 +37,10 @@ import ( "path/filepath" "github.com/pborman/uuid" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/crypto/randentropy" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/crypto/randentropy" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" ) diff --git a/accounts/keystore/keystore_passphrase_test.go b/accounts/keystore/keystore_passphrase_test.go index 20ecce04bfe1..fe0ef5929c95 100644 --- a/accounts/keystore/keystore_passphrase_test.go +++ b/accounts/keystore/keystore_passphrase_test.go @@ -20,7 +20,7 @@ import ( "io/ioutil" "testing" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) const ( diff --git a/accounts/keystore/keystore_plain.go b/accounts/keystore/keystore_plain.go index 00f2d857541d..9ead1f1ec825 100644 --- a/accounts/keystore/keystore_plain.go +++ b/accounts/keystore/keystore_plain.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) type keyStorePlain struct { diff --git a/accounts/keystore/keystore_plain_test.go b/accounts/keystore/keystore_plain_test.go index 1335ca89f6a2..825475f681f5 100644 --- a/accounts/keystore/keystore_plain_test.go +++ b/accounts/keystore/keystore_plain_test.go @@ -27,8 +27,8 @@ import ( "strings" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" ) func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) { diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go index 76ca1c48b6ad..e17474558ceb 100644 --- a/accounts/keystore/keystore_test.go +++ b/accounts/keystore/keystore_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/event" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/event" ) var testSigData = make([]byte, 32) diff --git a/accounts/keystore/keystore_wallet.go b/accounts/keystore/keystore_wallet.go index 3886d5c31cec..df38c092caa1 100644 --- a/accounts/keystore/keystore_wallet.go +++ b/accounts/keystore/keystore_wallet.go @@ -19,9 +19,9 @@ package keystore import ( "math/big" - ethereum "github.com/teamnsrg/go-ethereum" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/core/types" + ethereum "github.com/teamnsrg/ethereum-p2p" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/core/types" ) // keystoreWallet implements the accounts.Wallet interface for the original diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go index 4cadedefd7d7..26769bb0653d 100644 --- a/accounts/keystore/presale.go +++ b/accounts/keystore/presale.go @@ -26,8 +26,8 @@ import ( "fmt" "github.com/pborman/uuid" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/crypto" "golang.org/x/crypto/pbkdf2" ) diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index fe938fadb51e..325a6ed8da16 100644 --- a/accounts/keystore/watch.go +++ b/accounts/keystore/watch.go @@ -22,7 +22,7 @@ import ( "time" "github.com/rjeczalik/notify" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) type watcher struct { diff --git a/accounts/manager.go b/accounts/manager.go index 868350f66c97..e8a49e164a0b 100644 --- a/accounts/manager.go +++ b/accounts/manager.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - "github.com/teamnsrg/go-ethereum/event" + "github.com/teamnsrg/ethereum-p2p/event" ) // Manager is an overarching account manager that can communicate with various diff --git a/accounts/usbwallet/hub.go b/accounts/usbwallet/hub.go index cd442be1c72d..338a3be0799c 100644 --- a/accounts/usbwallet/hub.go +++ b/accounts/usbwallet/hub.go @@ -23,9 +23,9 @@ import ( "time" "github.com/karalabe/hid" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/log" ) // LedgerScheme is the protocol scheme prefixing account and wallet URLs. diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go index 2d905aa5731d..099e81c18bed 100644 --- a/accounts/usbwallet/ledger.go +++ b/accounts/usbwallet/ledger.go @@ -28,12 +28,12 @@ import ( "io" "math/big" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/rlp" ) // ledgerOpcode is an enumeration encoding the supported Ledger opcodes. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index 77d0daff026e..7a36997a825f 100644 --- a/accounts/usbwallet/trezor.go +++ b/accounts/usbwallet/trezor.go @@ -28,12 +28,12 @@ import ( "math/big" "github.com/golang/protobuf/proto" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/accounts/usbwallet/internal/trezor" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/accounts/usbwallet/internal/trezor" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/log" ) // ErrTrezorPINNeeded is returned if opening the trezor requires a PIN code. In diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index dd2c5a68e1eb..d6e95cc844c5 100644 --- a/accounts/usbwallet/wallet.go +++ b/accounts/usbwallet/wallet.go @@ -26,11 +26,11 @@ import ( "time" "github.com/karalabe/hid" - ethereum "github.com/teamnsrg/go-ethereum" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/log" + ethereum "github.com/teamnsrg/ethereum-p2p" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/log" ) // Maximum time between wallet health checks to detect USB unplugs. diff --git a/appveyor.yml b/appveyor.yml index 78b11fa9d660..b7c8d64b137e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ os: Visual Studio 2015 # Clone directly into GOPATH. -clone_folder: C:\gopath\src\github.com\ethereum\go-ethereum +clone_folder: C:\gopath\src\github.com\teamnsrg\ethereum-p2p clone_depth: 5 version: "{branch}.{build}" environment: diff --git a/bmt/bmt_test.go b/bmt/bmt_test.go index a9894fd87250..59d6b6111f19 100644 --- a/bmt/bmt_test.go +++ b/bmt/bmt_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" ) const ( diff --git a/build/ci.go b/build/ci.go index ca5930b79304..478417247b53 100644 --- a/build/ci.go +++ b/build/ci.go @@ -58,7 +58,7 @@ import ( "strings" "time" - "github.com/teamnsrg/go-ethereum/internal/build" + "github.com/teamnsrg/ethereum-p2p/internal/build" ) var ( @@ -725,7 +725,7 @@ func doAndroidArchive(cmdline []string) { // Build the Android archive and Maven resources build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile")) build.MustRun(gomobileTool("init", "--ndk", os.Getenv("ANDROID_NDK"))) - build.MustRun(gomobileTool("bind", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/teamnsrg/go-ethereum/mobile")) + build.MustRun(gomobileTool("bind", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/teamnsrg/ethereum-p2p/mobile")) if *local { // If we're building locally, copy bundle to build dir and skip Maven @@ -845,7 +845,7 @@ func doXCodeFramework(cmdline []string) { // Build the iOS XCode framework build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile")) build.MustRun(gomobileTool("init")) - bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "-v", "github.com/teamnsrg/go-ethereum/mobile") + bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "-v", "github.com/teamnsrg/ethereum-p2p/mobile") if *local { // If we're building locally, use the build folder and stop afterwards diff --git a/build/deb.control b/build/deb.control index 1673036ea50b..961ff6df8403 100644 --- a/build/deb.control +++ b/build/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), golang-1.9 Standards-Version: 3.9.5 Homepage: https://ethereum.org -Vcs-Git: git://github.com/teamnsrg/go-ethereum.git -Vcs-Browser: https://github.com/teamnsrg/go-ethereum +Vcs-Git: git://github.com/teamnsrg/ethereum-p2p.git +Vcs-Browser: https://github.com/teamnsrg/ethereum-p2p Package: {{.Name}} Architecture: any diff --git a/build/env.sh b/build/env.sh index fda757163eb0..15d79776f37c 100755 --- a/build/env.sh +++ b/build/env.sh @@ -11,10 +11,10 @@ fi workspace="$PWD/build/_workspace" root="$PWD" ethdir="$workspace/src/github.com/teamnsrg" -if [ ! -L "$ethdir/go-ethereum" ]; then +if [ ! -L "$ethdir/ethereum-p2p" ]; then mkdir -p "$ethdir" cd "$ethdir" - ln -s ../../../../../. go-ethereum + ln -s ../../../../../. ethereum-p2p cd "$root" fi @@ -23,8 +23,8 @@ GOPATH="$workspace" export GOPATH # Run the command inside the workspace. -cd "$ethdir/go-ethereum" -PWD="$ethdir/go-ethereum" +cd "$ethdir/ethereum-p2p" +PWD="$ethdir/ethereum-p2p" # Launch the arguments with the configured environment. exec "$@" diff --git a/build/mvn.pom b/build/mvn.pom index 6ec131b6f6c1..ce47f07a6dbc 100644 --- a/build/mvn.pom +++ b/build/mvn.pom @@ -11,7 +11,7 @@ Android Ethereum Client Android port of the go-ethereum libraries and node - https://github.com/teamnsrg/go-ethereum + https://github.com/teamnsrg/ethereum-p2p 2015 @@ -48,10 +48,10 @@ GitHub Issues - https://github.com/teamnsrg/go-ethereum/issues/ + https://github.com/teamnsrg/ethereum-p2p/issues/ - https://github.com/teamnsrg/go-ethereum + https://github.com/teamnsrg/ethereum-p2p diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index 66901c66e613..54474114450c 100644 --- a/build/nsis.install.nsh +++ b/build/nsis.install.nsh @@ -3,9 +3,9 @@ InstallDir "$InstDir" OutFile "${OUTPUTFILE}" # set through command line arguments # Links for "Add/Remove Programs" -!define HELPURL "https://github.com/teamnsrg/go-ethereum/issues" -!define UPDATEURL "https://github.com/teamnsrg/go-ethereum/releases" -!define ABOUTURL "https://github.com/teamnsrg/go-ethereum#ethereum-go" +!define HELPURL "https://github.com/teamnsrg/ethereum-p2p/issues" +!define UPDATEURL "https://github.com/teamnsrg/ethereum-p2p/releases" +!define ABOUTURL "https://github.com/teamnsrg/ethereum-p2p#ethereum-go" !define /date NOW "%Y%m%d" PageEx license diff --git a/build/pod.podspec b/build/pod.podspec index b6352712c093..513ce513f1c8 100644 --- a/build/pod.podspec +++ b/build/pod.podspec @@ -2,12 +2,12 @@ Pod::Spec.new do |spec| spec.name = 'Geth' spec.version = '{{.Version}}' spec.license = { :type => 'GNU Lesser General Public License, Version 3.0' } - spec.homepage = 'https://github.com/teamnsrg/go-ethereum' + spec.homepage = 'https://github.com/teamnsrg/ethereum-p2p' spec.authors = { {{range .Contributors}} '{{.Name}}' => '{{.Email}}',{{end}} } spec.summary = 'iOS Ethereum Client' - spec.source = { :git => 'https://github.com/teamnsrg/go-ethereum.git', :commit => '{{.Commit}}' } + spec.source = { :git => 'https://github.com/teamnsrg/ethereum-p2p.git', :commit => '{{.Commit}}' } spec.platform = :ios spec.ios.deployment_target = '9.0' diff --git a/circle.yml b/circle.yml index 39ff5d83c68e..2f5cb49f9d4b 100644 --- a/circle.yml +++ b/circle.yml @@ -6,7 +6,7 @@ dependencies: cache_directories: - "~/.ethash" # Cache the ethash DAG generated by hive for consecutive builds - "~/.docker" # Cache all docker images manually to avoid lengthy rebuilds - override: + override:: # Restore all previously cached docker images - mkdir -p ~/.docker - for img in `ls ~/.docker`; do docker load -i ~/.docker/$img; done diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index f748fda866bc..80e4ad2ad378 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -24,8 +24,8 @@ import ( "os" "strings" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind" - "github.com/teamnsrg/go-ethereum/common/compiler" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind" + "github.com/teamnsrg/ethereum-p2p/common/compiler" ) var ( diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index 09493d98c626..6aa50ad8d2aa 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -23,13 +23,13 @@ import ( "fmt" "os" - "github.com/teamnsrg/go-ethereum/cmd/utils" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/p2p/discv5" - "github.com/teamnsrg/go-ethereum/p2p/nat" - "github.com/teamnsrg/go-ethereum/p2p/netutil" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/discv5" + "github.com/teamnsrg/ethereum-p2p/p2p/nat" + "github.com/teamnsrg/ethereum-p2p/p2p/netutil" ) func main() { diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index 9a93ca382fcf..c5486a91b79e 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -21,7 +21,7 @@ import ( "fmt" "io/ioutil" - "github.com/teamnsrg/go-ethereum/cmd/evm/internal/compiler" + "github.com/teamnsrg/ethereum-p2p/cmd/evm/internal/compiler" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index ed601d4c41d6..1bba543ad394 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "strings" - "github.com/teamnsrg/go-ethereum/core/asm" + "github.com/teamnsrg/ethereum-p2p/core/asm" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go index a30b89ce8b75..613ee643b661 100644 --- a/cmd/evm/internal/compiler/compiler.go +++ b/cmd/evm/internal/compiler/compiler.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/teamnsrg/go-ethereum/core/asm" + "github.com/teamnsrg/ethereum-p2p/core/asm" ) func Compile(fn string, src []byte, debug bool) (string, error) { diff --git a/cmd/evm/json_logger.go b/cmd/evm/json_logger.go index cb89497e9fdd..09e2ad808701 100644 --- a/cmd/evm/json_logger.go +++ b/cmd/evm/json_logger.go @@ -21,9 +21,9 @@ import ( "io" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/core/vm" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/core/vm" ) type JSONLogger struct { diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 3e89f16a6872..0edce3fd630f 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -22,7 +22,7 @@ import ( "math/big" "os" - "github.com/teamnsrg/go-ethereum/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index e65943a0ead9..2295053281a3 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -27,16 +27,16 @@ import ( goruntime "runtime" - "github.com/teamnsrg/go-ethereum/cmd/evm/internal/compiler" - "github.com/teamnsrg/go-ethereum/cmd/utils" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/core/vm/runtime" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/cmd/evm/internal/compiler" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/core/vm/runtime" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/params" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index 10aa9cb7aeac..e1be30456db9 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -23,10 +23,10 @@ import ( "io/ioutil" "os" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/tests" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/tests" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index b21c260f623d..36ad2fc97676 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -41,23 +41,23 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/accounts/keystore" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/eth" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/ethclient" - "github.com/teamnsrg/go-ethereum/ethstats" - "github.com/teamnsrg/go-ethereum/les" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/p2p/discv5" - "github.com/teamnsrg/go-ethereum/p2p/nat" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/accounts/keystore" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/eth" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/ethclient" + "github.com/teamnsrg/ethereum-p2p/ethstats" + "github.com/teamnsrg/ethereum-p2p/les" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/discv5" + "github.com/teamnsrg/ethereum-p2p/p2p/nat" + "github.com/teamnsrg/ethereum-p2p/params" "golang.org/x/net/websocket" ) @@ -443,7 +443,7 @@ func (f *faucet) apiHandler(conn *websocket.Conn) { case strings.HasPrefix(msg.URL, "https://www.facebook.com/"): username, avatar, address, err = authFacebook(msg.URL) default: - err = errors.New("Something funky happened, please open an issue at https://github.com/teamnsrg/go-ethereum/issues") + err = errors.New("Something funky happened, please open an issue at https://github.com/teamnsrg/ethereum-p2p/issues") } if err != nil { if err = sendError(conn, err); err != nil { diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go index 58a83471402d..6a1282b21f15 100644 --- a/cmd/geth/accountcmd.go +++ b/cmd/geth/accountcmd.go @@ -20,12 +20,12 @@ import ( "fmt" "io/ioutil" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/accounts/keystore" - "github.com/teamnsrg/go-ethereum/cmd/utils" - "github.com/teamnsrg/go-ethereum/console" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/accounts/keystore" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/console" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go index adb5a8fc1b2b..1740c85126b9 100644 --- a/cmd/geth/accountcmd_test.go +++ b/cmd/geth/accountcmd_test.go @@ -173,7 +173,7 @@ Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could `) } -// https://github.com/teamnsrg/go-ethereum/issues/1785 +// https://github.com/teamnsrg/ethereum-p2p/issues/1785 func TestUnlockFlagMultiIndex(t *testing.T) { datadir := tmpDatadirWithKeystore(t) geth := runGeth(t, diff --git a/cmd/geth/bugcmd.go b/cmd/geth/bugcmd.go index 6f202b65506e..d069e9fcb9ce 100644 --- a/cmd/geth/bugcmd.go +++ b/cmd/geth/bugcmd.go @@ -26,10 +26,10 @@ import ( "runtime" "strings" - "github.com/teamnsrg/go-ethereum/cmd/internal/browser" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/cmd/internal/browser" + "github.com/teamnsrg/ethereum-p2p/params" - "github.com/teamnsrg/go-ethereum/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" cli "gopkg.in/urfave/cli.v1" ) @@ -41,7 +41,7 @@ var bugCommand = cli.Command{ Category: "MISCELLANEOUS COMMANDS", } -const issueUrl = "https://github.com/teamnsrg/go-ethereum/issues/new" +const issueUrl = "https://github.com/teamnsrg/ethereum-p2p/issues/new" // reportBug reports a bug by opening a new URL to the go-ethereum GH issue // tracker and setting default values as the issue body. diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index eaf5ecc2dd49..9c472550b358 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -26,17 +26,17 @@ import ( "time" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/teamnsrg/go-ethereum/cmd/utils" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/console" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/console" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/trie" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 84c559ef80af..2b4c119296a7 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -29,12 +29,12 @@ import ( cli "gopkg.in/urfave/cli.v1" "github.com/naoina/toml" - "github.com/teamnsrg/go-ethereum/cmd/utils" - "github.com/teamnsrg/go-ethereum/contracts/release" - "github.com/teamnsrg/go-ethereum/dashboard" - "github.com/teamnsrg/go-ethereum/eth" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/contracts/release" + "github.com/teamnsrg/ethereum-p2p/dashboard" + "github.com/teamnsrg/ethereum-p2p/eth" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/params" ) var ( diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index 85bd38fd38d8..a4499162f84d 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -21,10 +21,10 @@ import ( "os/signal" "strings" - "github.com/teamnsrg/go-ethereum/cmd/utils" - "github.com/teamnsrg/go-ethereum/console" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/console" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/rpc" "gopkg.in/urfave/cli.v1" ) @@ -40,7 +40,7 @@ var ( Description: ` The Geth console is an interactive shell for the JavaScript runtime environment which exposes a node admin interface as well as the Ðapp JavaScript API. -See https://github.com/teamnsrg/go-ethereum/wiki/Javascipt-Console.`, +See https://github.com/teamnsrg/ethereum-p2p/wiki/Javascipt-Console.`, } attachCommand = cli.Command{ @@ -53,7 +53,7 @@ See https://github.com/teamnsrg/go-ethereum/wiki/Javascipt-Console.`, Description: ` The Geth console is an interactive shell for the JavaScript runtime environment which exposes a node admin interface as well as the Ðapp JavaScript API. -See https://github.com/teamnsrg/go-ethereum/wiki/Javascipt-Console. +See https://github.com/teamnsrg/ethereum-p2p/wiki/Javascipt-Console. This command allows to open a console on a running geth node.`, } @@ -66,7 +66,7 @@ This command allows to open a console on a running geth node.`, Category: "CONSOLE COMMANDS", Description: ` The JavaScript VM exposes a node admin interface as well as the Ðapp -JavaScript API. See https://github.com/teamnsrg/go-ethereum/wiki/Javascipt-Console`, +JavaScript API. See https://github.com/teamnsrg/ethereum-p2p/wiki/Javascipt-Console`, } ) diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index 5049bc629395..4a6ba820bbcb 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/params" ) const ( diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go index f603de801d2c..e75d0a358ccd 100644 --- a/cmd/geth/dao_test.go +++ b/cmd/geth/dao_test.go @@ -23,10 +23,10 @@ import ( "path/filepath" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) // Genesis block for nodes which don't care about the DAO fork (i.e. not configured) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 2f48fa2b8f97..8fc7485dc180 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -25,17 +25,17 @@ import ( "strings" "time" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/accounts/keystore" - "github.com/teamnsrg/go-ethereum/cmd/utils" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/console" - "github.com/teamnsrg/go-ethereum/eth" - "github.com/teamnsrg/go-ethereum/ethclient" - "github.com/teamnsrg/go-ethereum/internal/debug" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/metrics" - "github.com/teamnsrg/go-ethereum/node" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/accounts/keystore" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/console" + "github.com/teamnsrg/ethereum-p2p/eth" + "github.com/teamnsrg/ethereum-p2p/ethclient" + "github.com/teamnsrg/ethereum-p2p/internal/debug" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/metrics" + "github.com/teamnsrg/ethereum-p2p/node" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index e50931b98e25..d3b0e939662f 100644 --- a/cmd/geth/misccmd.go +++ b/cmd/geth/misccmd.go @@ -23,10 +23,10 @@ import ( "strconv" "strings" - "github.com/teamnsrg/go-ethereum/cmd/utils" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/eth" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/eth" + "github.com/teamnsrg/ethereum-p2p/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/monitorcmd.go b/cmd/geth/monitorcmd.go index 6efd03618873..d757a1f59fc0 100644 --- a/cmd/geth/monitorcmd.go +++ b/cmd/geth/monitorcmd.go @@ -26,9 +26,9 @@ import ( "time" "github.com/gizak/termui" - "github.com/teamnsrg/go-ethereum/cmd/utils" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/run_test.go b/cmd/geth/run_test.go index d401cec67a98..0cfe51ab9897 100644 --- a/cmd/geth/run_test.go +++ b/cmd/geth/run_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/teamnsrg/go-ethereum/internal/cmdtest" + "github.com/teamnsrg/ethereum-p2p/internal/cmdtest" ) func tmpdir(t *testing.T) string { diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index 693ac0a4ee41..b67968eca189 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -22,8 +22,8 @@ import ( "io" "sort" - "github.com/teamnsrg/go-ethereum/cmd/utils" - "github.com/teamnsrg/go-ethereum/internal/debug" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/internal/debug" "gopkg.in/urfave/cli.v1" "strings" ) diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index 5cbd0c071fe9..96ff276dd863 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -29,12 +29,12 @@ import ( "strings" "text/tabwriter" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/p2p/simulations" - "github.com/teamnsrg/go-ethereum/p2p/simulations/adapters" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/simulations" + "github.com/teamnsrg/ethereum-p2p/p2p/simulations/adapters" + "github.com/teamnsrg/ethereum-p2p/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go index f0fad898c9a1..b8dd98a2099c 100644 --- a/cmd/puppeth/module.go +++ b/cmd/puppeth/module.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) var ( diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 84729e9a7643..21b095c975f9 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strings" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) // dashboardContent is the actual dashboard HTML content to serve up when users @@ -253,7 +253,7 @@ var dashboardContent = `

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.*;
@@ -284,7 +284,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
@@ -322,7 +322,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/teamnsrg/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/teamnsrg/ethereum-p2p/cmd/puppeth


Copyright 2017. The go-ethereum Authors.

diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index e121f8b06feb..f0cf3cf2a83f 100644 --- a/cmd/puppeth/module_ethstats.go +++ b/cmd/puppeth/module_ethstats.go @@ -24,7 +24,7 @@ import ( "strings" "text/template" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) // ethstatsDockerfile is the Dockerfile required to build an ethstats backend diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go index 2523a6465b6a..a080c666c3cd 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) // faucetDockerfile is the Dockerfile required to build an faucet container to @@ -39,8 +39,8 @@ ENV GOPATH /go RUN \ apk add --update git go make gcc musl-dev ca-certificates linux-headers && \ mkdir -p $GOPATH/src/github.com/ethereum && \ - (cd $GOPATH/src/github.com/ethereum && git clone --depth=1 https://github.com/teamnsrg/go-ethereum) && \ - go build -v github.com/teamnsrg/go-ethereum/cmd/faucet && \ + (cd $GOPATH/src/github.com/ethereum && git clone --depth=1 https://github.com/teamnsrg/ethereum-p2p) && \ + go build -v github.com/teamnsrg/ethereum-p2p/cmd/faucet && \ apk del git go make gcc musl-dev linux-headers && \ rm -rf $GOPATH && rm -rf /var/cache/apk/* diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go index 6e2907089d34..04945f8c5a22 100644 --- a/cmd/puppeth/module_nginx.go +++ b/cmd/puppeth/module_nginx.go @@ -23,7 +23,7 @@ import ( "math/rand" "path/filepath" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/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 daf38e12919a..e4f1dfbae917 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -25,7 +25,7 @@ import ( "strings" "text/template" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) // nodeDockerfile is the Dockerfile required to run an Ethereum node. diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index 995d5e693b4e..2ae098a9864c 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index 139f9c3714d0..17654c7e1c58 100644 --- a/cmd/puppeth/ssh.go +++ b/cmd/puppeth/ssh.go @@ -28,7 +28,7 @@ import ( "path/filepath" "strings" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/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 70a32924dffa..8441166e58f0 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -29,9 +29,9 @@ import ( "strconv" "strings" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index e4ddeede48af..ca35e02191ac 100644 --- a/cmd/puppeth/wizard_dashboard.go +++ b/cmd/puppeth/wizard_dashboard.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/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 5b562319c31d..864ed787cc73 100644 --- a/cmd/puppeth/wizard_ethstats.go +++ b/cmd/puppeth/wizard_ethstats.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) // deployEthstats queries the user for various input on deploying an ethstats diff --git a/cmd/puppeth/wizard_faucet.go b/cmd/puppeth/wizard_faucet.go index 81b7feab5035..1e2df07cc09a 100644 --- a/cmd/puppeth/wizard_faucet.go +++ b/cmd/puppeth/wizard_faucet.go @@ -21,8 +21,8 @@ import ( "fmt" "net/http" - "github.com/teamnsrg/go-ethereum/accounts/keystore" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/accounts/keystore" + "github.com/teamnsrg/ethereum-p2p/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 50862ac95ae6..8330633b71d1 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -25,10 +25,10 @@ import ( "math/rand" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/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 02959693fc55..57d80a7366a1 100644 --- a/cmd/puppeth/wizard_intro.go +++ b/cmd/puppeth/wizard_intro.go @@ -25,7 +25,7 @@ import ( "path/filepath" "strings" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index 7576665c24d4..4e6cdc92a5eb 100644 --- a/cmd/puppeth/wizard_netstats.go +++ b/cmd/puppeth/wizard_netstats.go @@ -23,8 +23,8 @@ import ( "strings" "github.com/olekukonko/tablewriter" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/log" ) // networkStats verifies the status of network components and generates a protip diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go index 201bbb7188dd..328199059c6d 100644 --- a/cmd/puppeth/wizard_network.go +++ b/cmd/puppeth/wizard_network.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/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 8bfd88ebaddc..012488e1a865 100644 --- a/cmd/puppeth/wizard_nginx.go +++ b/cmd/puppeth/wizard_nginx.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/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 85608d499392..1d044285fb6d 100644 --- a/cmd/puppeth/wizard_node.go +++ b/cmd/puppeth/wizard_node.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/teamnsrg/go-ethereum/accounts/keystore" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/accounts/keystore" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/log" ) // deployNode creates a new node configuration based on some user input. diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index aa270e06da42..b7dcb339172f 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -26,7 +26,7 @@ import ( "os" "strings" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/rlp" ) var ( diff --git a/cmd/swarm/db.go b/cmd/swarm/db.go index 3f0f76badc99..53a3559d234d 100644 --- a/cmd/swarm/db.go +++ b/cmd/swarm/db.go @@ -22,9 +22,9 @@ import ( "os" "path/filepath" - "github.com/teamnsrg/go-ethereum/cmd/utils" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go index 1b7b3b0a43b2..6edd13ace098 100644 --- a/cmd/swarm/hash.go +++ b/cmd/swarm/hash.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - "github.com/teamnsrg/go-ethereum/cmd/utils" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go index 9df6d7e43264..973c67eb5387 100644 --- a/cmd/swarm/list.go +++ b/cmd/swarm/list.go @@ -22,8 +22,8 @@ import ( "strings" "text/tabwriter" - "github.com/teamnsrg/go-ethereum/cmd/utils" - swarm "github.com/teamnsrg/go-ethereum/swarm/api/client" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + swarm "github.com/teamnsrg/ethereum-p2p/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 51b0fb05072d..372146675a51 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -31,23 +31,23 @@ import ( "syscall" "time" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/accounts/keystore" - "github.com/teamnsrg/go-ethereum/cmd/utils" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/console" - "github.com/teamnsrg/go-ethereum/contracts/ens" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethclient" - "github.com/teamnsrg/go-ethereum/internal/debug" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rpc" - "github.com/teamnsrg/go-ethereum/swarm" - bzzapi "github.com/teamnsrg/go-ethereum/swarm/api" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/accounts/keystore" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/console" + "github.com/teamnsrg/ethereum-p2p/contracts/ens" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethclient" + "github.com/teamnsrg/ethereum-p2p/internal/debug" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rpc" + "github.com/teamnsrg/ethereum-p2p/swarm" + bzzapi "github.com/teamnsrg/ethereum-p2p/swarm/api" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go index b785155e8f3c..8067befa89ba 100644 --- a/cmd/swarm/manifest.go +++ b/cmd/swarm/manifest.go @@ -24,9 +24,9 @@ import ( "path/filepath" "strings" - "github.com/teamnsrg/go-ethereum/cmd/utils" - "github.com/teamnsrg/go-ethereum/swarm/api" - swarm "github.com/teamnsrg/go-ethereum/swarm/api/client" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + "github.com/teamnsrg/ethereum-p2p/swarm/api" + swarm "github.com/teamnsrg/ethereum-p2p/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index dce4e737b2e8..cf9ae432cc64 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -27,12 +27,12 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/teamnsrg/go-ethereum/accounts/keystore" - "github.com/teamnsrg/go-ethereum/internal/cmdtest" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/rpc" - "github.com/teamnsrg/go-ethereum/swarm" + "github.com/teamnsrg/ethereum-p2p/accounts/keystore" + "github.com/teamnsrg/ethereum-p2p/internal/cmdtest" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/rpc" + "github.com/teamnsrg/ethereum-p2p/swarm" ) func init() { diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go index 8a1dfbf92ace..fe3b381acf95 100644 --- a/cmd/swarm/upload.go +++ b/cmd/swarm/upload.go @@ -30,8 +30,8 @@ import ( "path/filepath" "strings" - "github.com/teamnsrg/go-ethereum/cmd/utils" - swarm "github.com/teamnsrg/go-ethereum/swarm/api/client" + "github.com/teamnsrg/ethereum-p2p/cmd/utils" + swarm "github.com/teamnsrg/ethereum-p2p/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 439c23aeb4f5..b2a59fe88a11 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -26,12 +26,12 @@ import ( "runtime" "strings" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/internal/debug" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/internal/debug" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index a7a0e4f9c560..63683210c8ed 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -27,7 +27,7 @@ import ( "path" "strings" - "github.com/teamnsrg/go-ethereum/common/math" + "github.com/teamnsrg/ethereum-p2p/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index b498643b4582..e0d2ff7d7661 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -28,32 +28,32 @@ import ( "strconv" "strings" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/accounts/keystore" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/consensus/clique" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/dashboard" - "github.com/teamnsrg/go-ethereum/eth" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/eth/gasprice" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/ethstats" - "github.com/teamnsrg/go-ethereum/les" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/metrics" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/p2p/discv5" - "github.com/teamnsrg/go-ethereum/p2p/nat" - "github.com/teamnsrg/go-ethereum/p2p/netutil" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/accounts/keystore" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/consensus/clique" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/dashboard" + "github.com/teamnsrg/ethereum-p2p/eth" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/eth/gasprice" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/ethstats" + "github.com/teamnsrg/ethereum-p2p/les" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/metrics" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/discv5" + "github.com/teamnsrg/ethereum-p2p/p2p/nat" + "github.com/teamnsrg/ethereum-p2p/p2p/netutil" + "github.com/teamnsrg/ethereum-p2p/params" "gopkg.in/urfave/cli.v1" ) diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index 56451e60c131..5620adb2672f 100644 --- a/common/bitutil/compress_test.go +++ b/common/bitutil/compress_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/teamnsrg/go-ethereum/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/debug.go b/common/debug.go index 3d0e61979223..c4129e8e52df 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/teamnsrg/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/teamnsrg/ethereum-p2p/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 226b89e33dff..781e78326a10 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/teamnsrg/go-ethereum/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index 6804dac94613..1ac419982a58 100644 --- a/common/math/big_test.go +++ b/common/math/big_test.go @@ -22,7 +22,7 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/number/int.go b/common/number/int.go index 5b3abf0c1a3e..cd1055bfc125 100644 --- a/common/number/int.go +++ b/common/number/int.go @@ -19,7 +19,7 @@ package number import ( "math/big" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) var tt256 = new(big.Int).Lsh(big.NewInt(1), 256) diff --git a/common/number/uint_test.go b/common/number/uint_test.go index e46ca9aa20cb..f71a556f3dab 100644 --- a/common/number/uint_test.go +++ b/common/number/uint_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) func TestSet(t *testing.T) { diff --git a/common/types.go b/common/types.go index f4533e452805..6e0cd6ba2569 100644 --- a/common/types.go +++ b/common/types.go @@ -23,8 +23,8 @@ import ( "math/rand" "reflect" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" ) const ( diff --git a/compression/rle/read_write.go b/compression/rle/read_write.go index 05eed8229a63..8d9ff3c88b14 100644 --- a/compression/rle/read_write.go +++ b/compression/rle/read_write.go @@ -21,7 +21,7 @@ import ( "bytes" "errors" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/crypto" ) const ( diff --git a/consensus/clique/api.go b/consensus/clique/api.go index 6999cbff7d6a..6d56a03688b4 100644 --- a/consensus/clique/api.go +++ b/consensus/clique/api.go @@ -17,10 +17,10 @@ package clique import ( - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/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 85e9d462ee3b..b8b647da6689 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -26,20 +26,20 @@ import ( "time" lru "github.com/hashicorp/golang-lru" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/consensus/misc" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/crypto/sha3" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/consensus/misc" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/rpc" ) const ( diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index 5f5ddd06f215..1a49dd3e6bd3 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -21,10 +21,10 @@ import ( "encoding/json" lru "github.com/hashicorp/golang-lru" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) // Vote represents a single vote that an authorized signer made to modify the diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index c1520601d14d..f3edaf0c7893 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -22,12 +22,12 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) type testerVote struct { diff --git a/consensus/consensus.go b/consensus/consensus.go index c20ea140f4c1..a559c052d895 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -18,11 +18,11 @@ package consensus import ( - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/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 91a295145221..53ea7562f55e 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -26,11 +26,11 @@ import ( "time" "unsafe" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/bitutil" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/crypto/sha3" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/bitutil" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/log" ) const ( diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index f5b3ec5541a3..1759a7d294fc 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -25,9 +25,9 @@ import ( "sync" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/core/types" ) // Tests that verification caches can be correctly generated. diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index 1e1747040ab2..2be14059b2df 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -24,13 +24,13 @@ import ( "runtime" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/consensus/misc" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/consensus/misc" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/params" set "gopkg.in/fatih/set.v0" ) diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index 1e6e1445a61c..aab65ddd631c 100644 --- a/consensus/ethash/consensus_test.go +++ b/consensus/ethash/consensus_test.go @@ -23,9 +23,9 @@ import ( "path/filepath" "testing" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/params" ) type diffTest struct { diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index ffbd98bda94c..da3431ca6449 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -33,9 +33,9 @@ import ( mmap "github.com/edsrzf/mmap-go" metrics "github.com/rcrowley/go-metrics" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/rpc" ) var ErrInvalidDumpMagic = errors.New("invalid dump magic") diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index db6918a268c8..f5327c4208fe 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/core/types" ) // Tests that ethash works correctly in test mode. diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go index 2fcfdef69312..3bf884e84cea 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -24,10 +24,10 @@ import ( "runtime" "sync" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/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 30ac20a17e39..12ef8ee01ab2 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/params" ) var ( diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go index 0b0187c871e7..72278b5c265e 100644 --- a/consensus/misc/forks.go +++ b/consensus/misc/forks.go @@ -19,9 +19,9 @@ package misc import ( "fmt" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/params" ) // VerifyForkHashes verifies that blocks conforming to network hard-forks do have diff --git a/console/bridge.go b/console/bridge.go index 4cafad8ad12b..c3281f02f70c 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -24,9 +24,9 @@ import ( "time" "github.com/robertkrimen/otto" - "github.com/teamnsrg/go-ethereum/accounts/usbwallet" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/accounts/usbwallet" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/rpc" ) // bridge is a collection of JavaScript utility methods to bride the .js runtime diff --git a/console/console.go b/console/console.go index 05f22ced398a..73ec9a6e1be5 100644 --- a/console/console.go +++ b/console/console.go @@ -30,9 +30,9 @@ import ( "github.com/mattn/go-colorable" "github.com/peterh/liner" "github.com/robertkrimen/otto" - "github.com/teamnsrg/go-ethereum/internal/jsre" - "github.com/teamnsrg/go-ethereum/internal/web3ext" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/internal/jsre" + "github.com/teamnsrg/ethereum-p2p/internal/web3ext" + "github.com/teamnsrg/ethereum-p2p/rpc" ) var ( diff --git a/console/console_test.go b/console/console_test.go index 6066b78898fa..e646af6be255 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/eth" - "github.com/teamnsrg/go-ethereum/internal/jsre" - "github.com/teamnsrg/go-ethereum/node" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/eth" + "github.com/teamnsrg/ethereum-p2p/internal/jsre" + "github.com/teamnsrg/ethereum-p2p/node" ) const ( diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile index 861777bfc373..3999f5d65b36 100644 --- a/containers/docker/develop-alpine/Dockerfile +++ b/containers/docker/develop-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.5 RUN \ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - git clone --depth 1 https://github.com/teamnsrg/go-ethereum && \ + git clone --depth 1 https://github.com/teamnsrg/ethereum-p2p && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apk del go git make gcc musl-dev linux-headers && \ diff --git a/containers/docker/develop-ubuntu/Dockerfile b/containers/docker/develop-ubuntu/Dockerfile index 2128f52e5f4f..8bae897723a0 100644 --- a/containers/docker/develop-ubuntu/Dockerfile +++ b/containers/docker/develop-ubuntu/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:xenial RUN \ apt-get update && apt-get upgrade -q -y && \ apt-get install -y --no-install-recommends golang git make gcc libc-dev ca-certificates && \ - git clone --depth 1 https://github.com/teamnsrg/go-ethereum && \ + git clone --depth 1 https://github.com/teamnsrg/ethereum-p2p && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apt-get remove -y golang git make gcc libc-dev && apt autoremove -y && apt-get clean && \ diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile index a3425530d456..cdb70e716b86 100644 --- a/containers/docker/master-alpine/Dockerfile +++ b/containers/docker/master-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.5 RUN \ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - git clone --depth 1 --branch release/1.7 https://github.com/teamnsrg/go-ethereum && \ + git clone --depth 1 --branch release/1.7 https://github.com/teamnsrg/ethereum-p2p && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apk del go git make gcc musl-dev linux-headers && \ diff --git a/containers/docker/master-ubuntu/Dockerfile b/containers/docker/master-ubuntu/Dockerfile index 7e1de2d5ac6c..43e5ea685e3f 100644 --- a/containers/docker/master-ubuntu/Dockerfile +++ b/containers/docker/master-ubuntu/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:xenial RUN \ apt-get update && apt-get upgrade -q -y && \ apt-get install -y --no-install-recommends golang git make gcc libc-dev ca-certificates && \ - git clone --depth 1 --branch release/1.7 https://github.com/teamnsrg/go-ethereum && \ + git clone --depth 1 --branch release/1.7 https://github.com/teamnsrg/ethereum-p2p && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apt-get remove -y golang git make gcc libc-dev && apt autoremove -y && apt-get clean && \ diff --git a/containers/vagrant/Vagrantfile b/containers/vagrant/Vagrantfile index 7fcd17c17236..53bb177ad84e 100644 --- a/containers/vagrant/Vagrantfile +++ b/containers/vagrant/Vagrantfile @@ -34,5 +34,5 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end config.vm.synced_folder ".", "/vagrant", :disabled => true - config.vm.synced_folder "../../", "/home/vagrant/go/src/github.com/teamnsrg/go-ethereum" + config.vm.synced_folder "../../", "/home/vagrant/go/src/github.com/teamnsrg/ethereum-p2p" end diff --git a/containers/vagrant/provisioners/shell/centos.sh b/containers/vagrant/provisioners/shell/centos.sh index 54a0519d9e81..69f9247d6a51 100755 --- a/containers/vagrant/provisioners/shell/centos.sh +++ b/containers/vagrant/provisioners/shell/centos.sh @@ -6,6 +6,6 @@ sudo yum update -y wget --continue https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz sudo tar -C /usr/local -xzf go1.8.1.linux-amd64.tar.gz -GETH_PATH="~vagrant/go/src/github.com/teamnsrg/go-ethereum/build/bin/" +GETH_PATH="~vagrant/go/src/github.com/teamnsrg/ethereum-p2p/build/bin/" echo "export PATH=$PATH:/usr/local/go/bin:$GETH_PATH" >> ~vagrant/.bashrc diff --git a/containers/vagrant/provisioners/shell/debian.sh b/containers/vagrant/provisioners/shell/debian.sh index 247226fc0265..4f435c76c121 100755 --- a/containers/vagrant/provisioners/shell/debian.sh +++ b/containers/vagrant/provisioners/shell/debian.sh @@ -6,6 +6,6 @@ sudo apt-get update wget --continue https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz sudo tar -C /usr/local -xzf go1.8.1.linux-amd64.tar.gz -GETH_PATH="~vagrant/go/src/github.com/teamnsrg/go-ethereum/build/bin/" +GETH_PATH="~vagrant/go/src/github.com/teamnsrg/ethereum-p2p/build/bin/" echo "export PATH=$PATH:/usr/local/go/bin:$GETH_PATH" >> ~vagrant/.bashrc diff --git a/containers/vagrant/provisioners/shell/ubuntu.sh b/containers/vagrant/provisioners/shell/ubuntu.sh index 247226fc0265..4f435c76c121 100755 --- a/containers/vagrant/provisioners/shell/ubuntu.sh +++ b/containers/vagrant/provisioners/shell/ubuntu.sh @@ -6,6 +6,6 @@ sudo apt-get update wget --continue https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz sudo tar -C /usr/local -xzf go1.8.1.linux-amd64.tar.gz -GETH_PATH="~vagrant/go/src/github.com/teamnsrg/go-ethereum/build/bin/" +GETH_PATH="~vagrant/go/src/github.com/teamnsrg/ethereum-p2p/build/bin/" echo "export PATH=$PATH:/usr/local/go/bin:$GETH_PATH" >> ~vagrant/.bashrc diff --git a/contracts/chequebook/api.go b/contracts/chequebook/api.go index 0b5e3cd9abde..ac81cebd3191 100644 --- a/contracts/chequebook/api.go +++ b/contracts/chequebook/api.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) const Version = "1.0" diff --git a/contracts/chequebook/cheque.go b/contracts/chequebook/cheque.go index dab2be046efd..bdd465758749 100644 --- a/contracts/chequebook/cheque.go +++ b/contracts/chequebook/cheque.go @@ -36,14 +36,14 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/contracts/chequebook/contract" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/services/swap/swap" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/contracts/chequebook/contract" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/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 038d48a9e3d5..4568d7e84e13 100644 --- a/contracts/chequebook/cheque_test.go +++ b/contracts/chequebook/cheque_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind/backends" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/contracts/chequebook/contract" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind/backends" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/contracts/chequebook/contract" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/crypto" ) var ( diff --git a/contracts/chequebook/contract/chequebook.go b/contracts/chequebook/contract/chequebook.go index 8bda0cc12a01..138e0535f968 100644 --- a/contracts/chequebook/contract/chequebook.go +++ b/contracts/chequebook/contract/chequebook.go @@ -7,10 +7,10 @@ import ( "math/big" "strings" - "github.com/teamnsrg/go-ethereum/accounts/abi" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/accounts/abi" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" ) // ChequebookABI is the input ABI used to generate the binding from. diff --git a/contracts/chequebook/gencode.go b/contracts/chequebook/gencode.go index 17f396866c34..6ac4e8219e73 100644 --- a/contracts/chequebook/gencode.go +++ b/contracts/chequebook/gencode.go @@ -25,11 +25,11 @@ import ( "io/ioutil" "math/big" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind/backends" - "github.com/teamnsrg/go-ethereum/contracts/chequebook/contract" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind/backends" + "github.com/teamnsrg/ethereum-p2p/contracts/chequebook/contract" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/crypto" ) var ( diff --git a/contracts/ens/contract/ens.go b/contracts/ens/contract/ens.go index 066b00343d2f..861220e44681 100644 --- a/contracts/ens/contract/ens.go +++ b/contracts/ens/contract/ens.go @@ -6,10 +6,10 @@ package contract import ( "strings" - "github.com/teamnsrg/go-ethereum/accounts/abi" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/accounts/abi" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" ) // ENSABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/ens.go b/contracts/ens/ens.go index c44c75383eab..bee5f521c5e9 100644 --- a/contracts/ens/ens.go +++ b/contracts/ens/ens.go @@ -22,11 +22,11 @@ import ( "math/big" "strings" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/contracts/ens/contract" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/contracts/ens/contract" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" ) var ( diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index 3b2f2d9f69c6..4f8859dbec4a 100644 --- a/contracts/ens/ens_test.go +++ b/contracts/ens/ens_test.go @@ -20,10 +20,10 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind/backends" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind/backends" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/crypto" ) var ( diff --git a/contracts/release/contract.go b/contracts/release/contract.go index cacaf347bfb9..8723b8fbe277 100644 --- a/contracts/release/contract.go +++ b/contracts/release/contract.go @@ -7,10 +7,10 @@ import ( "math/big" "strings" - "github.com/teamnsrg/go-ethereum/accounts/abi" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/accounts/abi" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" ) // ReleaseOracleABI is the input ABI used to generate the binding from. diff --git a/contracts/release/contract_test.go b/contracts/release/contract_test.go index f937c9ef275b..a53a72c3b2bc 100644 --- a/contracts/release/contract_test.go +++ b/contracts/release/contract_test.go @@ -21,11 +21,11 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind/backends" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind/backends" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/crypto" ) // setupReleaseTest creates a blockchain simulator and deploys a version oracle diff --git a/contracts/release/release.go b/contracts/release/release.go index 69899bbc86d9..8c77df6ee6a6 100644 --- a/contracts/release/release.go +++ b/contracts/release/release.go @@ -25,15 +25,15 @@ import ( "strings" "time" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/eth" - "github.com/teamnsrg/go-ethereum/internal/ethapi" - "github.com/teamnsrg/go-ethereum/les" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/eth" + "github.com/teamnsrg/ethereum-p2p/internal/ethapi" + "github.com/teamnsrg/ethereum-p2p/les" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/rpc" ) // Interval to check for new releases @@ -149,7 +149,7 @@ func (r *ReleaseService) checkVersion() { warning := fmt.Sprintf("Client v%d.%d.%d-%x seems older than the latest upstream release v%d.%d.%d-%x", r.config.Major, r.config.Minor, r.config.Patch, r.config.Commit[:4], version.Major, version.Minor, version.Patch, version.Commit[:4]) - howtofix := fmt.Sprintf("Please check https://github.com/teamnsrg/go-ethereum/releases for new releases") + howtofix := fmt.Sprintf("Please check https://github.com/teamnsrg/ethereum-p2p/releases for new releases") separator := strings.Repeat("-", len(warning)) log.Warn(separator) diff --git a/core/asm/asm.go b/core/asm/asm.go index fea0233b7f96..f76e34192c79 100644 --- a/core/asm/asm.go +++ b/core/asm/asm.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "fmt" - "github.com/teamnsrg/go-ethereum/core/vm" + "github.com/teamnsrg/ethereum-p2p/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index 950080f951b7..8b4822914a7f 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -23,8 +23,8 @@ import ( "os" "strings" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/core/vm" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index b3e2ac5e4fa8..fc7b4bc98a43 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -23,14 +23,14 @@ import ( "os" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index d428698d2cb7..ff66594c7d18 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -20,11 +20,11 @@ import ( "fmt" "math/big" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/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 2af2d97f786d..5754b8005011 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index 630f3a25be1a..621d83bf7c2d 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -28,20 +28,20 @@ import ( "time" "github.com/hashicorp/golang-lru" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/mclock" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/metrics" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/mclock" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/metrics" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/trie" ) var ( diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 464222fbf2af..2f077e6b78a4 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -24,14 +24,14 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) // newTestBlockChain creates a blockchain without validation. diff --git a/core/blocks.go b/core/blocks.go index 204be55bbbec..1eb93dd43409 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -16,7 +16,7 @@ package core -import "github.com/teamnsrg/go-ethereum/common" +import "github.com/teamnsrg/ethereum-p2p/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 894eaabd116a..91b82b4e84ab 100644 --- a/core/bloombits/generator.go +++ b/core/bloombits/generator.go @@ -19,7 +19,7 @@ package bloombits import ( "errors" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/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 c4bbad2bf6ad..957f1d949b16 100644 --- a/core/bloombits/generator_test.go +++ b/core/bloombits/generator_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/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 e99f49d7671e..88582c58bdde 100644 --- a/core/bloombits/matcher.go +++ b/core/bloombits/matcher.go @@ -26,8 +26,8 @@ import ( "sync/atomic" "time" - "github.com/teamnsrg/go-ethereum/common/bitutil" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/common/bitutil" + "github.com/teamnsrg/ethereum-p2p/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 0d0d166a29f3..d5f58e27db77 100644 --- a/core/bloombits/matcher_test.go +++ b/core/bloombits/matcher_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/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/teamnsrg/go-ethereum/issues/15309. +// bitset matching https://github.com/teamnsrg/ethereum-p2p/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 1bd5a8d06b3a..c63cbe05639c 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/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 9128f2281176..40053537efad 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index 8bab213a78c9..a541e8c5a2d6 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -20,14 +20,14 @@ import ( "fmt" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/consensus/misc" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/consensus/misc" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) // So we can deterministically seed different blockchains diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index d3f443d7d839..ac96a3412fa5 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -20,12 +20,12 @@ import ( "fmt" "math/big" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) func ExampleGenerateChain() { diff --git a/core/dao_test.go b/core/dao_test.go index 74699d347f71..b683a568b8cf 100644 --- a/core/dao_test.go +++ b/core/dao_test.go @@ -20,10 +20,10 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/database_util.go b/core/database_util.go index 9c896d657770..10b40d7bf0f2 100644 --- a/core/database_util.go +++ b/core/database_util.go @@ -24,13 +24,13 @@ import ( "fmt" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/metrics" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/metrics" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" ) // DatabaseReader wraps the Get method of a backing data store. diff --git a/core/database_util_test.go b/core/database_util_test.go index 4280da7b85da..c91d29d2a9c6 100644 --- a/core/database_util_test.go +++ b/core/database_util_test.go @@ -21,11 +21,11 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto/sha3" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/rlp" ) // Tests block header storage and retrieval operations. diff --git a/core/events.go b/core/events.go index 66b0d7abc072..a97cdfd8a4d7 100644 --- a/core/events.go +++ b/core/events.go @@ -17,8 +17,8 @@ package core import ( - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" ) // TxPreEvent is posted when a transaction enters the transaction pool. diff --git a/core/evm.go b/core/evm.go index 9fe3c00e9ab1..d0577b73b91c 100644 --- a/core/evm.go +++ b/core/evm.go @@ -19,10 +19,10 @@ package core import ( "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/gen_genesis.go b/core/gen_genesis.go index cae4394cc0c6..7191afd71200 100644 --- a/core/gen_genesis.go +++ b/core/gen_genesis.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/params" ) func (g Genesis) MarshalJSON() ([]byte, error) { diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index a5fd3cae8132..5c82e5e16598 100644 --- a/core/gen_genesis_account.go +++ b/core/gen_genesis_account.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/common/math" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index 6bd62f106138..11a008678f22 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -25,15 +25,15 @@ import ( "math/big" "strings" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/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 5d6628d06c46..cc60af894675 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -22,11 +22,11 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) func TestDefaultGenesisBlock(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index f1499bbb3c02..eb03551017e2 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -26,12 +26,12 @@ import ( "time" "github.com/hashicorp/golang-lru" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/params" ) const ( diff --git a/core/helper_test.go b/core/helper_test.go index 8414f42c6024..b2424e70d25e 100644 --- a/core/helper_test.go +++ b/core/helper_test.go @@ -20,9 +20,9 @@ import ( "container/list" "fmt" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" ) // Implement our EthTest Manager diff --git a/core/mkalloc.go b/core/mkalloc.go index ed6f6c9defe2..71b7daba8b7f 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -34,8 +34,8 @@ import ( "sort" "strconv" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/rlp" ) type allocItem struct{ Addr, Balance *big.Int } diff --git a/core/state/database.go b/core/state/database.go index 21b72defe473..7c506f64c8a3 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -21,9 +21,9 @@ import ( "sync" lru "github.com/hashicorp/golang-lru" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/trie" ) // Trie cache generation limit after which to evic trie nodes from memory. diff --git a/core/state/dump.go b/core/state/dump.go index ea7df7f7da9f..8ce96070b5c1 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -20,9 +20,9 @@ import ( "encoding/json" "fmt" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/trie" ) type DumpAccount struct { diff --git a/core/state/iterator.go b/core/state/iterator.go index 3c433283c3d0..511f59e5beea 100644 --- a/core/state/iterator.go +++ b/core/state/iterator.go @@ -20,9 +20,9 @@ import ( "bytes" "fmt" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/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 39c5bd8e1205..b761e7ef4194 100644 --- a/core/state/iterator_test.go +++ b/core/state/iterator_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) // 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 5febf8915e34..8a5ec4a1742f 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -19,7 +19,7 @@ package state import ( "math/big" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) type journalEntry interface { diff --git a/core/state/managed_state.go b/core/state/managed_state.go index 994a8bcf3090..f9b113abdeef 100644 --- a/core/state/managed_state.go +++ b/core/state/managed_state.go @@ -19,7 +19,7 @@ package state import ( "sync" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) type account struct { diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go index 7077f5b649e5..031f09a7abda 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/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/ethdb" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/ethdb" ) var addr = common.BytesToAddress([]byte("test")) diff --git a/core/state/state_object.go b/core/state/state_object.go index 0b0a05e272f8..de763a91d3e8 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -22,10 +22,10 @@ import ( "io" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/trie" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index e34e67d53253..6c5aada425da 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" checker "gopkg.in/check.v1" ) diff --git a/core/state/statedb.go b/core/state/statedb.go index 53cee269472d..b43e9571fc92 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -23,12 +23,12 @@ import ( "sort" "sync" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/trie" ) type revision struct { diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index 0d8cb1dee897..9e98681006fd 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/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" ) // Tests that updating a state trie does not leak any database writes prior to diff --git a/core/state/sync.go b/core/state/sync.go index 48e5849736ab..a5c0a45edf4c 100644 --- a/core/state/sync.go +++ b/core/state/sync.go @@ -19,9 +19,9 @@ package state import ( "bytes" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index 62eec8f0fa13..578273e3a095 100644 --- a/core/state/sync_test.go +++ b/core/state/sync_test.go @@ -21,10 +21,10 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/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 64f48520aecf..80e4426204fb 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -19,14 +19,14 @@ package core import ( "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/consensus/misc" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/consensus/misc" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/params" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/state_transition.go b/core/state_transition.go index aa153d1cc913..24583372bda5 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -20,11 +20,11 @@ import ( "errors" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/params" ) var ( diff --git a/core/tx_journal.go b/core/tx_journal.go index 34b9779318fe..6423c38c2b50 100644 --- a/core/tx_journal.go +++ b/core/tx_journal.go @@ -21,10 +21,10 @@ import ( "io" "os" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/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 3667c0834ab8..50b0e6f55452 100644 --- a/core/tx_list.go +++ b/core/tx_list.go @@ -22,9 +22,9 @@ import ( "math/big" "sort" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/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 7b9c9d4b89d0..8f2c3707c9e0 100644 --- a/core/tx_list_test.go +++ b/core/tx_list_test.go @@ -21,8 +21,8 @@ import ( "math/rand" "testing" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/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 08a21b2927d4..0fa58f4d83fe 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/metrics" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/metrics" + "github.com/teamnsrg/ethereum-p2p/params" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 1eef856319dc..ae737a451040 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/params" ) // testTxPoolConfig is a transaction pool configuration without stateful disk diff --git a/core/types.go b/core/types.go index 313abbeef57f..cf7d6a0d16c9 100644 --- a/core/types.go +++ b/core/types.go @@ -19,9 +19,9 @@ package core import ( "math/big" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/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 a800f9d2db75..24ae730714ee 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -26,10 +26,10 @@ import ( "sync/atomic" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/crypto/sha3" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/rlp" ) var ( diff --git a/core/types/block_test.go b/core/types/block_test.go index fd7b08a33339..df1034f15460 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -23,8 +23,8 @@ import ( "reflect" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index b5c2a92e330e..9a6be12ca9f8 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index 4e15b6c1190d..60ae5ecd1006 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/teamnsrg/go-ethereum/core/state" + "github.com/teamnsrg/ethereum-p2p/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go index 4c7ba13db97d..fdbcc805f989 100644 --- a/core/types/derive_sha.go +++ b/core/types/derive_sha.go @@ -19,9 +19,9 @@ package types import ( "bytes" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/trie" ) type DerivableList interface { diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 6ae8dabf1164..677649ffbec0 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/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" ) func (h Header) MarshalJSON() ([]byte, error) { diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index fe6e6d301bf2..9864dc81685f 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/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" ) func (l Log) MarshalJSON() ([]byte, error) { diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index bfbbf569ebac..ebebbb6972ae 100644 --- a/core/types/gen_receipt_json.go +++ b/core/types/gen_receipt_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" ) func (r Receipt) MarshalJSON() ([]byte, error) { diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go index aa83f592a93a..384b2e606791 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/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" ) func (t txdata) MarshalJSON() ([]byte, error) { diff --git a/core/types/log.go b/core/types/log.go index ca012673447e..2fb18fa7b737 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -20,9 +20,9 @@ import ( "fmt" "io" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/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 facc872002e3..d6317d078ef2 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/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index a6fa866ca39e..6825161fc7fc 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -22,9 +22,9 @@ import ( "io" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/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 56d5b33215c0..d5f395e3dae3 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -24,10 +24,10 @@ import ( "math/big" "sync/atomic" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/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 f87ece2649b6..86b81e874a7d 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -22,9 +22,9 @@ import ( "fmt" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/params" ) var ( diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 8c76d30079fe..477a6bad1ebb 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/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index ca30a75f872c..d4370f5d174d 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -23,9 +23,9 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/vm/analysis.go b/core/vm/analysis.go index 2dd7028df631..449cd4bfcb7a 100644 --- a/core/vm/analysis.go +++ b/core/vm/analysis.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/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 ea15c7f37f0c..143bdb28996c 100644 --- a/core/vm/common.go +++ b/core/vm/common.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" ) // calculates the memory size required for a step diff --git a/core/vm/contract.go b/core/vm/contract.go index 071c99b88286..9b60fce92a2f 100644 --- a/core/vm/contract.go +++ b/core/vm/contract.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 6613c6d4f084..bef557a885ac 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -21,11 +21,11 @@ import ( "errors" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/crypto/bn256" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/crypto/bn256" + "github.com/teamnsrg/ethereum-p2p/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 9ddac4477a68..d7adb3bc2e52 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -5,7 +5,7 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/evm.go b/core/vm/evm.go index c685ddb7d050..bc626c9d6844 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -20,9 +20,9 @@ import ( "math/big" "sync/atomic" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/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 a54406bf6405..9eaec5bc4526 100644 --- a/core/vm/gas.go +++ b/core/vm/gas.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/params" ) const ( diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 2ad74f11e226..05c4e1c0b027 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -19,9 +19,9 @@ package vm import ( "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/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 8a345de71b58..4ec9437621ac 100644 --- a/core/vm/gen_structlog.go +++ b/core/vm/gen_structlog.go @@ -6,9 +6,9 @@ import ( "encoding/json" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/common/math" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/math" ) func (s StructLog) MarshalJSON() ([]byte, error) { diff --git a/core/vm/instructions.go b/core/vm/instructions.go index dd227a555c26..7d08f5fb080a 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -21,11 +21,11 @@ import ( "fmt" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/params" ) var ( diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 801d903d29e4..728b19efffac 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -4,8 +4,8 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/params" ) func TestByteOp(t *testing.T) { diff --git a/core/vm/interface.go b/core/vm/interface.go index e55cc5e39f60..5c7998f001a2 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index 1868a9332cbc..22f82f79edd4 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -20,10 +20,10 @@ import ( "fmt" "sync/atomic" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/params" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index ee8921863e3b..2bf648ed1f15 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index bff7dce785d1..8a030f940559 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -23,10 +23,10 @@ import ( "math/big" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/core/types" ) type Storage map[common.Hash]common.Hash diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index 352d8c637054..f0cddccb7163 100644 --- a/core/vm/logger_test.go +++ b/core/vm/logger_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/params" ) type dummyContractRef struct { diff --git a/core/vm/memory_table.go b/core/vm/memory_table.go index e4db0741a770..0cfea03f1a54 100644 --- a/core/vm/memory_table.go +++ b/core/vm/memory_table.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/teamnsrg/go-ethereum/common/math" + "github.com/teamnsrg/ethereum-p2p/common/math" ) func memorySha3(stack *Stack) *big.Int { diff --git a/core/vm/noop.go b/core/vm/noop.go index 1957332f84b4..ebfcd7894572 100644 --- a/core/vm/noop.go +++ b/core/vm/noop.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/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 89bab034958a..33a972febb12 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -19,9 +19,9 @@ package runtime import ( "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/vm" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index 578e6141e6f0..9e819851c384 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -21,12 +21,12 @@ import ( "math/big" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/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 143869ac3b53..9e072120e08b 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/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/vm/runtime" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index 394a7e1c801c..f7671dfb0b30 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -21,11 +21,11 @@ import ( "strings" "testing" - "github.com/teamnsrg/go-ethereum/accounts/abi" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/ethdb" + "github.com/teamnsrg/ethereum-p2p/accounts/abi" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/ethdb" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index b52664c54b9c..4dbca8e21f0d 100644 --- a/core/vm/stack_table.go +++ b/core/vm/stack_table.go @@ -19,7 +19,7 @@ package vm import ( "fmt" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/params" ) func makeStackFunc(pop, push int) stackValidationFunc { diff --git a/core/vm/vm_jit.go b/core/vm/vm_jit.go index c3da040a1f7f..a3bbd2d819f8 100644 --- a/core/vm/vm_jit.go +++ b/core/vm/vm_jit.go @@ -38,9 +38,9 @@ import ( "math/big" "unsafe" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/params" ) type JitVm struct { diff --git a/crypto/crypto.go b/crypto/crypto.go index d34f64db5eae..cbde67e8d2d4 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -28,10 +28,10 @@ import ( "math/big" "os" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/crypto/sha3" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/rlp" ) var ( diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index f0d078ec36d5..1c75d3c500b5 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index 9316bd3a6d59..ae620af9bece 100644 --- a/crypto/ecies/ecies_test.go +++ b/crypto/ecies/ecies_test.go @@ -40,7 +40,7 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/crypto" ) var dumpEnc bool diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 636759a7bf9d..9d248d19bd82 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -42,7 +42,7 @@ import ( "fmt" "hash" - ethcrypto "github.com/teamnsrg/go-ethereum/crypto" + ethcrypto "github.com/teamnsrg/ethereum-p2p/crypto" ) var ( diff --git a/crypto/secp256k1/curve.go b/crypto/secp256k1/curve.go index 6f5ab40c4102..a4b9777e3e0e 100644 --- a/crypto/secp256k1/curve.go +++ b/crypto/secp256k1/curve.go @@ -37,7 +37,7 @@ import ( "sync" "unsafe" - "github.com/teamnsrg/go-ethereum/common/math" + "github.com/teamnsrg/ethereum-p2p/common/math" ) /* diff --git a/crypto/secp256k1/secp256_test.go b/crypto/secp256k1/secp256_test.go index 7a4463f4f38e..6eecfd22fa63 100644 --- a/crypto/secp256k1/secp256_test.go +++ b/crypto/secp256k1/secp256_test.go @@ -24,8 +24,8 @@ import ( "encoding/hex" "testing" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/crypto/randentropy" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/crypto/randentropy" ) const TestCount = 1000 diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index 1b7eb67da96b..078d13582faa 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -23,8 +23,8 @@ import ( "crypto/elliptic" "fmt" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/crypto/secp256k1" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/crypto/secp256k1" ) func Ecrecover(hash, sig []byte) ([]byte, error) { diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go index da5275e53a21..1f3016cd2b8b 100644 --- a/dashboard/dashboard.go +++ b/dashboard/dashboard.go @@ -29,9 +29,9 @@ import ( "time" "github.com/rcrowley/go-metrics" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/rpc" "golang.org/x/net/websocket" ) diff --git a/eth/api.go b/eth/api.go index 79dc1c4976fc..86dfdc150373 100644 --- a/eth/api.go +++ b/eth/api.go @@ -28,19 +28,19 @@ import ( "strings" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/internal/ethapi" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/miner" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/rpc" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/internal/ethapi" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/miner" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/rpc" + "github.com/teamnsrg/ethereum-p2p/trie" ) const defaultTraceTimeout = 5 * time.Second diff --git a/eth/api_backend.go b/eth/api_backend.go index b6e29bbd2491..415ba9067df4 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -20,20 +20,20 @@ import ( "context" "math/big" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/bloombits" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/eth/gasprice" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/bloombits" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/eth/gasprice" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rpc" ) // EthApiBackend implements ethapi.Backend for full nodes diff --git a/eth/api_test.go b/eth/api_test.go index c4ddbe4fb77a..d2a2884e8105 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/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/ethdb" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/ethdb" ) var dumper = spew.ConfigState{Indent: " "} diff --git a/eth/backend.go b/eth/backend.go index 018ae8159d20..0f911e915240 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -25,29 +25,29 @@ import ( "sync" "sync/atomic" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/consensus/clique" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/bloombits" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/eth/filters" - "github.com/teamnsrg/go-ethereum/eth/gasprice" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/internal/ethapi" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/miner" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/consensus/clique" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/bloombits" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/eth/filters" + "github.com/teamnsrg/ethereum-p2p/eth/gasprice" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/internal/ethapi" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/miner" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/rpc" ) type LesServer interface { diff --git a/eth/bind.go b/eth/bind.go index 14f6e6af7fc4..37a4c704c5aa 100644 --- a/eth/bind.go +++ b/eth/bind.go @@ -20,13 +20,13 @@ import ( "context" "math/big" - "github.com/teamnsrg/go-ethereum" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/internal/ethapi" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/internal/ethapi" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/rpc" ) // ContractBackend implements bind.ContractBackend with direct calls to Ethereum diff --git a/eth/bloombits.go b/eth/bloombits.go index 0f4833fa07e6..893fdd772777 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -19,13 +19,13 @@ package eth import ( "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/bitutil" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/bloombits" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/bitutil" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/bloombits" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) const ( diff --git a/eth/config.go b/eth/config.go index 9fa97ae7653c..b79aa72c3518 100644 --- a/eth/config.go +++ b/eth/config.go @@ -23,12 +23,12 @@ import ( "path/filepath" "runtime" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/eth/gasprice" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/eth/gasprice" + "github.com/teamnsrg/ethereum-p2p/params" ) // DefaultConfig contains default settings for use on the Ethereum main net. diff --git a/eth/db_upgrade.go b/eth/db_upgrade.go index 03359da3c381..7e0b61d03cc2 100644 --- a/eth/db_upgrade.go +++ b/eth/db_upgrade.go @@ -21,11 +21,11 @@ import ( "bytes" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/rlp" ) var deduplicateData = []byte("dbUpgrade_20170714deduplicateData") diff --git a/eth/downloader/api.go b/eth/downloader/api.go index d9e277b1e16b..5e74f1537a54 100644 --- a/eth/downloader/api.go +++ b/eth/downloader/api.go @@ -20,9 +20,9 @@ import ( "context" "sync" - ethereum "github.com/teamnsrg/go-ethereum" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/rpc" + ethereum "github.com/teamnsrg/ethereum-p2p" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/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 610f7be65a8f..8ba0afe511e7 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -28,13 +28,13 @@ import ( "time" "github.com/rcrowley/go-metrics" - ethereum "github.com/teamnsrg/go-ethereum" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/params" + ethereum "github.com/teamnsrg/ethereum-p2p" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/params" ) var ( diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index 7bdb319be59c..b406987980da 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -25,15 +25,15 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/trie" ) var ( diff --git a/eth/downloader/fakepeer.go b/eth/downloader/fakepeer.go index 3aee083b70fc..3bb960328c89 100644 --- a/eth/downloader/fakepeer.go +++ b/eth/downloader/fakepeer.go @@ -19,10 +19,10 @@ package downloader import ( "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/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 dca99af7e651..75d3a28008d3 100644 --- a/eth/downloader/metrics.go +++ b/eth/downloader/metrics.go @@ -19,7 +19,7 @@ package downloader import ( - "github.com/teamnsrg/go-ethereum/metrics" + "github.com/teamnsrg/ethereum-p2p/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index 5c5c5f86d733..418e1a63efca 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -29,9 +29,9 @@ import ( "sync/atomic" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/log" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index 4d6c62b2fedb..0e7884b95226 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -26,9 +26,9 @@ import ( "time" "github.com/rcrowley/go-metrics" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/log" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index 06b33405786b..56fa9bae5b0e 100644 --- a/eth/downloader/statesync.go +++ b/eth/downloader/statesync.go @@ -23,12 +23,12 @@ import ( "sync/atomic" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/crypto/sha3" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/trie" ) // stateReq represents a batch of state fetch requests groupped together into diff --git a/eth/downloader/types.go b/eth/downloader/types.go index 3a040ece5f71..799429871309 100644 --- a/eth/downloader/types.go +++ b/eth/downloader/types.go @@ -19,7 +19,7 @@ package downloader import ( "fmt" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/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 176c387b3a12..4cd6594b3f1a 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -22,10 +22,10 @@ import ( "math/rand" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/log" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index afb9641768a7..9d7bcb7699ad 100644 --- a/eth/fetcher/fetcher_test.go +++ b/eth/fetcher/fetcher_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) var ( diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go index 487df48b9408..8bd65525408e 100644 --- a/eth/fetcher/metrics.go +++ b/eth/fetcher/metrics.go @@ -19,7 +19,7 @@ package fetcher import ( - "github.com/teamnsrg/go-ethereum/metrics" + "github.com/teamnsrg/ethereum-p2p/metrics" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index 511288f3ac96..6aacd4644693 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -25,12 +25,12 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/rpc" ) var ( diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 2b20abc1579a..51402c7d210c 100644 --- a/eth/filters/api_test.go +++ b/eth/filters/api_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index 8ed7ced0535f..7dc8b735e134 100644 --- a/eth/filters/bench_test.go +++ b/eth/filters/bench_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/bitutil" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/bloombits" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/node" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/bitutil" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/bloombits" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 8bce07868eae..fc1b5a9070f2 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -20,13 +20,13 @@ import ( "context" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/bloombits" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/bloombits" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/rpc" ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index e5b2a717e744..ea9913112e1e 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/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 c6e07f16ccab..84ca46e08ee8 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -25,14 +25,14 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/bloombits" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/bloombits" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rpc" ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 213c324b788b..391a0c4b2212 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -23,13 +23,13 @@ import ( "os" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/params" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index aa7253f2ab54..1bf2313d71c0 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -22,10 +22,10 @@ import ( "sort" "sync" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/internal/ethapi" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/internal/ethapi" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rpc" ) var maxPrice = big.NewInt(500 * params.Shannon) diff --git a/eth/gen_config.go b/eth/gen_config.go index d9c78fbfe5ec..6ce6206e6a0e 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -5,11 +5,11 @@ package eth import ( "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/eth/gasprice" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/eth/gasprice" ) func (c Config) MarshalTOML() (interface{}, error) { diff --git a/eth/handler.go b/eth/handler.go index 899fb4066bbf..9f6b110852e9 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -26,20 +26,20 @@ import ( "sync/atomic" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/consensus/misc" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/eth/fetcher" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/consensus/misc" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/eth/fetcher" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" ) const ( diff --git a/eth/handler_test.go b/eth/handler_test.go index 900b56d34015..f2e8f3b210ff 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -23,18 +23,18 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/params" ) var bigTxGas = new(big.Int).SetUint64(params.TxGas) diff --git a/eth/helper_test.go b/eth/helper_test.go index fbe0427642be..77773a777a1b 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -27,18 +27,18 @@ import ( "sync" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/params" ) var ( diff --git a/eth/metrics.go b/eth/metrics.go index 9b2befcf9f87..a8b5f3c7fd24 100644 --- a/eth/metrics.go +++ b/eth/metrics.go @@ -17,8 +17,8 @@ package eth import ( - "github.com/teamnsrg/go-ethereum/metrics" - "github.com/teamnsrg/go-ethereum/p2p" + "github.com/teamnsrg/ethereum-p2p/metrics" + "github.com/teamnsrg/ethereum-p2p/p2p" ) var ( diff --git a/eth/peer.go b/eth/peer.go index 5b3c9013dc8d..8bcca2382fe1 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/rlp" "gopkg.in/fatih/set.v0" ) diff --git a/eth/protocol.go b/eth/protocol.go index f5ddf82cb081..416f9c8fa5bd 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -21,11 +21,11 @@ import ( "io" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocol_test.go b/eth/protocol_test.go index 33837cf21ba6..0f621bee4899 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/rlp" ) func init() { diff --git a/eth/sync.go b/eth/sync.go index d42f0fb9b53c..f98b26291924 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -21,11 +21,11 @@ import ( "sync/atomic" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index b57861f4654f..b8fe5f1d1c34 100644 --- a/eth/sync_test.go +++ b/eth/sync_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" ) // Tests that fast sync gets disabled as soon as a real block is successfully diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index 1b43ac41ff77..f3285851a46a 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -24,12 +24,12 @@ import ( "fmt" "math/big" - "github.com/teamnsrg/go-ethereum" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index 635b5fd99d52..585c77c953e5 100644 --- a/ethclient/ethclient_test.go +++ b/ethclient/ethclient_test.go @@ -16,7 +16,7 @@ package ethclient -import "github.com/teamnsrg/go-ethereum" +import "github.com/teamnsrg/ethereum-p2p" // Verify that Client implements the ethereum interfaces. var ( diff --git a/ethclient/signer.go b/ethclient/signer.go index 002faab61d3a..b57482ab2af1 100644 --- a/ethclient/signer.go +++ b/ethclient/signer.go @@ -20,8 +20,8 @@ import ( "errors" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/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 46ca24e72334..103ecb297702 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -27,8 +27,8 @@ import ( "github.com/syndtr/goleveldb/leveldb/filter" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/metrics" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/metrics" gometrics "github.com/rcrowley/go-metrics" ) diff --git a/ethdb/database_test.go b/ethdb/database_test.go index a1cc48185184..cf28ffd0119a 100644 --- a/ethdb/database_test.go +++ b/ethdb/database_test.go @@ -25,7 +25,7 @@ import ( "sync" "testing" - "github.com/teamnsrg/go-ethereum/ethdb" + "github.com/teamnsrg/ethereum-p2p/ethdb" ) func newTestLDB() (*ethdb.LDBDatabase, func()) { diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go index a1d97df5892e..126489de56fb 100644 --- a/ethdb/memory_database.go +++ b/ethdb/memory_database.go @@ -20,7 +20,7 @@ import ( "errors" "sync" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) /* diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index 5e52e4654f8f..43b527ca4ed0 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -30,17 +30,17 @@ import ( "strings" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/mclock" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/eth" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/les" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/mclock" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/eth" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/les" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/rpc" "golang.org/x/net/websocket" ) diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 0a44d52c2072..a3cacc67da51 100644 --- a/event/example_feed_test.go +++ b/event/example_feed_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/teamnsrg/go-ethereum/event" + "github.com/teamnsrg/ethereum-p2p/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index b5fa71c85939..b3f4da7a0802 100644 --- a/event/example_scope_test.go +++ b/event/example_scope_test.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/teamnsrg/go-ethereum/event" + "github.com/teamnsrg/ethereum-p2p/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 d5221599431e..d6316738c13e 100644 --- a/event/example_subscription_test.go +++ b/event/example_subscription_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/teamnsrg/go-ethereum/event" + "github.com/teamnsrg/ethereum-p2p/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index a90f00bf0316..15d016d0c5ba 100644 --- a/event/subscription.go +++ b/event/subscription.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common/mclock" + "github.com/teamnsrg/ethereum-p2p/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 96a77120eaad..3ae56438be53 100644 --- a/interfaces.go +++ b/interfaces.go @@ -22,8 +22,8 @@ import ( "errors" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/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 776a0431e044..3564a1d1be26 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -33,7 +33,7 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 8df23a691052..2b317746cc49 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -25,8 +25,8 @@ import ( "runtime" colorable "github.com/mattn/go-colorable" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/log/term" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/log/term" "gopkg.in/urfave/cli.v1" ) diff --git a/internal/debug/trace.go b/internal/debug/trace.go index 1fa2c74b5a89..9e885ae70eeb 100644 --- a/internal/debug/trace.go +++ b/internal/debug/trace.go @@ -23,7 +23,7 @@ import ( "os" "runtime/trace" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index 5b10f10eca81..f53392c9c634 100644 --- a/internal/ethapi/addrlock.go +++ b/internal/ethapi/addrlock.go @@ -19,7 +19,7 @@ package ethapi import ( "sync" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 2785925f0e30..f1aaf292205e 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -26,21 +26,21 @@ import ( "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/accounts/keystore" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/accounts/keystore" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/rpc" ) const ( @@ -390,7 +390,7 @@ func signHash(data []byte) []byte { // // The key used to calculate the signature is decrypted with the given password. // -// https://github.com/teamnsrg/go-ethereum/wiki/Management-APIs#personal_sign +// https://github.com/teamnsrg/ethereum-p2p/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} @@ -417,7 +417,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/teamnsrg/go-ethereum/wiki/Management-APIs#personal_ecRecover +// https://github.com/teamnsrg/ethereum-p2p/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 53e4a0e0c562..e6cb5985cda9 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -21,17 +21,17 @@ import ( "context" "math/big" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rpc" ) // Backend interface provides the common API services (that are provided by diff --git a/internal/ethapi/tracer.go b/internal/ethapi/tracer.go index 1afd01000fae..a58ba16319a9 100644 --- a/internal/ethapi/tracer.go +++ b/internal/ethapi/tracer.go @@ -24,9 +24,9 @@ import ( "time" "github.com/robertkrimen/otto" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/core/vm" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/core/vm" ) // fakeBig is used to provide an interface to Javascript for 'big.NewInt' diff --git a/internal/ethapi/tracer_test.go b/internal/ethapi/tracer_test.go index 890421e9c45e..999c295b2b3e 100644 --- a/internal/ethapi/tracer_test.go +++ b/internal/ethapi/tracer_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/params" ) type account struct{} diff --git a/internal/guide/guide_test.go b/internal/guide/guide_test.go index 0e85d43ad9df..3e5ba746aecf 100644 --- a/internal/guide/guide_test.go +++ b/internal/guide/guide_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/accounts/keystore" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/accounts/keystore" + "github.com/teamnsrg/ethereum-p2p/core/types" ) // Tests that the account management snippets work correctly. diff --git a/internal/jsre/deps/web3.js b/internal/jsre/deps/web3.js index c285584bac12..758d0ca73d08 100644 --- a/internal/jsre/deps/web3.js +++ b/internal/jsre/deps/web3.js @@ -5857,7 +5857,7 @@ module.exports = Shh; * @author Alex Beregszaszi * @date 2016 * - * Reference: https://github.com/teamnsrg/go-ethereum/blob/swarm/internal/web3ext/web3ext.go#L33 + * Reference: https://github.com/teamnsrg/ethereum-p2p/blob/swarm/internal/web3ext/web3ext.go#L33 */ "use strict"; diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index 2870aacc53d0..09c3e5bbaf4a 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -27,8 +27,8 @@ import ( "time" "github.com/robertkrimen/otto" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/internal/jsre/deps" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/internal/jsre/deps" ) var ( diff --git a/les/api_backend.go b/les/api_backend.go index 706c2b5c5a6a..a92e768621bf 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -20,21 +20,21 @@ import ( "context" "math/big" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/bloombits" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/eth/gasprice" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/light" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/bloombits" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/eth/gasprice" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/light" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rpc" ) type LesApiBackend struct { diff --git a/les/backend.go b/les/backend.go index 10f2555d5d7f..4aebf0c0707d 100644 --- a/les/backend.go +++ b/les/backend.go @@ -22,27 +22,27 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/bloombits" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/eth" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/eth/filters" - "github.com/teamnsrg/go-ethereum/eth/gasprice" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/internal/ethapi" - "github.com/teamnsrg/go-ethereum/light" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discv5" - "github.com/teamnsrg/go-ethereum/params" - rpc "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/bloombits" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/eth" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/eth/filters" + "github.com/teamnsrg/ethereum-p2p/eth/gasprice" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/internal/ethapi" + "github.com/teamnsrg/ethereum-p2p/light" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discv5" + "github.com/teamnsrg/ethereum-p2p/params" + rpc "github.com/teamnsrg/ethereum-p2p/rpc" ) type LightEthereum struct { diff --git a/les/bloombits.go b/les/bloombits.go index c3baf5a9fd21..5c32101fe9bb 100644 --- a/les/bloombits.go +++ b/les/bloombits.go @@ -19,8 +19,8 @@ package les import ( "time" - "github.com/teamnsrg/go-ethereum/common/bitutil" - "github.com/teamnsrg/go-ethereum/light" + "github.com/teamnsrg/ethereum-p2p/common/bitutil" + "github.com/teamnsrg/ethereum-p2p/light" ) const ( diff --git a/les/fetcher.go b/les/fetcher.go index bfaa02b809d6..01e93651684c 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/mclock" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/light" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/mclock" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/light" + "github.com/teamnsrg/ethereum-p2p/log" ) const ( diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index a2502d70fe46..e1f30f7f9ea6 100644 --- a/les/flowcontrol/control.go +++ b/les/flowcontrol/control.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common/mclock" + "github.com/teamnsrg/ethereum-p2p/common/mclock" ) const fcTimeConst = time.Millisecond diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go index a8c1612c7f79..dde81796606a 100644 --- a/les/flowcontrol/manager.go +++ b/les/flowcontrol/manager.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common/mclock" + "github.com/teamnsrg/ethereum-p2p/common/mclock" ) const rcConst = 1000000 diff --git a/les/handler.go b/les/handler.go index 9f2e04e9c27a..0d9d88351ab1 100644 --- a/les/handler.go +++ b/les/handler.go @@ -27,23 +27,23 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/eth" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/light" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/p2p/discv5" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/eth" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/light" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/discv5" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/trie" ) const ( diff --git a/les/handler_test.go b/les/handler_test.go index 6dfdb12b1796..c95ba3e9ac22 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/light" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/light" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/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 b43ee76a3aeb..45e51e10341e 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -25,19 +25,19 @@ import ( "sync" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/les/flowcontrol" - "github.com/teamnsrg/go-ethereum/light" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/les/flowcontrol" + "github.com/teamnsrg/ethereum-p2p/light" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/params" ) var ( diff --git a/les/metrics.go b/les/metrics.go index 414ab1c4b3ca..f3dd843b1ad2 100644 --- a/les/metrics.go +++ b/les/metrics.go @@ -17,8 +17,8 @@ package les import ( - "github.com/teamnsrg/go-ethereum/metrics" - "github.com/teamnsrg/go-ethereum/p2p" + "github.com/teamnsrg/ethereum-p2p/metrics" + "github.com/teamnsrg/ethereum-p2p/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index 47d9248e49be..618c87e57796 100644 --- a/les/odr.go +++ b/les/odr.go @@ -19,10 +19,10 @@ package les import ( "context" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/light" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/light" + "github.com/teamnsrg/ethereum-p2p/log" ) // LesOdr implements light.OdrBackend diff --git a/les/odr_requests.go b/les/odr_requests.go index fd41fe34429d..7c856428d194 100644 --- a/les/odr_requests.go +++ b/les/odr_requests.go @@ -23,15 +23,15 @@ import ( "errors" "fmt" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/light" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/light" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/trie" ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index 0fce24819ac0..694230462392 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/eth" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/light" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/eth" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/light" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/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 5258a87b87c5..e181ed84eb7a 100644 --- a/les/peer.go +++ b/les/peer.go @@ -26,13 +26,13 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/eth" - "github.com/teamnsrg/go-ethereum/les/flowcontrol" - "github.com/teamnsrg/go-ethereum/light" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/eth" + "github.com/teamnsrg/ethereum-p2p/les/flowcontrol" + "github.com/teamnsrg/ethereum-p2p/light" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/rlp" ) var ( diff --git a/les/protocol.go b/les/protocol.go index 95865a44a7cc..d895ad54dea8 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -26,11 +26,11 @@ import ( "io" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/crypto/secp256k1" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/crypto/secp256k1" + "github.com/teamnsrg/ethereum-p2p/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/request_test.go b/les/request_test.go index 2052befdc613..38e2a006c8a2 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/eth" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/light" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/eth" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/light" ) var testBankSecureTrieKey = secAddr(testBankAddress) diff --git a/les/retrieve.go b/les/retrieve.go index 4c08bbc4e8df..1f5a8fbc912f 100644 --- a/les/retrieve.go +++ b/les/retrieve.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common/mclock" + "github.com/teamnsrg/ethereum-p2p/common/mclock" ) var ( diff --git a/les/server.go b/les/server.go index 2d7d4a708b80..6968c0c7b306 100644 --- a/les/server.go +++ b/les/server.go @@ -24,17 +24,17 @@ import ( "math" "sync" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/eth" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/les/flowcontrol" - "github.com/teamnsrg/go-ethereum/light" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discv5" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/eth" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/les/flowcontrol" + "github.com/teamnsrg/ethereum-p2p/light" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discv5" + "github.com/teamnsrg/ethereum-p2p/rlp" ) type LesServer struct { diff --git a/les/serverpool.go b/les/serverpool.go index 79bc87e7a41c..ef9c0e29016f 100644 --- a/les/serverpool.go +++ b/les/serverpool.go @@ -27,13 +27,13 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common/mclock" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/p2p/discv5" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common/mclock" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/discv5" + "github.com/teamnsrg/ethereum-p2p/rlp" ) const ( diff --git a/les/sync.go b/les/sync.go index c7467a3d9440..2b5060381d35 100644 --- a/les/sync.go +++ b/les/sync.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/light" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/light" ) const ( diff --git a/les/txrelay.go b/les/txrelay.go index 10f0ce75962f..f598e1b3e335 100644 --- a/les/txrelay.go +++ b/les/txrelay.go @@ -19,8 +19,8 @@ package les import ( "sync" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" ) type ltrInfo struct { diff --git a/light/lightchain.go b/light/lightchain.go index b41e245d3ffd..4f6f1d1b30e4 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -24,15 +24,15 @@ import ( "time" "github.com/hashicorp/golang-lru" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" ) var ( diff --git a/light/lightchain_test.go b/light/lightchain_test.go index 99a611251b20..8da2dfef90cc 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -21,12 +21,12 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) // So we can deterministically seed different blockchains diff --git a/light/nodeset.go b/light/nodeset.go index 0c944da5ec7d..a4e6ea0861a2 100644 --- a/light/nodeset.go +++ b/light/nodeset.go @@ -20,10 +20,10 @@ import ( "errors" "sync" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/trie" ) // 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 b85779783924..325a487fb57d 100644 --- a/light/odr.go +++ b/light/odr.go @@ -22,10 +22,10 @@ import ( "context" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/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 a0c116f12481..3a7530d77b51 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -24,18 +24,18 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/trie" ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index a1dab5bab287..554c7bdc6125 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -20,11 +20,11 @@ import ( "bytes" "context" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/rlp" ) var sha3_nil = crypto.Keccak256Hash(nil) diff --git a/light/postprocess.go b/light/postprocess.go index 82ca453b41d2..7e3447da4963 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -23,15 +23,15 @@ import ( "math/big" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/bitutil" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/bitutil" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" + "github.com/teamnsrg/ethereum-p2p/trie" ) const ( diff --git a/light/trie.go b/light/trie.go index d1d213a3f392..747e34e8f697 100644 --- a/light/trie.go +++ b/light/trie.go @@ -20,11 +20,11 @@ import ( "context" "fmt" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/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 33afb4241cb8..867f713460f4 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/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/trie" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/trie" ) func TestNodeIterator(t *testing.T) { diff --git a/light/txpool.go b/light/txpool.go index 25992c7349ad..9dca59266124 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -22,15 +22,15 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" ) const ( diff --git a/light/txpool_test.go b/light/txpool_test.go index d0db38e85052..de41a33abadd 100644 --- a/light/txpool_test.go +++ b/light/txpool_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) type testTxRelay struct { diff --git a/log/format.go b/log/format.go index 1065380d3ed2..0627ab48f541 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/teamnsrg/go-ethereum/", + "github.com/teamnsrg/ethereum-p2p/", } // PrintOrigins sets or unsets log location (file:line) printing for terminal diff --git a/metrics/metrics.go b/metrics/metrics.go index 51f5ea1ec4b2..142736e68c36 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -25,7 +25,7 @@ import ( "github.com/rcrowley/go-metrics" "github.com/rcrowley/go-metrics/exp" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) // MetricsEnabledFlag is the CLI flag name to use to enable metrics collections. diff --git a/miner/agent.go b/miner/agent.go index 03f3de81091e..1a4c541cca6d 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -21,8 +21,8 @@ import ( "sync/atomic" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/log" ) type CpuAgent struct { diff --git a/miner/miner.go b/miner/miner.go index 42584ce5e3a9..7c0d44795d39 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -21,17 +21,17 @@ import ( "fmt" "sync/atomic" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/eth/downloader" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/eth/downloader" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/params" ) // Backend wraps all methods required for mining. diff --git a/miner/remote_agent.go b/miner/remote_agent.go index e517638cb689..e2032179d68d 100644 --- a/miner/remote_agent.go +++ b/miner/remote_agent.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/log" ) type hashrate struct { diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index 46b86bd3adf8..8f390bed118f 100644 --- a/miner/unconfirmed.go +++ b/miner/unconfirmed.go @@ -20,9 +20,9 @@ import ( "container/ring" "sync" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/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 144d11e4042b..913bdf426713 100644 --- a/miner/unconfirmed_test.go +++ b/miner/unconfirmed_test.go @@ -19,8 +19,8 @@ package miner import ( "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/core/types" ) // noopHeaderRetriever is an implementation of headerRetriever that always diff --git a/miner/worker.go b/miner/worker.go index cf79c24904f9..f78764553fe8 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -24,17 +24,17 @@ import ( "sync/atomic" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/consensus" - "github.com/teamnsrg/go-ethereum/consensus/misc" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/consensus" + "github.com/teamnsrg/ethereum-p2p/consensus/misc" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/params" "gopkg.in/fatih/set.v0" ) diff --git a/node/api.go b/node/api.go index 462b9f7adf84..704935890508 100644 --- a/node/api.go +++ b/node/api.go @@ -23,11 +23,11 @@ import ( "time" "github.com/rcrowley/go-metrics" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/rpc" ) // PrivateAdminAPI is the collection of administrative API methods exposed only diff --git a/node/config.go b/node/config.go index cb5598382ca9..3699186839df 100644 --- a/node/config.go +++ b/node/config.go @@ -25,14 +25,14 @@ import ( "runtime" "strings" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/accounts/keystore" - "github.com/teamnsrg/go-ethereum/accounts/usbwallet" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/accounts/keystore" + "github.com/teamnsrg/ethereum-p2p/accounts/usbwallet" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" ) const ( diff --git a/node/config_test.go b/node/config_test.go index 6e7ec197c7a7..0b4bc133861d 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -24,8 +24,8 @@ import ( "runtime" "testing" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/p2p" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index d62685168910..840bf8d913d0 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,8 +22,8 @@ import ( "path/filepath" "runtime" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/nat" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/nat" ) const ( diff --git a/node/node.go b/node/node.go index e9f5f489a982..be7d644453f7 100644 --- a/node/node.go +++ b/node/node.go @@ -27,13 +27,13 @@ import ( "sync" "github.com/prometheus/prometheus/util/flock" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/internal/debug" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/internal/debug" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/rpc" ) // Node is a container on which services can be registered. diff --git a/node/node_example_test.go b/node/node_example_test.go index 84fa2494a120..d4e6e2b12619 100644 --- a/node/node_example_test.go +++ b/node/node_example_test.go @@ -20,9 +20,9 @@ import ( "fmt" "log" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/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 36c4c85f6a98..3a930d60c519 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/rpc" ) var ( diff --git a/node/service.go b/node/service.go index 60c61583a837..cca1afda0daa 100644 --- a/node/service.go +++ b/node/service.go @@ -19,11 +19,11 @@ package node import ( "reflect" - "github.com/teamnsrg/go-ethereum/accounts" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/accounts" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/rpc" ) // ServiceContext is a collection of service independent options inherited from diff --git a/node/utils_test.go b/node/utils_test.go index e621d34c281d..adcb7368c94d 100644 --- a/node/utils_test.go +++ b/node/utils_test.go @@ -22,8 +22,8 @@ package node import ( "reflect" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/rpc" ) // NoopService is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index 25877ecd8129..e288fed14cdb 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -24,9 +24,9 @@ import ( "net" "time" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/p2p/netutil" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index 4c2c014345f1..48ad3ced20b5 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/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/p2p/netutil" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/netutil" ) func init() { diff --git a/p2p/discover/database.go b/p2p/discover/database.go index 90d3f18568f7..2b190322e32e 100644 --- a/p2p/discover/database.go +++ b/p2p/discover/database.go @@ -33,9 +33,9 @@ import ( "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/storage" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/rlp" ) var ( diff --git a/p2p/discover/node.go b/p2p/discover/node.go index 9ac5b836b977..906976d1c407 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -30,9 +30,9 @@ import ( "strconv" "strings" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/crypto/secp256k1" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/crypto/secp256k1" ) const NodeIDBits = 512 diff --git a/p2p/discover/node_test.go b/p2p/discover/node_test.go index 1c0a8a862c71..9a17ab22c231 100644 --- a/p2p/discover/node_test.go +++ b/p2p/discover/node_test.go @@ -28,8 +28,8 @@ import ( "testing/quick" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" ) func ExampleNewNode() { diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index 1ecaa9f5927a..cc977198d33f 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -25,7 +25,7 @@ import ( "sort" "time" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index 6c2d352ad746..06b55efb87f1 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -32,9 +32,9 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/log" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index b74ba754751a..50051b0ab594 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index 317fa26a33f6..fab4c2111c73 100644 --- a/p2p/discover/udp.go +++ b/p2p/discover/udp.go @@ -25,11 +25,11 @@ import ( "net" "time" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p/nat" - "github.com/teamnsrg/go-ethereum/p2p/netutil" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p/nat" + "github.com/teamnsrg/ethereum-p2p/p2p/netutil" + "github.com/teamnsrg/ethereum-p2p/rlp" ) const Version = 4 diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index 20dc72e26c8a..16bf06feab15 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/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/rlp" ) func init() { diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index 04f2c02c5be8..ca82fb8c2b52 100644 --- a/p2p/discv5/database.go +++ b/p2p/discv5/database.go @@ -34,9 +34,9 @@ import ( "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/storage" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/rlp" ) var ( diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index 3fb64afe8e6b..e0f4051aee18 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -24,14 +24,14 @@ import ( "net" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/mclock" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/crypto/sha3" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p/nat" - "github.com/teamnsrg/go-ethereum/p2p/netutil" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/mclock" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p/nat" + "github.com/teamnsrg/ethereum-p2p/p2p/netutil" + "github.com/teamnsrg/ethereum-p2p/rlp" ) var ( diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go index 86dc962252b4..abacac48b34f 100644 --- a/p2p/discv5/net_test.go +++ b/p2p/discv5/net_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go index aa8700122edb..d825b1149722 100644 --- a/p2p/discv5/node.go +++ b/p2p/discv5/node.go @@ -30,8 +30,8 @@ import ( "strconv" "strings" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" ) // Node represents a host on the network. diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go index 6b2bff86789e..d658215fd581 100644 --- a/p2p/discv5/node_test.go +++ b/p2p/discv5/node_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" ) func ExampleNewNode() { diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index 46ab9cd3fba9..dc1a6d59e25b 100644 --- a/p2p/discv5/ntp.go +++ b/p2p/discv5/ntp.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) const ( diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go index 7dba23e95a0a..bffafd6f8167 100644 --- a/p2p/discv5/sim_test.go +++ b/p2p/discv5/sim_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) // In this test, nodes try to randomly resolve each other. diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go index 23cbdb067968..7a720b8af2b3 100644 --- a/p2p/discv5/table.go +++ b/p2p/discv5/table.go @@ -29,7 +29,7 @@ import ( "net" "sort" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) const ( diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go index 903c5dbfffad..cc55cb5f2850 100644 --- a/p2p/discv5/table_test.go +++ b/p2p/discv5/table_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" ) type nullTransport struct{} diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go index 1c28001e6750..c3e510c01d62 100644 --- a/p2p/discv5/ticket.go +++ b/p2p/discv5/ticket.go @@ -25,9 +25,9 @@ import ( "sort" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/mclock" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/mclock" + "github.com/teamnsrg/ethereum-p2p/crypto" ) const ( diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go index 9f9ce6f8033e..54785f47256f 100644 --- a/p2p/discv5/topic.go +++ b/p2p/discv5/topic.go @@ -23,7 +23,7 @@ import ( "math/rand" "time" - "github.com/teamnsrg/go-ethereum/common/mclock" + "github.com/teamnsrg/ethereum-p2p/common/mclock" ) const ( diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go index c2bb1de1729b..93c7d50714c2 100644 --- a/p2p/discv5/topic_test.go +++ b/p2p/discv5/topic_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/mclock" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/mclock" ) func TestTopicRadius(t *testing.T) { diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index 4e7e853eb591..d9e5c3908be9 100644 --- a/p2p/discv5/udp.go +++ b/p2p/discv5/udp.go @@ -24,12 +24,12 @@ import ( "net" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p/nat" - "github.com/teamnsrg/go-ethereum/p2p/netutil" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p/nat" + "github.com/teamnsrg/ethereum-p2p/p2p/netutil" + "github.com/teamnsrg/ethereum-p2p/rlp" ) const Version = 4 diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go index ba4933db557e..d56e144e10e4 100644 --- a/p2p/discv5/udp_test.go +++ b/p2p/discv5/udp_test.go @@ -27,9 +27,9 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/rlp" ) func init() { diff --git a/p2p/message.go b/p2p/message.go index 2dea3e8f6dda..83583357453f 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -27,9 +27,9 @@ import ( "sync/atomic" "time" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index f1e4677185b5..72974d303c4b 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -21,7 +21,7 @@ package p2p import ( "net" - "github.com/teamnsrg/go-ethereum/metrics" + "github.com/teamnsrg/ethereum-p2p/metrics" ) var ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index 5a035667405d..1a3ae7e30931 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -26,7 +26,7 @@ import ( "time" "github.com/jackpal/go-nat-pmp" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) // An implementation of nat.Interface can map local ports to ports diff --git a/p2p/peer.go b/p2p/peer.go index be49d114c589..329915f71376 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -24,11 +24,11 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common/mclock" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common/mclock" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/rlp" ) const ( diff --git a/p2p/protocol.go b/p2p/protocol.go index a75a059aa3bd..06cc16ee0972 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -19,7 +19,7 @@ package p2p import ( "fmt" - "github.com/teamnsrg/go-ethereum/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 8c7dd94dac24..fa27b5eb2d82 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -36,12 +36,12 @@ import ( "time" "github.com/golang/snappy" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/crypto/ecies" - "github.com/teamnsrg/go-ethereum/crypto/secp256k1" - "github.com/teamnsrg/go-ethereum/crypto/sha3" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/crypto/ecies" + "github.com/teamnsrg/ethereum-p2p/crypto/secp256k1" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/rlp" ) const ( diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index 096c7e3ea162..4f94da1d6070 100644 --- a/p2p/rlpx_test.go +++ b/p2p/rlpx_test.go @@ -31,11 +31,11 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/crypto/ecies" - "github.com/teamnsrg/go-ethereum/crypto/sha3" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/crypto/ecies" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/rlp" ) func TestSharedSecret(t *testing.T) { diff --git a/p2p/server.go b/p2p/server.go index c9b0471ba302..023a74ecf352 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/mclock" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/p2p/discv5" - "github.com/teamnsrg/go-ethereum/p2p/nat" - "github.com/teamnsrg/go-ethereum/p2p/netutil" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/mclock" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/discv5" + "github.com/teamnsrg/ethereum-p2p/p2p/nat" + "github.com/teamnsrg/ethereum-p2p/p2p/netutil" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index 0fb2594b2186..0d02b3843afc 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/crypto/sha3" - "github.com/teamnsrg/go-ethereum/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" ) func init() { diff --git a/p2p/simulations/adapters/docker.go b/p2p/simulations/adapters/docker.go index 9cad70ba18cd..37291f9aed17 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/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" ) // DockerAdapter is a NodeAdapter which runs simulation nodes inside Docker diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index fdbc481ff399..44edf6adb4a4 100644 --- a/p2p/simulations/adapters/exec.go +++ b/p2p/simulations/adapters/exec.go @@ -36,11 +36,11 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index a008a16ee8c0..aa2e2dd08b69 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -23,11 +23,11 @@ import ( "net" "sync" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/rpc" ) // SimAdapter is a NodeAdapter which creates in-memory simulation nodes and diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index 10e63613141e..182cd114eae0 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -25,11 +25,11 @@ import ( "os" "github.com/docker/docker/pkg/reexec" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/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 bc7cc8855ffd..e145e5c00d15 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/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/p2p/simulations" - "github.com/teamnsrg/go-ethereum/p2p/simulations/adapters" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/simulations" + "github.com/teamnsrg/ethereum-p2p/p2p/simulations/adapters" + "github.com/teamnsrg/ethereum-p2p/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 d08c4487f23d..ad247d230557 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -29,11 +29,11 @@ import ( "strings" "github.com/julienschmidt/httprouter" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/p2p/simulations/adapters" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/simulations/adapters" + "github.com/teamnsrg/ethereum-p2p/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/http_test.go b/p2p/simulations/http_test.go index e74985d2930b..7b188d0408a7 100644 --- a/p2p/simulations/http_test.go +++ b/p2p/simulations/http_test.go @@ -27,12 +27,12 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/p2p/simulations/adapters" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/simulations/adapters" + "github.com/teamnsrg/ethereum-p2p/rpc" ) // testService implements the node.Service interface and provides protocols diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index 7f8363a830b8..1b7476eebe22 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -23,11 +23,11 @@ import ( "fmt" "sync" - "github.com/teamnsrg/go-ethereum/event" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/p2p/simulations/adapters" + "github.com/teamnsrg/ethereum-p2p/event" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/simulations/adapters" ) // NetworkConfig defines configuration options for starting a Network diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index 903f46fdf356..f3e5b00af676 100644 --- a/p2p/simulations/network_test.go +++ b/p2p/simulations/network_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/p2p/simulations/adapters" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/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 72b8e8049786..7f3ed0b3d920 100644 --- a/p2p/simulations/simulation.go +++ b/p2p/simulations/simulation.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/teamnsrg/go-ethereum/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" ) // Simulation provides a framework for running actions in a simulated network diff --git a/params/config.go b/params/config.go index 7c352427b353..dcfe25f8afa4 100644 --- a/params/config.go +++ b/params/config.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) var ( diff --git a/params/dao.go b/params/dao.go index 64f225afb9a2..ad148686cea6 100644 --- a/params/dao.go +++ b/params/dao.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/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 d5e52d3a4152..7d7f5e2d4fb7 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -32,7 +32,7 @@ import ( "sync/atomic" "time" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 574da92c0b80..b53d9eb2cac6 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -22,7 +22,7 @@ import ( "math/big" "time" - "github.com/teamnsrg/go-ethereum/rpc" + "github.com/teamnsrg/ethereum-p2p/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 5bfa3f45f778..26d2cefd687d 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/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) func TestClientRequest(t *testing.T) { diff --git a/rpc/ipc.go b/rpc/ipc.go index 277a93bbfe11..b29429392282 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -21,7 +21,7 @@ import ( "fmt" "net" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) // CreateIPCListener creates an listener, on Unix platforms this is a unix socket, on diff --git a/rpc/json.go b/rpc/json.go index 6057644a6ae6..ec53525c9a71 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) const ( diff --git a/rpc/server.go b/rpc/server.go index 8bfeb0dc0246..4f026ed11a96 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -25,7 +25,7 @@ import ( "sync" "sync/atomic" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types.go b/rpc/types.go index fea5fe9d1cf8..e91dbb5ea346 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/teamnsrg/go-ethereum/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types_test.go b/rpc/types_test.go index 73a0b50d4fb4..a438580e4a89 100644 --- a/rpc/types_test.go +++ b/rpc/types_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - "github.com/teamnsrg/go-ethereum/common/math" + "github.com/teamnsrg/ethereum-p2p/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index c6d6d3e9e595..deff1439ec92 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -27,7 +27,7 @@ import ( "strings" "time" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" "golang.org/x/net/websocket" "gopkg.in/fatih/set.v0" ) diff --git a/swarm/api/api.go b/swarm/api/api.go index 4f55d48fc1ea..c19fbeb0bdce 100644 --- a/swarm/api/api.go +++ b/swarm/api/api.go @@ -29,9 +29,9 @@ import ( "path/filepath" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) var hashMatcher = regexp.MustCompile("^[0-9A-Fa-f]{64}") diff --git a/swarm/api/api_test.go b/swarm/api/api_test.go index 7b36563db206..65cbc3a2159d 100644 --- a/swarm/api/api_test.go +++ b/swarm/api/api_test.go @@ -24,9 +24,9 @@ import ( "os" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) func testApi(t *testing.T, f func(*Api)) { diff --git a/swarm/api/client/client.go b/swarm/api/client/client.go index 9490c13dc27c..a3b1d4eec669 100644 --- a/swarm/api/client/client.go +++ b/swarm/api/client/client.go @@ -33,7 +33,7 @@ import ( "strconv" "strings" - "github.com/teamnsrg/go-ethereum/swarm/api" + "github.com/teamnsrg/ethereum-p2p/swarm/api" ) var ( diff --git a/swarm/api/client/client_test.go b/swarm/api/client/client_test.go index b8b5981a1cf4..f4b3397c3023 100644 --- a/swarm/api/client/client_test.go +++ b/swarm/api/client/client_test.go @@ -25,8 +25,8 @@ import ( "sort" "testing" - "github.com/teamnsrg/go-ethereum/swarm/api" - "github.com/teamnsrg/go-ethereum/swarm/testutil" + "github.com/teamnsrg/ethereum-p2p/swarm/api" + "github.com/teamnsrg/ethereum-p2p/swarm/testutil" ) // TestClientUploadDownloadRaw test uploading and downloading raw data to swarm diff --git a/swarm/api/config.go b/swarm/api/config.go index 2d0688cfa7c7..50d107b0cb28 100644 --- a/swarm/api/config.go +++ b/swarm/api/config.go @@ -24,12 +24,12 @@ import ( "os" "path/filepath" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/contracts/ens" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/swarm/network" - "github.com/teamnsrg/go-ethereum/swarm/services/swap" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/contracts/ens" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/swarm/network" + "github.com/teamnsrg/ethereum-p2p/swarm/services/swap" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) const ( diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go index e7989719adb3..4250d4799ef7 100644 --- a/swarm/api/config_test.go +++ b/swarm/api/config_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" ) var ( diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go index 57738d018879..c4f68753861f 100644 --- a/swarm/api/filesystem.go +++ b/swarm/api/filesystem.go @@ -26,9 +26,9 @@ import ( "path/filepath" "sync" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) const maxParallelFiles = 5 diff --git a/swarm/api/filesystem_test.go b/swarm/api/filesystem_test.go index 65f8118bce48..c04afe60fe2c 100644 --- a/swarm/api/filesystem_test.go +++ b/swarm/api/filesystem_test.go @@ -24,8 +24,8 @@ import ( "sync" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/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 2323a2fe428d..3fc2e694e650 100644 --- a/swarm/api/http/error.go +++ b/swarm/api/http/error.go @@ -28,8 +28,8 @@ import ( "strings" "time" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/api" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/swarm/api" ) //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 401a0bc03f86..a460235ca565 100644 --- a/swarm/api/http/error_test.go +++ b/swarm/api/http/error_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/teamnsrg/go-ethereum/swarm/testutil" + "github.com/teamnsrg/ethereum-p2p/swarm/testutil" ) func TestError(t *testing.T) { diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go index dc20f98cfd3d..acdc32805af7 100644 --- a/swarm/api/http/roundtripper.go +++ b/swarm/api/http/roundtripper.go @@ -20,17 +20,17 @@ import ( "fmt" "net/http" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) /* http roundtripper to register for bzz url scheme -see https://github.com/teamnsrg/go-ethereum/issues/2040 +see https://github.com/teamnsrg/ethereum-p2p/issues/2040 Usage: import ( - "github.com/teamnsrg/go-ethereum/common/httpclient" - "github.com/teamnsrg/go-ethereum/swarm/api/http" + "github.com/teamnsrg/ethereum-p2p/common/httpclient" + "github.com/teamnsrg/ethereum-p2p/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 a20d44662dbe..1eb49a3a35eb 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -36,10 +36,10 @@ import ( "time" "github.com/rs/cors" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/api" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/swarm/api" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) // ServerConfig is the basic configuration needed for the HTTP server and also diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go index 3f443d0b796c..4253de489f1c 100644 --- a/swarm/api/http/server_test.go +++ b/swarm/api/http/server_test.go @@ -26,11 +26,11 @@ import ( "sync" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/swarm/api" - swarm "github.com/teamnsrg/go-ethereum/swarm/api/client" - "github.com/teamnsrg/go-ethereum/swarm/storage" - "github.com/teamnsrg/go-ethereum/swarm/testutil" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/swarm/api" + swarm "github.com/teamnsrg/ethereum-p2p/swarm/api/client" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/swarm/testutil" ) func TestBzzrGetPath(t *testing.T) { diff --git a/swarm/api/http/templates.go b/swarm/api/http/templates.go index f142cc94c771..d6902882030a 100644 --- a/swarm/api/http/templates.go +++ b/swarm/api/http/templates.go @@ -20,7 +20,7 @@ import ( "html/template" "path" - "github.com/teamnsrg/go-ethereum/swarm/api" + "github.com/teamnsrg/ethereum-p2p/swarm/api" ) type htmlListData struct { diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index d5b3c712ff2d..0c5594e76a31 100644 --- a/swarm/api/manifest.go +++ b/swarm/api/manifest.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) const ( diff --git a/swarm/api/manifest_test.go b/swarm/api/manifest_test.go index 6cccaf4479d5..0bd0edcb71d2 100644 --- a/swarm/api/manifest_test.go +++ b/swarm/api/manifest_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) func manifest(paths ...string) (manifestReader storage.LazySectionReader) { diff --git a/swarm/api/testapi.go b/swarm/api/testapi.go index 18595f86b701..4a49a5aed1e2 100644 --- a/swarm/api/testapi.go +++ b/swarm/api/testapi.go @@ -17,7 +17,7 @@ package api import ( - "github.com/teamnsrg/go-ethereum/swarm/network" + "github.com/teamnsrg/ethereum-p2p/swarm/network" ) type Control struct { diff --git a/swarm/dev/Makefile b/swarm/dev/Makefile index 9fffecf1c060..684fb05c4ca9 100644 --- a/swarm/dev/Makefile +++ b/swarm/dev/Makefile @@ -3,12 +3,12 @@ default: build build: - go build -o bin/swarm github.com/teamnsrg/go-ethereum/cmd/swarm - go build -o bin/geth github.com/teamnsrg/go-ethereum/cmd/geth - go build -o bin/bootnode github.com/teamnsrg/go-ethereum/cmd/bootnode + go build -o bin/swarm github.com/teamnsrg/ethereum-p2p/cmd/swarm + go build -o bin/geth github.com/teamnsrg/ethereum-p2p/cmd/geth + go build -o bin/bootnode github.com/teamnsrg/ethereum-p2p/cmd/bootnode cluster: build scripts/boot-cluster.sh test: - go test -v github.com/teamnsrg/go-ethereum/swarm/... + go test -v github.com/teamnsrg/ethereum-p2p/swarm/... diff --git a/swarm/dev/bashrc b/swarm/dev/bashrc index bd98ae9afb37..c1667bd008b8 100644 --- a/swarm/dev/bashrc +++ b/swarm/dev/bashrc @@ -1,4 +1,4 @@ -export ROOT="${GOPATH}/src/github.com/teamnsrg/go-ethereum" +export ROOT="${GOPATH}/src/github.com/teamnsrg/ethereum-p2p" export PATH="${ROOT}/swarm/dev/bin:${PATH}" cd "${ROOT}/swarm/dev" diff --git a/swarm/dev/run.sh b/swarm/dev/run.sh index 86920331ab2f..c316fbd4bb4b 100755 --- a/swarm/dev/run.sh +++ b/swarm/dev/run.sh @@ -80,7 +80,7 @@ run_image() { --rm \ --hostname "${name}" \ --name "${name}" \ - --volume "${ROOT}:/go/src/github.com/teamnsrg/go-ethereum" \ + --volume "${ROOT}:/go/src/github.com/teamnsrg/ethereum-p2p" \ --volume "/var/run/docker.sock:/var/run/docker.sock" \ ${docker_args} \ "${name}" \ diff --git a/swarm/fuse/fuse_file.go b/swarm/fuse/fuse_file.go index ac49904a2e74..fa9f9336bfa4 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/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" "golang.org/x/net/context" ) diff --git a/swarm/fuse/swarmfs.go b/swarm/fuse/swarmfs.go index 5d3d111bbede..585ca5c237f1 100644 --- a/swarm/fuse/swarmfs.go +++ b/swarm/fuse/swarmfs.go @@ -17,7 +17,7 @@ package fuse import ( - "github.com/teamnsrg/go-ethereum/swarm/api" + "github.com/teamnsrg/ethereum-p2p/swarm/api" "sync" "time" ) diff --git a/swarm/fuse/swarmfs_test.go b/swarm/fuse/swarmfs_test.go index b5be0b40af88..fdfd2ef7ee01 100644 --- a/swarm/fuse/swarmfs_test.go +++ b/swarm/fuse/swarmfs_test.go @@ -27,8 +27,8 @@ import ( "path/filepath" "testing" - "github.com/teamnsrg/go-ethereum/swarm/api" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/swarm/api" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) type fileInfo struct { diff --git a/swarm/fuse/swarmfs_unix.go b/swarm/fuse/swarmfs_unix.go index 97ce1c46e156..e367ba62679d 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/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/api" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/swarm/api" ) var ( diff --git a/swarm/fuse/swarmfs_util.go b/swarm/fuse/swarmfs_util.go index aa00b77736bd..04468294b012 100644 --- a/swarm/fuse/swarmfs_util.go +++ b/swarm/fuse/swarmfs_util.go @@ -24,7 +24,7 @@ import ( "os/exec" "runtime" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) func externalUnmount(mountPoint string) error { diff --git a/swarm/network/depo.go b/swarm/network/depo.go index c419dcbba1f0..8ad07306ab15 100644 --- a/swarm/network/depo.go +++ b/swarm/network/depo.go @@ -22,8 +22,8 @@ import ( "fmt" "time" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) // Handler for storage/retrieval related protocol requests diff --git a/swarm/network/forwarding.go b/swarm/network/forwarding.go index e762b82f3eda..5593bc297081 100644 --- a/swarm/network/forwarding.go +++ b/swarm/network/forwarding.go @@ -21,8 +21,8 @@ import ( "math/rand" "time" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) const requesterCount = 3 diff --git a/swarm/network/hive.go b/swarm/network/hive.go index 421a4319c19e..11170c5c1c09 100644 --- a/swarm/network/hive.go +++ b/swarm/network/hive.go @@ -22,12 +22,12 @@ import ( "path/filepath" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/p2p/netutil" - "github.com/teamnsrg/go-ethereum/swarm/network/kademlia" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/p2p/netutil" + "github.com/teamnsrg/ethereum-p2p/swarm/network/kademlia" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) // Hive is the logistic manager of the swarm diff --git a/swarm/network/kademlia/address.go b/swarm/network/kademlia/address.go index af439181259d..6cb1a55235ea 100644 --- a/swarm/network/kademlia/address.go +++ b/swarm/network/kademlia/address.go @@ -21,7 +21,7 @@ import ( "math/rand" "strings" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) type Address common.Hash diff --git a/swarm/network/kademlia/address_test.go b/swarm/network/kademlia/address_test.go index 4f8af3cad531..e1126e2fa1cf 100644 --- a/swarm/network/kademlia/address_test.go +++ b/swarm/network/kademlia/address_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) func (Address) Generate(rand *rand.Rand, size int) reflect.Value { diff --git a/swarm/network/kademlia/kaddb.go b/swarm/network/kademlia/kaddb.go index a81a18182b5b..1ff91bf77bbf 100644 --- a/swarm/network/kademlia/kaddb.go +++ b/swarm/network/kademlia/kaddb.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) type NodeData interface { diff --git a/swarm/network/kademlia/kademlia.go b/swarm/network/kademlia/kademlia.go index e8116dabf75c..24bd70292209 100644 --- a/swarm/network/kademlia/kademlia.go +++ b/swarm/network/kademlia/kademlia.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) const ( diff --git a/swarm/network/messages.go b/swarm/network/messages.go index e91a463ebad0..51f1e7eeb458 100644 --- a/swarm/network/messages.go +++ b/swarm/network/messages.go @@ -21,11 +21,11 @@ import ( "net" "time" - "github.com/teamnsrg/go-ethereum/contracts/chequebook" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/swarm/network/kademlia" - "github.com/teamnsrg/go-ethereum/swarm/services/swap" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/contracts/chequebook" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/swarm/network/kademlia" + "github.com/teamnsrg/ethereum-p2p/swarm/services/swap" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) /* diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go index 4aeccd35e1b2..fd74265757e2 100644 --- a/swarm/network/protocol.go +++ b/swarm/network/protocol.go @@ -37,12 +37,12 @@ import ( "strconv" "time" - "github.com/teamnsrg/go-ethereum/contracts/chequebook" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/p2p" - bzzswap "github.com/teamnsrg/go-ethereum/swarm/services/swap" - "github.com/teamnsrg/go-ethereum/swarm/services/swap/swap" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/contracts/chequebook" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/p2p" + bzzswap "github.com/teamnsrg/ethereum-p2p/swarm/services/swap" + "github.com/teamnsrg/ethereum-p2p/swarm/services/swap/swap" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) const ( diff --git a/swarm/network/syncdb.go b/swarm/network/syncdb.go index 04f91677a679..f850a8430fc8 100644 --- a/swarm/network/syncdb.go +++ b/swarm/network/syncdb.go @@ -22,8 +22,8 @@ import ( "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) const counterKeyPrefix = 0x01 diff --git a/swarm/network/syncdb_test.go b/swarm/network/syncdb_test.go index 0a0bbb1cdd1e..7cb30490b5c8 100644 --- a/swarm/network/syncdb_test.go +++ b/swarm/network/syncdb_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) func init() { diff --git a/swarm/network/syncer.go b/swarm/network/syncer.go index 467bd98f28d5..3d9bcda8fb2f 100644 --- a/swarm/network/syncer.go +++ b/swarm/network/syncer.go @@ -22,8 +22,8 @@ import ( "fmt" "path/filepath" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) // syncer parameters (global, not peer specific) default values diff --git a/swarm/services/swap/swap.go b/swarm/services/swap/swap.go index 92d7d74d3a77..e3c9f1f0e944 100644 --- a/swarm/services/swap/swap.go +++ b/swarm/services/swap/swap.go @@ -26,14 +26,14 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/contracts/chequebook" - "github.com/teamnsrg/go-ethereum/contracts/chequebook/contract" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/swarm/services/swap/swap" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/contracts/chequebook" + "github.com/teamnsrg/ethereum-p2p/contracts/chequebook/contract" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/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 a5d236ab43bd..f8ad3da08b8d 100644 --- a/swarm/services/swap/swap/swap.go +++ b/swarm/services/swap/swap/swap.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/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 18cd534ec493..b2e089b5418b 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/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) type testInPayment struct { diff --git a/swarm/storage/chunker_test.go b/swarm/storage/chunker_test.go index 65c8eb6a2e2b..ee3174fac0cf 100644 --- a/swarm/storage/chunker_test.go +++ b/swarm/storage/chunker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" ) /* diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go index 6f3cc00fabce..3180c0a95dc7 100644 --- a/swarm/storage/common_test.go +++ b/swarm/storage/common_test.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) type brokenLimitedReader struct { diff --git a/swarm/storage/database.go b/swarm/storage/database.go index 16d583cbe2f5..1b8c347dbee2 100644 --- a/swarm/storage/database.go +++ b/swarm/storage/database.go @@ -25,7 +25,7 @@ import ( "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" - "github.com/teamnsrg/go-ethereum/compression/rle" + "github.com/teamnsrg/ethereum-p2p/compression/rle" ) const openFileLimit = 128 diff --git a/swarm/storage/dbstore.go b/swarm/storage/dbstore.go index 07a28976a264..77b04d7e106c 100644 --- a/swarm/storage/dbstore.go +++ b/swarm/storage/dbstore.go @@ -34,8 +34,8 @@ import ( "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/rlp" ) const ( diff --git a/swarm/storage/dbstore_test.go b/swarm/storage/dbstore_test.go index c1a05beb201f..6e9d44e84d97 100644 --- a/swarm/storage/dbstore_test.go +++ b/swarm/storage/dbstore_test.go @@ -21,7 +21,7 @@ import ( "io/ioutil" "testing" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) func initDbStore(t *testing.T) *DbStore { diff --git a/swarm/storage/dpa.go b/swarm/storage/dpa.go index 196c2b8a7ce4..ae0ae12965ab 100644 --- a/swarm/storage/dpa.go +++ b/swarm/storage/dpa.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) /* diff --git a/swarm/storage/memstore.go b/swarm/storage/memstore.go index a26c4bba5e2d..51b98ebd74c7 100644 --- a/swarm/storage/memstore.go +++ b/swarm/storage/memstore.go @@ -22,7 +22,7 @@ import ( "fmt" "sync" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) const ( diff --git a/swarm/storage/netstore.go b/swarm/storage/netstore.go index a0da059b9240..1c60413e7fd3 100644 --- a/swarm/storage/netstore.go +++ b/swarm/storage/netstore.go @@ -21,7 +21,7 @@ import ( "path/filepath" "time" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/log" ) /* diff --git a/swarm/storage/types.go b/swarm/storage/types.go index da29e56e5354..d1cadf91bde7 100644 --- a/swarm/storage/types.go +++ b/swarm/storage/types.go @@ -24,9 +24,9 @@ import ( "io" "sync" - "github.com/teamnsrg/go-ethereum/bmt" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/bmt" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" ) type Hasher func() hash.Hash diff --git a/swarm/swarm.go b/swarm/swarm.go index 14c37d64cb72..25f1ede13312 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -23,22 +23,22 @@ import ( "fmt" "net" - "github.com/teamnsrg/go-ethereum/accounts/abi/bind" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/contracts/chequebook" - "github.com/teamnsrg/go-ethereum/contracts/ens" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethclient" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/node" - "github.com/teamnsrg/go-ethereum/p2p" - "github.com/teamnsrg/go-ethereum/p2p/discover" - "github.com/teamnsrg/go-ethereum/rpc" - "github.com/teamnsrg/go-ethereum/swarm/api" - httpapi "github.com/teamnsrg/go-ethereum/swarm/api/http" - "github.com/teamnsrg/go-ethereum/swarm/fuse" - "github.com/teamnsrg/go-ethereum/swarm/network" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/accounts/abi/bind" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/contracts/chequebook" + "github.com/teamnsrg/ethereum-p2p/contracts/ens" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethclient" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/node" + "github.com/teamnsrg/ethereum-p2p/p2p" + "github.com/teamnsrg/ethereum-p2p/p2p/discover" + "github.com/teamnsrg/ethereum-p2p/rpc" + "github.com/teamnsrg/ethereum-p2p/swarm/api" + httpapi "github.com/teamnsrg/ethereum-p2p/swarm/api/http" + "github.com/teamnsrg/ethereum-p2p/swarm/fuse" + "github.com/teamnsrg/ethereum-p2p/swarm/network" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) // the swarm stack diff --git a/swarm/testutil/http.go b/swarm/testutil/http.go index 09329a7cc729..868733476e56 100644 --- a/swarm/testutil/http.go +++ b/swarm/testutil/http.go @@ -22,9 +22,9 @@ import ( "os" "testing" - "github.com/teamnsrg/go-ethereum/swarm/api" - httpapi "github.com/teamnsrg/go-ethereum/swarm/api/http" - "github.com/teamnsrg/go-ethereum/swarm/storage" + "github.com/teamnsrg/ethereum-p2p/swarm/api" + httpapi "github.com/teamnsrg/ethereum-p2p/swarm/api/http" + "github.com/teamnsrg/ethereum-p2p/swarm/storage" ) func NewTestSwarmServer(t *testing.T) *TestSwarmServer { diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 4cd5f9166328..0652898f758d 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -24,17 +24,17 @@ import ( "fmt" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index 5b8ca848aa99..82563446eea2 100644 --- a/tests/difficulty_test.go +++ b/tests/difficulty_test.go @@ -22,8 +22,8 @@ import ( "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/params" ) var ( diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 7e71bbb9c6f1..c8eaf9b66912 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -21,11 +21,11 @@ import ( "fmt" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/consensus/ethash" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/consensus/ethash" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/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 1a9fe246c5f9..4dbc6bde4aaa 100644 --- a/tests/gen_btheader.go +++ b/tests/gen_btheader.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/core/types" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index ae5d078f1216..698d11653d13 100644 --- a/tests/gen_difficultytest.go +++ b/tests/gen_difficultytest.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index 90e6a88889d7..0e8f361deafd 100644 --- a/tests/gen_stenv.go +++ b/tests/gen_stenv.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/math" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 5b4e70b8af13..ac0af984aacb 100644 --- a/tests/gen_sttransaction.go +++ b/tests/gen_sttransaction.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/common/math" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/math" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/gen_tttransaction.go b/tests/gen_tttransaction.go index 6f020ac08c85..5418e62f1b70 100644 --- a/tests/gen_tttransaction.go +++ b/tests/gen_tttransaction.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/common/math" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/math" ) var _ = (*ttTransactionMarshaling)(nil) diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go index 4864872eaa75..2bd3f56d3ef0 100644 --- a/tests/gen_vmexec.go +++ b/tests/gen_vmexec.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/common/math" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/math" ) var _ = (*vmExecMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index b6f3def35879..766613547cf0 100644 --- a/tests/init.go +++ b/tests/init.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/params" ) // This table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index a5fcdb4e1a1f..e193e601d004 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -29,7 +29,7 @@ import ( "strings" "testing" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index c661ccc7f71b..61a79f8f048d 100644 --- a/tests/rlp_test_util.go +++ b/tests/rlp_test_util.go @@ -24,7 +24,7 @@ import ( "math/big" "strings" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index dcb3b64ace47..0dbcacb808d9 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "github.com/teamnsrg/go-ethereum/core/vm" + "github.com/teamnsrg/ethereum-p2p/core/vm" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index e42e256d48d1..a162cd062e19 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -23,18 +23,18 @@ import ( "math/big" "strings" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/crypto/sha3" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" ) // StateTest checks transaction processing without block context. diff --git a/tests/transaction_test.go b/tests/transaction_test.go index 09af877ef458..3be752e03490 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index e21484227b68..4b9fd9c1d714 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/core/types" - "github.com/teamnsrg/go-ethereum/params" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/core/types" + "github.com/teamnsrg/ethereum-p2p/params" + "github.com/teamnsrg/ethereum-p2p/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/tests/vm_test.go b/tests/vm_test.go index 2c0e68aed28f..4ed4ec495d89 100644 --- a/tests/vm_test.go +++ b/tests/vm_test.go @@ -19,7 +19,7 @@ package tests import ( "testing" - "github.com/teamnsrg/go-ethereum/core/vm" + "github.com/teamnsrg/ethereum-p2p/core/vm" ) func TestVM(t *testing.T) { diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index d31228bb4777..e3831189df2e 100644 --- a/tests/vm_test_util.go +++ b/tests/vm_test_util.go @@ -22,15 +22,15 @@ import ( "fmt" "math/big" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/common/hexutil" - "github.com/teamnsrg/go-ethereum/common/math" - "github.com/teamnsrg/go-ethereum/core" - "github.com/teamnsrg/go-ethereum/core/state" - "github.com/teamnsrg/go-ethereum/core/vm" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/params" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/common/hexutil" + "github.com/teamnsrg/ethereum-p2p/common/math" + "github.com/teamnsrg/ethereum-p2p/core" + "github.com/teamnsrg/ethereum-p2p/core/state" + "github.com/teamnsrg/ethereum-p2p/core/vm" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/params" ) // VMTest checks EVM execution without block or transaction context. diff --git a/trie/errors.go b/trie/errors.go index 95d2a78725fa..dfd0d8fb94c5 100644 --- a/trie/errors.go +++ b/trie/errors.go @@ -19,7 +19,7 @@ package trie import ( "fmt" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index bac9a2ebed8b..7437aa78ecec 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -21,9 +21,9 @@ import ( "hash" "sync" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto/sha3" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/rlp" ) type hasher struct { diff --git a/trie/iterator.go b/trie/iterator.go index 658df8a1a824..743e2ef56ee8 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,7 +21,7 @@ import ( "container/heap" "errors" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" ) // Iterator is a key-value trie iterator that traverses a Trie. diff --git a/trie/iterator_test.go b/trie/iterator_test.go index 50b91b99f185..2e31d7010408 100644 --- a/trie/iterator_test.go +++ b/trie/iterator_test.go @@ -22,8 +22,8 @@ import ( "math/rand" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/ethdb" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/ethdb" ) func TestIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index 6e5edb1b1086..7615b1a3a186 100644 --- a/trie/node.go +++ b/trie/node.go @@ -21,8 +21,8 @@ import ( "io" "strings" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/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 87c3c59533de..4e62678d856d 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -20,10 +20,10 @@ import ( "bytes" "fmt" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/log" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/log" + "github.com/teamnsrg/ethereum-p2p/rlp" ) // Prove constructs a merkle proof for key. The result contains all diff --git a/trie/proof_test.go b/trie/proof_test.go index a6567706c67d..eb0b8f6940b9 100644 --- a/trie/proof_test.go +++ b/trie/proof_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" ) func init() { diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 5add079bb101..4b9cf01119e0 100644 --- a/trie/secure_trie.go +++ b/trie/secure_trie.go @@ -19,8 +19,8 @@ package trie import ( "fmt" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/log" ) var secureKeyPrefix = []byte("secure-key-") diff --git a/trie/secure_trie_test.go b/trie/secure_trie_test.go index 2cee85653838..ce89c203fe10 100644 --- a/trie/secure_trie_test.go +++ b/trie/secure_trie_test.go @@ -22,9 +22,9 @@ import ( "sync" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" ) func newEmptySecure() *SecureTrie { diff --git a/trie/sync.go b/trie/sync.go index 841b0d112c38..7d30da264739 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/teamnsrg/go-ethereum/common" + "github.com/teamnsrg/ethereum-p2p/common" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/trie/sync_test.go b/trie/sync_test.go index 69b5a84aa6fa..c231796d0cd0 100644 --- a/trie/sync_test.go +++ b/trie/sync_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/ethdb" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/ethdb" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/trie.go b/trie/trie.go index 0051639a0ec0..80993c3e11e1 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -22,9 +22,9 @@ import ( "fmt" "github.com/rcrowley/go-metrics" - "github.com/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto/sha3" - "github.com/teamnsrg/go-ethereum/log" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto/sha3" + "github.com/teamnsrg/ethereum-p2p/log" ) var ( diff --git a/trie/trie_test.go b/trie/trie_test.go index 39981e96e921..ca5603d4750c 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/teamnsrg/go-ethereum/common" - "github.com/teamnsrg/go-ethereum/crypto" - "github.com/teamnsrg/go-ethereum/ethdb" - "github.com/teamnsrg/go-ethereum/rlp" + "github.com/teamnsrg/ethereum-p2p/common" + "github.com/teamnsrg/ethereum-p2p/crypto" + "github.com/teamnsrg/ethereum-p2p/ethdb" + "github.com/teamnsrg/ethereum-p2p/rlp" ) func init() {