diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index c03fa06c72..0000000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1,13 +0,0 @@ -# Lines starting with '#' are comments. -# Each line is a file pattern followed by one or more owners. - -accounts/usbwallet @karalabe -accounts/abi @gballet -consensus @karalabe -core/ @karalabe @holiman -eth/ @karalabe -les/ @zsfelfoldi -light/ @zsfelfoldi -mobile/ @karalabe -p2p/ @fjl @zsfelfoldi -whisper/ @gballet @gluk256 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md deleted file mode 100644 index f87996cdcb..0000000000 --- a/.github/CONTRIBUTING.md +++ /dev/null @@ -1,40 +0,0 @@ -# Contributing - -Thank you for considering to help out with the source code! We welcome -contributions from anyone on the internet, and are grateful for even the -smallest of fixes! - -If you'd like to contribute to go-ethereum, please fork, fix, commit and send a -pull request for the maintainers to review and merge into the main code base. If -you wish to submit more complex changes though, please check up with the core -devs first on [our gitter channel](https://gitter.im/ethereum/go-ethereum) to -ensure those changes are in line with the general philosophy of the project -and/or get some early feedback which can make both your efforts much lighter as -well as our review and merge procedures quick and simple. - -## Coding guidelines - -Please make sure your contributions adhere to our coding guidelines: - - * Code must adhere to the official Go -[formatting](https://golang.org/doc/effective_go.html#formatting) guidelines -(i.e. uses [gofmt](https://golang.org/cmd/gofmt/)). - * Code must be documented adhering to the official Go -[commentary](https://golang.org/doc/effective_go.html#commentary) guidelines. - * Pull requests need to be based on and opened against the `master` branch. - * Commit messages should be prefixed with the package(s) they modify. - * E.g. "eth, rpc: make trace configs optional" - -## Can I have feature X - -Before you submit 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 -[Wiki page](https://github.com/ethereum/go-ethereum/wiki) for more info -and help. - -## Configuration, dependencies, and tests - -Please see the [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide) -for more details on configuring your environment, managing project dependencies -and testing procedures. diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 7d80659b0d..0000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,26 +0,0 @@ -Hi there, - -please note that this is an issue tracker reserved for bug reports and feature requests. - -For general questions please use the gitter channel or the Ethereum stack exchange at https://ethereum.stackexchange.com. - -#### System information - -Geth version: `geth version` -OS & Version: Windows/Linux/OSX -Commit hash : (if `develop`) - -#### Expected behaviour - - -#### Actual behaviour - - -#### Steps to reproduce the behaviour - - -#### Backtrace - -```` -[backtrace] -```` diff --git a/.github/no-response.yml b/.github/no-response.yml deleted file mode 100644 index 903d4ce85f..0000000000 --- a/.github/no-response.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Number of days of inactivity before an Issue is closed for lack of response -daysUntilClose: 30 -# Label requiring a response -responseRequiredLabel: "need:more-information" -# Comment to post when closing an Issue for lack of response. Set to `false` to disable -closeComment: > - This issue has been automatically closed because there has been no response - to our request for more information from the original author. With only the - information that is currently in the issue, we don't have enough information - to take action. Please reach out if you have more relevant information or - answers to our questions so that we can investigate further. diff --git a/.github/stale.yml b/.github/stale.yml deleted file mode 100644 index 6d921cc795..0000000000 --- a/.github/stale.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Number of days of inactivity before an issue becomes stale -daysUntilStale: 366 -# Number of days of inactivity before a stale issue is closed -daysUntilClose: 42 -# Issues with these labels will never be considered stale -exemptLabels: - - pinned - - security -# Label to use when marking an issue as stale -staleLabel: "status:inactive" -# Comment to post when marking an issue as stale. Set to `false` to disable -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -# Comment to post when closing a stale issue. Set to `false` to disable -closeComment: false diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a079d9eb8f..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,216 +0,0 @@ -language: go -go_import_path: github.com/ethereum/go-ethereum -sudo: false -matrix: - include: - - os: linux - dist: trusty - sudo: required - go: 1.10.x - script: - - sudo modprobe fuse - - sudo chmod 666 /dev/fuse - - sudo chown root:$USER /etc/fuse.conf - - go run build/ci.go install - - go run build/ci.go test -coverage $TEST_PACKAGES - - # These are the latest Go versions. - - os: linux - dist: trusty - sudo: required - go: 1.11.x - script: - - sudo modprobe fuse - - sudo chmod 666 /dev/fuse - - sudo chown root:$USER /etc/fuse.conf - - go run build/ci.go install - - go run build/ci.go test -coverage $TEST_PACKAGES - - - os: osx - go: 1.11.x - script: - - echo "Increase the maximum number of open file descriptors on macOS" - - NOFILE=20480 - - sudo sysctl -w kern.maxfiles=$NOFILE - - sudo sysctl -w kern.maxfilesperproc=$NOFILE - - sudo launchctl limit maxfiles $NOFILE $NOFILE - - sudo launchctl limit maxfiles - - ulimit -S -n $NOFILE - - ulimit -n - - unset -f cd # workaround for https://github.com/travis-ci/travis-ci/issues/8703 - - go run build/ci.go install - - go run build/ci.go test -coverage $TEST_PACKAGES - - # This builder only tests code linters on latest version of Go - - os: linux - dist: trusty - go: 1.11.x - env: - - lint - git: - submodules: false # avoid cloning ethereum/tests - script: - - go run build/ci.go lint - - # This builder does the Ubuntu PPA upload - - if: type = push - os: linux - dist: trusty - go: 1.11.x - env: - - ubuntu-ppa - git: - submodules: false # avoid cloning ethereum/tests - addons: - apt: - packages: - - devscripts - - debhelper - - dput - - fakeroot - - python-bzrlib - - python-paramiko - script: - - echo '|1|7SiYPr9xl3uctzovOTj4gMwAC1M=|t6ReES75Bo/PxlOPJ6/GsGbTrM0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0aKz5UTUndYgIGG7dQBV+HaeuEZJ2xPHo2DS2iSKvUL4xNMSAY4UguNW+pX56nAQmZKIZZ8MaEvSj6zMEDiq6HFfn5JcTlM80UwlnyKe8B8p7Nk06PPQLrnmQt5fh0HmEcZx+JU9TZsfCHPnX7MNz4ELfZE6cFsclClrKim3BHUIGq//t93DllB+h4O9LHjEUsQ1Sr63irDLSutkLJD6RXchjROXkNirlcNVHH/jwLWR5RcYilNX7S5bIkK8NlWPjsn/8Ua5O7I9/YoE97PpO6i73DTGLh5H9JN/SITwCKBkgSDWUt61uPK3Y11Gty7o2lWsBjhBUm2Y38CBsoGmBw==' >> ~/.ssh/known_hosts - - go run build/ci.go debsrc -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder " - - # This builder does the Linux Azure uploads - - if: type = push - os: linux - dist: trusty - sudo: required - go: 1.11.x - env: - - azure-linux - git: - submodules: false # avoid cloning ethereum/tests - addons: - apt: - packages: - - gcc-multilib - script: - # Build for the primary platforms that Trusty can manage - - go run build/ci.go install - - go run build/ci.go archive -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds - - go run build/ci.go install -arch 386 - - go run build/ci.go archive -arch 386 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds - - # Switch over GCC to cross compilation (breaks 386, hence why do it here only) - - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install gcc-arm-linux-gnueabi libc6-dev-armel-cross gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross - - sudo ln -s /usr/include/asm-generic /usr/include/asm - - - GOARM=5 go run build/ci.go install -arch arm -cc arm-linux-gnueabi-gcc - - GOARM=5 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds - - GOARM=6 go run build/ci.go install -arch arm -cc arm-linux-gnueabi-gcc - - GOARM=6 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds - - GOARM=7 go run build/ci.go install -arch arm -cc arm-linux-gnueabihf-gcc - - GOARM=7 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds - - go run build/ci.go install -arch arm64 -cc aarch64-linux-gnu-gcc - - go run build/ci.go archive -arch arm64 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds - - # This builder does the Linux Azure MIPS xgo uploads - - if: type = push - os: linux - dist: trusty - services: - - docker - go: 1.11.x - env: - - azure-linux-mips - git: - submodules: false # avoid cloning ethereum/tests - script: - - go run build/ci.go xgo --alltools -- --targets=linux/mips --ldflags '-extldflags "-static"' -v - - for bin in build/bin/*-linux-mips; do mv -f "${bin}" "${bin/-linux-mips/}"; done - - go run build/ci.go archive -arch mips -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds - - - go run build/ci.go xgo --alltools -- --targets=linux/mipsle --ldflags '-extldflags "-static"' -v - - for bin in build/bin/*-linux-mipsle; do mv -f "${bin}" "${bin/-linux-mipsle/}"; done - - go run build/ci.go archive -arch mipsle -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds - - - go run build/ci.go xgo --alltools -- --targets=linux/mips64 --ldflags '-extldflags "-static"' -v - - for bin in build/bin/*-linux-mips64; do mv -f "${bin}" "${bin/-linux-mips64/}"; done - - go run build/ci.go archive -arch mips64 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds - - - go run build/ci.go xgo --alltools -- --targets=linux/mips64le --ldflags '-extldflags "-static"' -v - - for bin in build/bin/*-linux-mips64le; do mv -f "${bin}" "${bin/-linux-mips64le/}"; done - - go run build/ci.go archive -arch mips64le -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds - - # This builder does the Android Maven and Azure uploads - - if: type = push - os: linux - dist: trusty - addons: - apt: - packages: - - oracle-java8-installer - - oracle-java8-set-default - language: android - android: - components: - - platform-tools - - tools - - android-15 - - android-19 - - android-24 - env: - - azure-android - - maven-android - git: - submodules: false # avoid cloning ethereum/tests - before_install: - - curl https://storage.googleapis.com/golang/go1.11.5.linux-amd64.tar.gz | tar -xz - - export PATH=`pwd`/go/bin:$PATH - - export GOROOT=`pwd`/go - - export GOPATH=$HOME/go - script: - # Build the Android archive and upload it to Maven Central and Azure - - curl https://dl.google.com/android/repository/android-ndk-r17b-linux-x86_64.zip -o android-ndk-r17b.zip - - unzip -q android-ndk-r17b.zip && rm android-ndk-r17b.zip - - mv android-ndk-r17b $HOME - - export ANDROID_NDK=$HOME/android-ndk-r17b - - - mkdir -p $GOPATH/src/github.com/ethereum - - ln -s `pwd` $GOPATH/src/github.com/ethereum - - go run build/ci.go aar -signer ANDROID_SIGNING_KEY -deploy https://oss.sonatype.org -upload gethstore/builds - - # This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads - - if: type = push - os: osx - go: 1.11.x - env: - - azure-osx - - azure-ios - - cocoapods-ios - git: - submodules: false # avoid cloning ethereum/tests - script: - - go run build/ci.go install - - go run build/ci.go archive -type tar -signer OSX_SIGNING_KEY -upload gethstore/builds - - # Build the iOS framework and upload it to CocoaPods and Azure - - gem uninstall cocoapods -a -x - - gem install cocoapods - - - mv ~/.cocoapods/repos/master ~/.cocoapods/repos/master.bak - - sed -i '.bak' 's/repo.join/!repo.join/g' $(dirname `gem which cocoapods`)/cocoapods/sources_manager.rb - - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git clone --depth=1 https://github.com/CocoaPods/Specs.git ~/.cocoapods/repos/master && pod setup --verbose; fi - - - xctool -version - - xcrun simctl list - - # Workaround for https://github.com/golang/go/issues/23749 - - export CGO_CFLAGS_ALLOW='-fmodules|-fblocks|-fobjc-arc' - - go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds - - # This builder does the Azure archive purges to avoid accumulating junk - - if: type = cron - os: linux - dist: trusty - go: 1.11.x - env: - - azure-purge - git: - submodules: false # avoid cloning ethereum/tests - script: - - go run build/ci.go purge -store gethstore/builds -days 14 diff --git a/README.md b/README.md index 7593dd0905..f2b43b640d 100644 --- a/README.md +++ b/README.md @@ -1,304 +1,4 @@ -## Go Ethereum - -Official golang implementation of the Ethereum protocol. - -[![API Reference]( -https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667 -)](https://godoc.org/github.com/ethereum/go-ethereum) -[![Go Report Card](https://goreportcard.com/badge/github.com/ethereum/go-ethereum)](https://goreportcard.com/report/github.com/ethereum/go-ethereum) -[![Travis](https://travis-ci.org/ethereum/go-ethereum.svg?branch=master)](https://travis-ci.org/ethereum/go-ethereum) -[![Discord](https://img.shields.io/badge/discord-join%20chat-blue.svg)](https://discord.gg/nthXNEv) - -Automated builds are available for stable releases and the unstable master branch. -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/ethereum/go-ethereum/wiki/Building-Ethereum) -on the wiki. - -Building geth requires both a Go (version 1.9 or later) and a C compiler. -You can install them using your favourite package manager. -Once the dependencies are installed, run - - make geth - -or, to build the full suite of utilities: - - make all - -## Executables - -The go-ethereum project comes with several wrappers/executables found in the `cmd` directory. - -| 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/ethereum/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/ethereum/go-ethereum/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. | -| `rlpdump` | Developer utility tool to convert binary RLP ([Recursive Length Prefix](https://github.com/ethereum/wiki/wiki/RLP)) dumps (data encoding used by the Ethereum protocol both network as well as consensus wise) to user friendlier hierarchical representation (e.g. `rlpdump --hex CE0183FFFFFFC4C304050583616263`). | -| `swarm` | Swarm daemon and tools. This is the entrypoint for the Swarm network. `swarm --help` for command line options and subcommands. See [Swarm README](https://github.com/ethereum/go-ethereum/tree/master/swarm) for more information. | -| `puppeth` | a CLI wizard that aids in creating a new Ethereum network. | - -## Running geth - -Going through all the possible command line flags is out of scope here (please consult our -[CLI Wiki page](https://github.com/ethereum/go-ethereum/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. - -### Full node on the main Ethereum network - -By far the most common scenario is people wanting to simply interact with the Ethereum network: -create accounts; transfer funds; deploy and interact with contracts. For this particular use-case -the user doesn't care about years-old historical data, so we can fast-sync quickly to the current -state of the network. To do so: - -``` -$ geth console -``` - -This command will: - - * Start geth in fast sync mode (default, can be changed with the `--syncmode` flag), causing it to - download more data in exchange for avoiding processing the entire history of the Ethereum network, - which is very CPU intensive. - * Start up Geth's built-in interactive [JavaScript console](https://github.com/ethereum/go-ethereum/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/ethereum/go-ethereum/wiki/Management-APIs). - This tool is optional and if you leave it out you can always attach to an already running Geth instance - with `geth attach`. - -### Full node on the Ethereum test network - -Transitioning towards developers, if you'd like to play around with creating Ethereum contracts, you -almost certainly would like to do that without any real money involved until you get the hang of the -entire system. In other words, instead of attaching to the main network, you want to join the **test** -network with your node, which is fully equivalent to the main network, but with play-Ether only. - -``` -$ geth --testnet console -``` - -The `console` subcommand have the exact same meaning as above and they are equally useful on the -testnet too. Please see above for their explanations if you've skipped to here. - -Specifying the `--testnet` flag however will reconfigure your Geth instance a bit: - - * Instead of using the default data directory (`~/.ethereum` on Linux for example), Geth will nest - itself one level deeper into a `testnet` subfolder (`~/.ethereum/testnet` on Linux). Note, on OSX - and Linux this also means that attaching to a running testnet node requires the use of a custom - endpoint since `geth attach` will try to attach to a production node endpoint by default. E.g. - `geth attach /testnet/geth.ipc`. Windows users are not affected by this. - * Instead of connecting the main Ethereum network, the client will connect to the test network, - which uses different P2P bootnodes, different network IDs and genesis states. - -*Note: Although there are some internal protective measures to prevent transactions from crossing -over between the main network and test network, you should make sure to always use separate accounts -for play-money and real-money. Unless you manually move accounts, Geth will by default correctly -separate the two networks and will not make any accounts available between them.* - -### Full node on the Rinkeby test network - -The above test network is a cross client one based on the ethash proof-of-work consensus algorithm. As such, it has certain extra overhead and is more susceptible to reorganization attacks due to the network's low difficulty / security. Go Ethereum also supports connecting to a proof-of-authority based test network called [*Rinkeby*](https://www.rinkeby.io) (operated by members of the community). This network is lighter, more secure, but is only supported by go-ethereum. - -``` -$ geth --rinkeby console -``` - -### Configuration - -As an alternative to passing the numerous flags to the `geth` binary, you can also pass a configuration file via: - -``` -$ geth --config /path/to/your_config.toml -``` - -To get an idea how the file should look like you can use the `dumpconfig` subcommand to export your existing configuration: - -``` -$ geth --your-favourite-flags dumpconfig -``` - -*Note: This works only with geth v1.6.0 and above.* - -#### Docker quick start - -One of the quickest ways to get Ethereum up and running on your machine is by using Docker: - -``` -docker run -d --name ethereum-node -v /Users/alice/ethereum:/root \ - -p 8545:8545 -p 30303:30303 \ - ethereum/client-go -``` - -This will start geth in fast-sync mode with a DB memory allowance of 1GB just as the above command does. It will also create a persistent volume in your home directory for saving your blockchain as well as map the default ports. There is also an `alpine` tag available for a slim version of the image. - -Do not forget `--rpcaddr 0.0.0.0`, if you want to access RPC from other containers and/or hosts. By default, `geth` binds to the local interface and RPC endpoints is not accessible from the outside. - -### Programatically interfacing Geth nodes - -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/ethereum/go-ethereum/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 -and WS interfaces need to manually be enabled and only expose a subset of APIs due to security reasons. -These can be turned on/off and configured as you'd expect. - -HTTP based JSON-RPC API options: - - * `--rpc` Enable the HTTP-RPC server - * `--rpcaddr` HTTP-RPC server listening interface (default: "localhost") - * `--rpcport` HTTP-RPC server listening port (default: 8545) - * `--rpcapi` API's offered over the HTTP-RPC interface (default: "eth,net,web3") - * `--rpccorsdomain` Comma separated list of domains from which to accept cross origin requests (browser enforced) - * `--ws` Enable the WS-RPC server - * `--wsaddr` WS-RPC server listening interface (default: "localhost") - * `--wsport` WS-RPC server listening port (default: 8546) - * `--wsapi` API's offered over the WS-RPC interface (default: "eth,net,web3") - * `--wsorigins` Origins from which to accept websockets requests - * `--ipcdisable` Disable the IPC-RPC server - * `--ipcapi` API's offered over the IPC-RPC interface (default: "admin,debug,eth,miner,net,personal,shh,txpool,web3") - * `--ipcpath` Filename for IPC socket/pipe within the datadir (explicit paths escape it) - -You'll need to use your own programming environments' capabilities (libraries, tools, etc) to connect -via HTTP, WS or IPC to a Geth node configured with the above flags and you'll need to speak [JSON-RPC](https://www.jsonrpc.org/specification) -on all transports. You can reuse the same connection for multiple requests! - -**Note: Please understand the security implications of opening up an HTTP/WS based transport before -doing so! Hackers on the internet are actively trying to subvert Ethereum nodes with exposed APIs! -Further, all browser tabs can access locally running webservers, so malicious webpages could try to -subvert locally available APIs!** - -### Operating a private network - -Maintaining your own private network is more involved as a lot of configurations taken for granted in -the official networks need to be manually set up. - -#### Defining the private genesis state - -First, you'll need to create the genesis state of your networks, which all nodes need to be aware of -and agree upon. This consists of a small JSON file (e.g. call it `genesis.json`): - -```json -{ - "config": { - "chainId": 0, - "homesteadBlock": 0, - "eip155Block": 0, - "eip158Block": 0 - }, - "alloc" : {}, - "coinbase" : "0x0000000000000000000000000000000000000000", - "difficulty" : "0x20000", - "extraData" : "", - "gasLimit" : "0x2fefd8", - "nonce" : "0x0000000000000042", - "mixhash" : "0x0000000000000000000000000000000000000000000000000000000000000000", - "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", - "timestamp" : "0x00" -} -``` - -The above fields should be fine for most purposes, although we'd recommend changing the `nonce` to -some random value so you prevent unknown remote nodes from being able to connect to you. If you'd -like to pre-fund some accounts for easier testing, you can populate the `alloc` field with account -configs: - -```json -"alloc": { - "0x0000000000000000000000000000000000000001": {"balance": "111111111"}, - "0x0000000000000000000000000000000000000002": {"balance": "222222222"} -} -``` - -With the genesis state defined in the above JSON file, you'll need to initialize **every** Geth node -with it prior to starting it up to ensure all blockchain parameters are correctly set: - -``` -$ geth init path/to/genesis.json -``` - -#### Creating the rendezvous point - -With all nodes that you want to run initialized to the desired genesis state, you'll need to start a -bootstrap node that others can use to find each other in your network and/or over the internet. The -clean way is to configure and run a dedicated bootnode: - -``` -$ bootnode --genkey=boot.key -$ bootnode --nodekey=boot.key -``` - -With the bootnode online, it will display an [`enode` URL](https://github.com/ethereum/wiki/wiki/enode-url-format) -that other nodes can use to connect to it and exchange peer information. Make sure to replace the -displayed IP address information (most probably `[::]`) with your externally accessible IP to get the -actual `enode` URL. - -*Note: You could also use a full fledged Geth node as a bootnode, but it's the less recommended way.* - -#### Starting up your member nodes - -With the bootnode operational and externally reachable (you can try `telnet ` to ensure -it's indeed reachable), start every subsequent Geth node pointed to the bootnode for peer discovery -via the `--bootnodes` flag. It will probably also be desirable to keep the data directory of your -private network separated, so do also specify a custom `--datadir` flag. - -``` -$ geth --datadir=path/to/custom/data/folder --bootnodes= -``` - -*Note: Since your network will be completely cut off from the main and test networks, you'll also -need to configure a miner to process transactions and create new blocks for you.* - -#### Running a private miner - -Mining on the public Ethereum network is a complex task as it's only feasible using GPUs, requiring -an OpenCL or CUDA enabled `ethminer` instance. For information on such a setup, please consult the -[EtherMining subreddit](https://www.reddit.com/r/EtherMining/) and the [Genoil miner](https://github.com/Genoil/cpp-ethereum) -repository. - -In a private network setting however, a single CPU miner instance is more than enough for practical -purposes as it can produce a stable stream of blocks at the correct intervals without needing heavy -resources (consider running on a single thread, no need for multiple ones either). To start a Geth -instance for mining, run it with all your usual flags, extended by: - -``` -$ geth --mine --minerthreads=1 --etherbase=0x0000000000000000000000000000000000000000 -``` - -Which will start mining blocks and transactions on a single CPU thread, crediting all proceedings to -the account specified by `--etherbase`. You can further tune the mining by changing the default gas -limit blocks converge to (`--targetgaslimit`) and the price transactions are accepted at (`--gasprice`). - -## Contribution - -Thank you for considering to help out with the source code! We welcome contributions from -anyone on the internet, and are grateful for even the smallest of fixes! - -If you'd like to contribute to go-ethereum, please fork, fix, commit and send a pull request -for the maintainers to review and merge into the main code base. If you wish to submit more -complex changes though, please check up with the core devs first on [our gitter channel](https://gitter.im/ethereum/go-ethereum) -to ensure those changes are in line with the general philosophy of the project and/or get some -early feedback which can make both your efforts much lighter as well as our review and merge -procedures quick and simple. - -Please make sure your contributions adhere to our coding guidelines: - - * Code must adhere to the official Go [formatting](https://golang.org/doc/effective_go.html#formatting) guidelines (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)). - * Code must be documented adhering to the official Go [commentary](https://golang.org/doc/effective_go.html#commentary) guidelines. - * Pull requests need to be based on and opened against the `master` branch. - * 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/ethereum/go-ethereum/wiki/Developers'-Guide) -for more details on configuring your environment, managing project dependencies and testing procedures. +## Go Ethereum 1.8 with Timing ## License diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go index b9444f9f0d..0bdb4571af 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" ) const jsondata = ` diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index e6bb0c3b52..c5149916e5 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -22,10 +22,10 @@ import ( "io" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/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 ca60cc1b43..ae0954655e 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 6f46fc1495..3993463523 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -24,22 +24,22 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/bloombits" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/eth/filters" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/params" + "go-ethereum-timing/rpc" ) // 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 c37bdf11d5..f35370a71d 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" + "go-ethereum-timing" + "go-ethereum-timing/accounts/abi" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/event" ) // SignerFn is a signer function callback when a contract requires a method to diff --git a/accounts/abi/bind/base_test.go b/accounts/abi/bind/base_test.go index 8adff8b59b..df8c97f99b 100644 --- a/accounts/abi/bind/base_test.go +++ b/accounts/abi/bind/base_test.go @@ -5,10 +5,10 @@ import ( "math/big" "testing" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" + ethereum "go-ethereum-timing" + "go-ethereum-timing/accounts/abi" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/common" ) type mockCaller struct { diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go index 5ee30d0249..837f39221a 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/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts +// https://go-ethereum-timing/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts package bind import ( @@ -29,7 +29,7 @@ import ( "text/template" "unicode" - "github.com/ethereum/go-ethereum/accounts/abi" + "go-ethereum-timing/accounts/abi" ) // Lang is a target programming language selector to generate bindings for. diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index 46e0b38d00..1c5267c6b8 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) var bindTests = []struct { @@ -43,7 +43,7 @@ var bindTests = []struct { `contract NilContract {}`, `606060405260068060106000396000f3606060405200`, `[]`, - `"github.com/ethereum/go-ethereum/common"`, + `"go-ethereum-timing/common"`, ` if b, err := NewEmpty(common.Address{}, nil); b == nil || err != nil { t.Fatalf("combined binding (%v) nil or error (%v) not nil", b, nil) @@ -62,7 +62,7 @@ var bindTests = []struct { `https://ethereum.org/token`, `60606040526040516107fd3803806107fd83398101604052805160805160a05160c051929391820192909101600160a060020a0333166000908152600360209081526040822086905581548551838052601f6002600019610100600186161502019093169290920482018390047f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56390810193919290918801908390106100e857805160ff19168380011785555b506101189291505b8082111561017157600081556001016100b4565b50506002805460ff19168317905550505050610658806101a56000396000f35b828001600101855582156100ac579182015b828111156100ac5782518260005055916020019190600101906100fa565b50508060016000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017557805160ff19168380011785555b506100c89291506100b4565b5090565b82800160010185558215610165579182015b8281111561016557825182600050559160200191906001019061018756606060405236156100775760e060020a600035046306fdde03811461007f57806323b872dd146100dc578063313ce5671461010e57806370a082311461011a57806395d89b4114610132578063a9059cbb1461018e578063cae9ca51146101bd578063dc3080f21461031c578063dd62ed3e14610341575b610365610002565b61036760008054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156104eb5780601f106104c0576101008083540402835291602001916104eb565b6103d5600435602435604435600160a060020a038316600090815260036020526040812054829010156104f357610002565b6103e760025460ff1681565b6103d560043560036020526000908152604090205481565b610367600180546020600282841615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156104eb5780601f106104c0576101008083540402835291602001916104eb565b610365600435602435600160a060020a033316600090815260036020526040902054819010156103f157610002565b60806020604435600481810135601f8101849004909302840160405260608381526103d5948235946024803595606494939101919081908382808284375094965050505050505060006000836004600050600033600160a060020a03168152602001908152602001600020600050600087600160a060020a031681526020019081526020016000206000508190555084905080600160a060020a0316638f4ffcb1338630876040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a03168152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156102f25780820380516001836020036101000a031916815260200191505b50955050505050506000604051808303816000876161da5a03f11561000257505050509392505050565b6005602090815260043560009081526040808220909252602435815220546103d59081565b60046020818152903560009081526040808220909252602435815220546103d59081565b005b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156103c75780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60408051918252519081900360200190f35b6060908152602090f35b600160a060020a03821660009081526040902054808201101561041357610002565b806003600050600033600160a060020a03168152602001908152602001600020600082828250540392505081905550806003600050600084600160a060020a0316815260200190815260200160002060008282825054019250508190555081600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b820191906000526020600020905b8154815290600101906020018083116104ce57829003601f168201915b505050505081565b600160a060020a03831681526040812054808301101561051257610002565b600160a060020a0380851680835260046020908152604080852033949094168086529382528085205492855260058252808520938552929052908220548301111561055c57610002565b816003600050600086600160a060020a03168152602001908152602001600020600082828250540392505081905550816003600050600085600160a060020a03168152602001908152602001600020600082828250540192505081905550816005600050600086600160a060020a03168152602001908152602001600020600050600033600160a060020a0316815260200190815260200160002060008282825054019250508190555082600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3939250505056`, `[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"},{"name":"_extraData","type":"bytes"}],"name":"approveAndCall","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"spentAllowance","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"inputs":[{"name":"initialSupply","type":"uint256"},{"name":"tokenName","type":"string"},{"name":"decimalUnits","type":"uint8"},{"name":"tokenSymbol","type":"string"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"}]`, - `"github.com/ethereum/go-ethereum/common"`, + `"go-ethereum-timing/common"`, ` if b, err := NewToken(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -74,7 +74,7 @@ var bindTests = []struct { `https://ethereum.org/crowdsale`, `606060408190526007805460ff1916905560a0806105a883396101006040529051608051915160c05160e05160008054600160a060020a03199081169095178155670de0b6b3a7640000958602600155603c9093024201600355930260045560058054909216909217905561052f90819061007990396000f36060604052361561006c5760e060020a600035046301cb3b20811461008257806329dcb0cf1461014457806338af3eed1461014d5780636e66f6e91461015f5780637a3a0e84146101715780637b3e5e7b1461017a578063a035b1fe14610183578063dc0d3dff1461018c575b61020060075460009060ff161561032357610002565b61020060035460009042106103205760025460015490106103cb576002548154600160a060020a0316908290606082818181858883f150915460025460408051600160a060020a039390931683526020830191909152818101869052517fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf6945090819003909201919050a15b60405160008054600160a060020a039081169230909116319082818181858883f150506007805460ff1916600117905550505050565b6103a160035481565b6103ab600054600160a060020a031681565b6103ab600554600160a060020a031681565b6103a160015481565b6103a160025481565b6103a160045481565b6103be60043560068054829081101561000257506000526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f8101547ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d409190910154600160a060020a03919091169082565b005b505050815481101561000257906000526020600020906002020160005060008201518160000160006101000a815481600160a060020a030219169083021790555060208201518160010160005055905050806002600082828250540192505081905550600560009054906101000a9004600160a060020a0316600160a060020a031663a9059cbb3360046000505484046040518360e060020a0281526004018083600160a060020a03168152602001828152602001925050506000604051808303816000876161da5a03f11561000257505060408051600160a060020a03331681526020810184905260018183015290517fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf692509081900360600190a15b50565b5060a0604052336060908152346080819052600680546001810180835592939282908280158290116102025760020281600202836000526020600020918201910161020291905b8082111561039d57805473ffffffffffffffffffffffffffffffffffffffff19168155600060019190910190815561036a565b5090565b6060908152602090f35b600160a060020a03166060908152602090f35b6060918252608052604090f35b5b60065481101561010e576006805482908110156100025760009182526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f0190600680549254600160a060020a0316928490811015610002576002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40015460405190915082818181858883f19350505050507fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf660066000508281548110156100025760008290526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f01548154600160a060020a039190911691908490811015610002576002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40015460408051600160a060020a0394909416845260208401919091526000838201525191829003606001919050a16001016103cc56`, `[{"constant":false,"inputs":[],"name":"checkGoalReached","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"deadline","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"beneficiary","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"tokenReward","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"fundingGoal","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"amountRaised","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"price","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"funders","outputs":[{"name":"addr","type":"address"},{"name":"amount","type":"uint256"}],"type":"function"},{"inputs":[{"name":"ifSuccessfulSendTo","type":"address"},{"name":"fundingGoalInEthers","type":"uint256"},{"name":"durationInMinutes","type":"uint256"},{"name":"etherCostOfEachToken","type":"uint256"},{"name":"addressOfTokenUsedAsReward","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"backer","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"isContribution","type":"bool"}],"name":"FundTransfer","type":"event"}]`, - `"github.com/ethereum/go-ethereum/common"`, + `"go-ethereum-timing/common"`, ` if b, err := NewCrowdsale(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -86,7 +86,7 @@ var bindTests = []struct { `https://ethereum.org/dao`, `606060405260405160808061145f833960e06040529051905160a05160c05160008054600160a060020a03191633179055600184815560028490556003839055600780549182018082558280158290116100b8576003028160030283600052602060002091820191016100b891906101c8565b50506060919091015160029190910155600160a060020a0381166000146100a65760008054600160a060020a031916821790555b505050506111f18061026e6000396000f35b505060408051608081018252600080825260208281018290528351908101845281815292820192909252426060820152600780549194509250811015610002579081527fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c6889050815181546020848101517401000000000000000000000000000000000000000002600160a060020a03199290921690921760a060020a60ff021916178255604083015180516001848101805460008281528690209195600293821615610100026000190190911692909204601f9081018390048201949192919091019083901061023e57805160ff19168380011785555b50610072929150610226565b5050600060028201556001015b8082111561023a578054600160a860020a031916815560018181018054600080835592600290821615610100026000190190911604601f81901061020c57506101bb565b601f0160209004906000526020600020908101906101bb91905b8082111561023a5760008155600101610226565b5090565b828001600101855582156101af579182015b828111156101af57825182600050559160200191906001019061025056606060405236156100b95760e060020a6000350463013cf08b81146100bb578063237e9492146101285780633910682114610281578063400e3949146102995780635daf08ca146102a257806369bd34361461032f5780638160f0b5146103385780638da5cb5b146103415780639644fcbd14610353578063aa02a90f146103be578063b1050da5146103c7578063bcca1fd3146104b5578063d3c0715b146104dc578063eceb29451461058d578063f2fde38b1461067b575b005b61069c6004356004805482908110156100025790600052602060002090600a02016000506005810154815460018301546003840154600485015460068601546007870154600160a060020a03959095169750929560020194919360ff828116946101009093041692919089565b60408051602060248035600481810135601f81018590048502860185019096528585526107759581359591946044949293909201918190840183828082843750949650505050505050600060006004600050848154811015610002575090527f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19e600a8402908101547f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b909101904210806101e65750600481015460ff165b8061026757508060000160009054906101000a9004600160a060020a03168160010160005054846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f15090500193505050506040518091039020816007016000505414155b8061027757506001546005820154105b1561109257610002565b61077560043560066020526000908152604090205481565b61077560055481565b61078760043560078054829081101561000257506000526003026000805160206111d18339815191528101547fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c68a820154600160a060020a0382169260a060020a90920460ff16917fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c689019084565b61077560025481565b61077560015481565b610830600054600160a060020a031681565b604080516020604435600481810135601f81018490048402850184019095528484526100b9948135946024803595939460649492939101918190840183828082843750949650505050505050600080548190600160a060020a03908116339091161461084d57610002565b61077560035481565b604080516020604435600481810135601f8101849004840285018401909552848452610775948135946024803595939460649492939101918190840183828082843750506040805160209735808a0135601f81018a90048a0283018a019093528282529698976084979196506024909101945090925082915084018382808284375094965050505050505033600160a060020a031660009081526006602052604081205481908114806104ab5750604081205460078054909190811015610002579082526003026000805160206111d1833981519152015460a060020a900460ff16155b15610ce557610002565b6100b960043560243560443560005433600160a060020a03908116911614610b1857610002565b604080516020604435600481810135601f810184900484028501840190955284845261077594813594602480359593946064949293910191819084018382808284375094965050505050505033600160a060020a031660009081526006602052604081205481908114806105835750604081205460078054909190811015610002579082526003026000805160206111d18339815191520181505460a060020a900460ff16155b15610f1d57610002565b604080516020606435600481810135601f81018490048402850184019095528484526107759481359460248035956044359560849492019190819084018382808284375094965050505050505060006000600460005086815481101561000257908252600a027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01815090508484846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160070160005054149150610cdc565b6100b960043560005433600160a060020a03908116911614610f0857610002565b604051808a600160a060020a031681526020018981526020018060200188815260200187815260200186815260200185815260200184815260200183815260200182810382528981815460018160011615610100020316600290048152602001915080546001816001161561010002031660029004801561075e5780601f106107335761010080835404028352916020019161075e565b820191906000526020600020905b81548152906001019060200180831161074157829003601f168201915b50509a505050505050505050505060405180910390f35b60408051918252519081900360200190f35b60408051600160a060020a038616815260208101859052606081018390526080918101828152845460026001821615610100026000190190911604928201839052909160a08301908590801561081e5780601f106107f35761010080835404028352916020019161081e565b820191906000526020600020905b81548152906001019060200180831161080157829003601f168201915b50509550505050505060405180910390f35b60408051600160a060020a03929092168252519081900360200190f35b600160a060020a03851660009081526006602052604081205414156108a957604060002060078054918290556001820180825582801582901161095c5760030281600302836000526020600020918201910161095c9190610a4f565b600160a060020a03851660009081526006602052604090205460078054919350908390811015610002575060005250600381026000805160206111d183398151915201805474ff0000000000000000000000000000000000000000191660a060020a85021781555b60408051600160a060020a03871681526020810186905281517f27b022af4a8347100c7a041ce5ccf8e14d644ff05de696315196faae8cd50c9b929181900390910190a15050505050565b505050915081506080604051908101604052808681526020018581526020018481526020014281526020015060076000508381548110156100025790600052602060002090600302016000508151815460208481015160a060020a02600160a060020a03199290921690921774ff00000000000000000000000000000000000000001916178255604083015180516001848101805460008281528690209195600293821615610100026000190190911692909204601f90810183900482019491929190910190839010610ad357805160ff19168380011785555b50610b03929150610abb565b5050600060028201556001015b80821115610acf57805474ffffffffffffffffffffffffffffffffffffffffff1916815560018181018054600080835592600290821615610100026000190190911604601f819010610aa15750610a42565b601f016020900490600052602060002090810190610a4291905b80821115610acf5760008155600101610abb565b5090565b82800160010185558215610a36579182015b82811115610a36578251826000505591602001919060010190610ae5565b50506060919091015160029190910155610911565b600183905560028290556003819055604080518481526020810184905280820183905290517fa439d3fa452be5e0e1e24a8145e715f4fd8b9c08c96a42fd82a855a85e5d57de9181900360600190a1505050565b50508585846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160070160005081905550600260005054603c024201816003016000508190555060008160040160006101000a81548160ff0219169083021790555060008160040160016101000a81548160ff02191690830217905550600081600501600050819055507f646fec02522b41e7125cfc859a64fd4f4cefd5dc3b6237ca0abe251ded1fa881828787876040518085815260200184600160a060020a03168152602001838152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f168015610cc45780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a1600182016005555b50949350505050565b6004805460018101808355909190828015829011610d1c57600a0281600a028360005260206000209182019101610d1c9190610db8565b505060048054929450918491508110156100025790600052602060002090600a02016000508054600160a060020a031916871781556001818101879055855160028381018054600082815260209081902096975091959481161561010002600019011691909104601f90810182900484019391890190839010610ed857805160ff19168380011785555b50610b6c929150610abb565b50506001015b80821115610acf578054600160a060020a03191681556000600182810182905560028381018054848255909281161561010002600019011604601f819010610e9c57505b5060006003830181905560048301805461ffff191690556005830181905560068301819055600783018190556008830180548282559082526020909120610db2916002028101905b80821115610acf57805474ffffffffffffffffffffffffffffffffffffffffff1916815560018181018054600080835592600290821615610100026000190190911604601f819010610eba57505b5050600101610e44565b601f016020900490600052602060002090810190610dfc9190610abb565b601f016020900490600052602060002090810190610e929190610abb565b82800160010185558215610da6579182015b82811115610da6578251826000505591602001919060010190610eea565b60008054600160a060020a0319168217905550565b600480548690811015610002576000918252600a027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01905033600160a060020a0316600090815260098201602052604090205490915060ff1660011415610f8457610002565b33600160a060020a031660009081526009820160205260409020805460ff1916600190811790915560058201805490910190558315610fcd576006810180546001019055610fda565b6006810180546000190190555b7fc34f869b7ff431b034b7b9aea9822dac189a685e0b015c7d1be3add3f89128e8858533866040518085815260200184815260200183600160a060020a03168152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f16801561107a5780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a1509392505050565b6006810154600354901315611158578060000160009054906101000a9004600160a060020a0316600160a060020a03168160010160005054670de0b6b3a76400000284604051808280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156111225780820380516001836020036101000a031916815260200191505b5091505060006040518083038185876185025a03f15050505060048101805460ff191660011761ff00191661010017905561116d565b60048101805460ff191660011761ff00191690555b60068101546005820154600483015460408051888152602081019490945283810192909252610100900460ff166060830152517fd220b7272a8b6d0d7d6bcdace67b936a8f175e6d5c1b3ee438b72256b32ab3af9181900360800190a1509291505056a66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c688`, `[{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"proposals","outputs":[{"name":"recipient","type":"address"},{"name":"amount","type":"uint256"},{"name":"description","type":"string"},{"name":"votingDeadline","type":"uint256"},{"name":"executed","type":"bool"},{"name":"proposalPassed","type":"bool"},{"name":"numberOfVotes","type":"uint256"},{"name":"currentResult","type":"int256"},{"name":"proposalHash","type":"bytes32"}],"type":"function"},{"constant":false,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"transactionBytecode","type":"bytes"}],"name":"executeProposal","outputs":[{"name":"result","type":"int256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"memberId","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"numProposals","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"members","outputs":[{"name":"member","type":"address"},{"name":"canVote","type":"bool"},{"name":"name","type":"string"},{"name":"memberSince","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"debatingPeriodInMinutes","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"minimumQuorum","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"targetMember","type":"address"},{"name":"canVote","type":"bool"},{"name":"memberName","type":"string"}],"name":"changeMembership","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"majorityMargin","outputs":[{"name":"","type":"int256"}],"type":"function"},{"constant":false,"inputs":[{"name":"beneficiary","type":"address"},{"name":"etherAmount","type":"uint256"},{"name":"JobDescription","type":"string"},{"name":"transactionBytecode","type":"bytes"}],"name":"newProposal","outputs":[{"name":"proposalID","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"minimumQuorumForProposals","type":"uint256"},{"name":"minutesForDebate","type":"uint256"},{"name":"marginOfVotesForMajority","type":"int256"}],"name":"changeVotingRules","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"supportsProposal","type":"bool"},{"name":"justificationText","type":"string"}],"name":"vote","outputs":[{"name":"voteID","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"beneficiary","type":"address"},{"name":"etherAmount","type":"uint256"},{"name":"transactionBytecode","type":"bytes"}],"name":"checkProposalCode","outputs":[{"name":"codeChecksOut","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"type":"function"},{"inputs":[{"name":"minimumQuorumForProposals","type":"uint256"},{"name":"minutesForDebate","type":"uint256"},{"name":"marginOfVotesForMajority","type":"int256"},{"name":"congressLeader","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"recipient","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"description","type":"string"}],"name":"ProposalAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"position","type":"bool"},{"indexed":false,"name":"voter","type":"address"},{"indexed":false,"name":"justification","type":"string"}],"name":"Voted","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"result","type":"int256"},{"indexed":false,"name":"quorum","type":"uint256"},{"indexed":false,"name":"active","type":"bool"}],"name":"ProposalTallied","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"member","type":"address"},{"indexed":false,"name":"isMember","type":"bool"}],"name":"MembershipChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"minimumQuorum","type":"uint256"},{"indexed":false,"name":"debatingPeriodInMinutes","type":"uint256"},{"indexed":false,"name":"majorityMargin","type":"int256"}],"name":"ChangeOfRules","type":"event"}]`, - `"github.com/ethereum/go-ethereum/common"`, + `"go-ethereum-timing/common"`, ` if b, err := NewDAO(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -109,7 +109,7 @@ var bindTests = []struct { ` "fmt" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" `, `if b, err := NewInputChecker(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -143,7 +143,7 @@ var bindTests = []struct { ` "fmt" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" `, `if b, err := NewOutputChecker(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -179,7 +179,7 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" `, `if e, err := NewEventChecker(common.Address{}, nil); e == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", e, nil) @@ -249,10 +249,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/accounts/abi/bind/backends" + "go-ethereum-timing/core" + "go-ethereum-timing/crypto" `, ` // Generate a new random account and a funded simulator @@ -298,10 +298,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/accounts/abi/bind/backends" + "go-ethereum-timing/core" + "go-ethereum-timing/crypto" `, ` // Generate a new random account and a funded simulator @@ -338,10 +338,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/accounts/abi/bind/backends" + "go-ethereum-timing/core" + "go-ethereum-timing/crypto" `, ` // Generate a new random account and a funded simulator @@ -389,11 +389,11 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/accounts/abi/bind/backends" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/crypto" `, ` // Generate a new random account and a funded simulator @@ -432,10 +432,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/accounts/abi/bind/backends" + "go-ethereum-timing/core" + "go-ethereum-timing/crypto" `, ` // Generate a new random account and a funded simulator @@ -473,9 +473,9 @@ var bindTests = []struct { `6060604052609f8060106000396000f3606060405260e060020a6000350463f97a60058114601a575b005b600060605260c0604052600d60809081527f4920646f6e27742065786973740000000000000000000000000000000000000060a052602060c0908152600d60e081905281906101009060a09080838184600060046012f15050815172ffffffffffffffffffffffffffffffffffffff1916909152505060405161012081900392509050f3`, `[{"constant":true,"inputs":[],"name":"String","outputs":[{"name":"","type":"string"}],"type":"function"}]`, ` - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/accounts/abi/bind/backends" + "go-ethereum-timing/common" `, ` // Create a simulator and wrap a non-deployed contract @@ -514,10 +514,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/accounts/abi/bind/backends" + "go-ethereum-timing/core" + "go-ethereum-timing/crypto" `, ` // Generate a new random account and a funded simulator @@ -557,11 +557,11 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/accounts/abi/bind/backends" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/crypto" `, ` // Generate a new random account and a funded simulator @@ -627,10 +627,10 @@ var bindTests = []struct { "fmt" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/accounts/abi/bind/backends" + "go-ethereum-timing/core" + "go-ethereum-timing/crypto" `, ` // Generate a new random account and a funded simulator @@ -706,11 +706,11 @@ var bindTests = []struct { "math/big" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/accounts/abi/bind/backends" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/crypto" `, ` // Generate a new random account and a funded simulator @@ -864,10 +864,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/accounts/abi/bind/backends" + "go-ethereum-timing/core" + "go-ethereum-timing/crypto" `, ` // Generate a new random account and a funded simulator diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index 02d0258e0c..319b8b864b 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -16,7 +16,7 @@ package bind -import "github.com/ethereum/go-ethereum/accounts/abi" +import "go-ethereum-timing/accounts/abi" // tmplData is the data structure required to fill the binding template. type tmplData struct { @@ -68,12 +68,12 @@ import ( "math/big" "strings" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "go-ethereum-timing" + "go-ethereum-timing/accounts/abi" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/accounts/abi/bind/topics.go b/accounts/abi/bind/topics.go index 600dfcda97..557e15060e 100644 --- a/accounts/abi/bind/topics.go +++ b/accounts/abi/bind/topics.go @@ -22,9 +22,9 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" ) // makeTopics converts a filter query argument list into a filter topic set. diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index d129993ca1..647f2e33b6 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/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 8f4092971f..01316e704b 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/accounts/abi/bind/backends" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/event.go b/accounts/abi/event.go index 9392c1990c..7c06382631 100644 --- a/accounts/abi/event.go +++ b/accounts/abi/event.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/common" + "go-ethereum-timing/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 e735cceb88..4b6dc32fa9 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -25,10 +25,10 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" ) var jsonEventTransfer = []byte(`{ @@ -356,7 +356,7 @@ func unpackTestEventData(dest interface{}, hexData string, jsonEvent []byte, ass /* Taken from -https://github.com/ethereum/go-ethereum/pull/15568 +https://go-ethereum-timing/pull/15568 */ type testResult struct { diff --git a/accounts/abi/method.go b/accounts/abi/method.go index 2d8d3d6589..df3b0e6e51 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/crypto" ) // Method represents a callable given a `Name` and whether the method is a constant. diff --git a/accounts/abi/numbers.go b/accounts/abi/numbers.go index 4d706846da..b8a1fa811c 100644 --- a/accounts/abi/numbers.go +++ b/accounts/abi/numbers.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" ) var ( diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index 36c58265bd..b8ff9fbe58 100644 --- a/accounts/abi/pack.go +++ b/accounts/abi/pack.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common" + "go-ethereum-timing/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 10cd3a3962..2f74e2aa8b 100644 --- a/accounts/abi/pack_test.go +++ b/accounts/abi/pack_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) func TestPack(t *testing.T) { diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index 7ef47330dc..3c81965c6d 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/ethereum/go-ethereum/common" + "go-ethereum-timing/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 8406b09c80..f890022d2d 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -22,7 +22,7 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) var ( diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index ff88be3d30..55ddd920cf 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" + "go-ethereum-timing/common" ) type unpackTest struct { diff --git a/accounts/accounts.go b/accounts/accounts.go index cb1eae2815..3496122627 100644 --- a/accounts/accounts.go +++ b/accounts/accounts.go @@ -20,10 +20,10 @@ package accounts import ( "math/big" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "go-ethereum-timing" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/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 8f660e282f..d25f45a5ce 100644 --- a/accounts/keystore/account_cache.go +++ b/accounts/keystore/account_cache.go @@ -28,9 +28,9 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" + "go-ethereum-timing/log" ) // Minimum amount of time between cache reloads. This limit applies if the platform does diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index fe9233c046..6cdb33dec3 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/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" ) var ( diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go index 73ff6ae9ee..cf009f278d 100644 --- a/accounts/keystore/file_cache.go +++ b/accounts/keystore/file_cache.go @@ -25,7 +25,7 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) // fileCache is a cache of files seen during scan of keystore. diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go index 84d8df0c5a..3d2fc641fa 100644 --- a/accounts/keystore/key.go +++ b/accounts/keystore/key.go @@ -29,10 +29,10 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" "github.com/pborman/uuid" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" ) const ( diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 2918047ccd..d98d3d512a 100644 --- a/accounts/keystore/keystore.go +++ b/accounts/keystore/keystore.go @@ -33,11 +33,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/event" ) var ( diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go index 6fb0a78088..83660a4a59 100644 --- a/accounts/keystore/keystore_test.go +++ b/accounts/keystore/keystore_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/event" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" + "go-ethereum-timing/event" ) var testSigData = make([]byte, 32) diff --git a/accounts/keystore/passphrase.go b/accounts/keystore/passphrase.go index a0b6cf5385..885eeffea1 100644 --- a/accounts/keystore/passphrase.go +++ b/accounts/keystore/passphrase.go @@ -38,10 +38,10 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" "github.com/pborman/uuid" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/crypto" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" ) @@ -120,7 +120,7 @@ func (ks keyStorePassphrase) StoreKey(filename string, key *Key, auth string) er "This indicates that the keystore is corrupted. \n" + "The corrupted file is stored at \n%v\n" + "Please file a ticket at:\n\n" + - "https://github.com/ethereum/go-ethereum/issues." + + "https://go-ethereum-timing/issues." + "The error was : %s" return fmt.Errorf(msg, tmpName, err) } diff --git a/accounts/keystore/passphrase_test.go b/accounts/keystore/passphrase_test.go index 630682cebd..1d104c448f 100644 --- a/accounts/keystore/passphrase_test.go +++ b/accounts/keystore/passphrase_test.go @@ -20,7 +20,7 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) const ( diff --git a/accounts/keystore/plain.go b/accounts/keystore/plain.go index f62a133ce1..032ccf4a39 100644 --- a/accounts/keystore/plain.go +++ b/accounts/keystore/plain.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) type keyStorePlain struct { diff --git a/accounts/keystore/plain_test.go b/accounts/keystore/plain_test.go index 32852a0add..c787afeacc 100644 --- a/accounts/keystore/plain_test.go +++ b/accounts/keystore/plain_test.go @@ -27,8 +27,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" ) func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) { diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go index 03055245f5..0526c7e92b 100644 --- a/accounts/keystore/presale.go +++ b/accounts/keystore/presale.go @@ -25,9 +25,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/crypto" "github.com/pborman/uuid" + "go-ethereum-timing/accounts" + "go-ethereum-timing/crypto" "golang.org/x/crypto/pbkdf2" ) diff --git a/accounts/keystore/wallet.go b/accounts/keystore/wallet.go index 2f774cc941..634df867cb 100644 --- a/accounts/keystore/wallet.go +++ b/accounts/keystore/wallet.go @@ -19,9 +19,9 @@ package keystore import ( "math/big" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/core/types" + ethereum "go-ethereum-timing" + "go-ethereum-timing/accounts" + "go-ethereum-timing/core/types" ) // keystoreWallet implements the accounts.Wallet interface for the original diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index bbcfb99257..7a4ca12d4a 100644 --- a/accounts/keystore/watch.go +++ b/accounts/keystore/watch.go @@ -21,8 +21,8 @@ package keystore import ( "time" - "github.com/ethereum/go-ethereum/log" "github.com/rjeczalik/notify" + "go-ethereum-timing/log" ) type watcher struct { diff --git a/accounts/manager.go b/accounts/manager.go index 96ca298fc5..0dd0e78714 100644 --- a/accounts/manager.go +++ b/accounts/manager.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/event" + "go-ethereum-timing/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 640320bc91..fade50a259 100644 --- a/accounts/usbwallet/hub.go +++ b/accounts/usbwallet/hub.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" "github.com/karalabe/hid" + "go-ethereum-timing/accounts" + "go-ethereum-timing/event" + "go-ethereum-timing/log" ) // LedgerScheme is the protocol scheme prefixing account and wallet URLs. diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go index c30903b5b7..e1358332de 100644 --- a/accounts/usbwallet/ledger.go +++ b/accounts/usbwallet/ledger.go @@ -28,12 +28,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/core/types" + "go-ethereum-timing/log" + "go-ethereum-timing/rlp" ) // ledgerOpcode is an enumeration encoding the supported Ledger opcodes. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index a9d2e9959e..d69ce3e7cd 100644 --- a/accounts/usbwallet/trezor.go +++ b/accounts/usbwallet/trezor.go @@ -27,13 +27,13 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/usbwallet/internal/trezor" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" "github.com/golang/protobuf/proto" + "go-ethereum-timing/accounts" + "go-ethereum-timing/accounts/usbwallet/internal/trezor" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/core/types" + "go-ethereum-timing/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 6cef6e0fb0..fcf5c6a462 100644 --- a/accounts/usbwallet/wallet.go +++ b/accounts/usbwallet/wallet.go @@ -25,12 +25,12 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" "github.com/karalabe/hid" + ethereum "go-ethereum-timing" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/log" ) // Maximum time between wallet health checks to detect USB unplugs. diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 9ed4f114e3..0000000000 --- a/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ -os: Visual Studio 2015 - -# Clone directly into GOPATH. -clone_folder: C:\gopath\src\github.com\ethereum\go-ethereum -clone_depth: 5 -version: "{branch}.{build}" -environment: - global: - GOPATH: C:\gopath - CC: gcc.exe - matrix: - - GETH_ARCH: amd64 - MSYS2_ARCH: x86_64 - MSYS2_BITS: 64 - MSYSTEM: MINGW64 - PATH: C:\msys64\mingw64\bin\;C:\Program Files (x86)\NSIS\;%PATH% - - GETH_ARCH: 386 - MSYS2_ARCH: i686 - MSYS2_BITS: 32 - MSYSTEM: MINGW32 - PATH: C:\msys64\mingw32\bin\;C:\Program Files (x86)\NSIS\;%PATH% - -install: - - git submodule update --init - - rmdir C:\go /s /q - - appveyor DownloadFile https://storage.googleapis.com/golang/go1.11.5.windows-%GETH_ARCH%.zip - - 7z x go1.11.5.windows-%GETH_ARCH%.zip -y -oC:\ > NUL - - go version - - gcc --version - -build_script: - - go run build\ci.go install - -after_build: - - go run build\ci.go archive -type zip -signer WINDOWS_SIGNING_KEY -upload gethstore/builds - - go run build\ci.go nsis -signer WINDOWS_SIGNING_KEY -upload gethstore/builds - -test_script: - - set CGO_ENABLED=1 - - go run build\ci.go test -coverage diff --git a/build/ci.go b/build/ci.go index 4ee76ced51..9d94c983cf 100644 --- a/build/ci.go +++ b/build/ci.go @@ -58,9 +58,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/internal/build" - "github.com/ethereum/go-ethereum/params" - sv "github.com/ethereum/go-ethereum/swarm/version" + "go-ethereum-timing/internal/build" + "go-ethereum-timing/params" + sv "go-ethereum-timing/swarm/version" ) var ( @@ -806,7 +806,7 @@ func doAndroidArchive(cmdline []string) { // Build the Android archive and Maven resources build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile", "golang.org/x/mobile/cmd/gobind")) build.MustRun(gomobileTool("init", "--ndk", os.Getenv("ANDROID_NDK"))) - build.MustRun(gomobileTool("bind", "-ldflags", "-s -w", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/ethereum/go-ethereum/mobile")) + build.MustRun(gomobileTool("bind", "-ldflags", "-s -w", "--target", "android", "--javapkg", "org.ethereum", "-v", "go-ethereum-timing/mobile")) if *local { // If we're building locally, copy bundle to build dir and skip Maven @@ -927,7 +927,7 @@ func doXCodeFramework(cmdline []string) { // Build the iOS XCode framework build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile", "golang.org/x/mobile/cmd/gobind")) build.MustRun(gomobileTool("init")) - bind := gomobileTool("bind", "-ldflags", "-s -w", "--target", "ios", "--tags", "ios", "-v", "github.com/ethereum/go-ethereum/mobile") + bind := gomobileTool("bind", "-ldflags", "-s -w", "--target", "ios", "--tags", "ios", "-v", "go-ethereum-timing/mobile") if *local { // If we're building locally, use the build folder and stop afterwards diff --git a/build/deb/ethereum-swarm/deb.control b/build/deb/ethereum-swarm/deb.control index 8cd325bf55..cab541cf4f 100644 --- a/build/deb/ethereum-swarm/deb.control +++ b/build/deb/ethereum-swarm/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), golang-1.10 Standards-Version: 3.9.5 Homepage: https://ethereum.org -Vcs-Git: git://github.com/ethereum/go-ethereum.git -Vcs-Browser: https://github.com/ethereum/go-ethereum +Vcs-Git: git://go-ethereum-timing.git +Vcs-Browser: https://go-ethereum-timing {{range .Executables}} Package: {{$.ExeName .}} diff --git a/build/deb/ethereum/deb.control b/build/deb/ethereum/deb.control index defb106fe3..193815d0a3 100644 --- a/build/deb/ethereum/deb.control +++ b/build/deb/ethereum/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), golang-1.10 Standards-Version: 3.9.5 Homepage: https://ethereum.org -Vcs-Git: git://github.com/ethereum/go-ethereum.git -Vcs-Browser: https://github.com/ethereum/go-ethereum +Vcs-Git: git://go-ethereum-timing.git +Vcs-Browser: https://go-ethereum-timing Package: {{.Name}} Architecture: any diff --git a/build/mvn.pom b/build/mvn.pom index 7670246ba9..c35bb39c16 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/ethereum/go-ethereum + https://go-ethereum-timing 2015 @@ -48,10 +48,10 @@ GitHub Issues - https://github.com/ethereum/go-ethereum/issues/ + https://go-ethereum-timing/issues/ - https://github.com/ethereum/go-ethereum + https://go-ethereum-timing diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index 57ef5a37c6..0fecc50f47 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/ethereum/go-ethereum/issues" -!define UPDATEURL "https://github.com/ethereum/go-ethereum/releases" -!define ABOUTURL "https://github.com/ethereum/go-ethereum#ethereum-go" +!define HELPURL "https://go-ethereum-timing/issues" +!define UPDATEURL "https://go-ethereum-timing/releases" +!define ABOUTURL "https://go-ethereum-timing#ethereum-go" !define /date NOW "%Y%m%d" PageEx license diff --git a/build/pod.podspec b/build/pod.podspec index 2c14c280c7..bb3dbdfc3b 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/ethereum/go-ethereum' + spec.homepage = 'https://go-ethereum-timing' spec.authors = { {{range .Contributors}} '{{.Name}}' => '{{.Email}}',{{end}} } spec.summary = 'iOS Ethereum Client' - spec.source = { :git => 'https://github.com/ethereum/go-ethereum.git', :commit => '{{.Commit}}' } + spec.source = { :git => 'https://go-ethereum-timing.git', :commit => '{{.Commit}}' } spec.platform = :ios spec.ios.deployment_target = '9.0' diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index d19164b18d..0bc015de22 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -24,8 +24,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common/compiler" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/common/compiler" ) var ( diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index 32f7d63bea..d45cb802ff 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -24,14 +24,14 @@ import ( "net" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/discover" + "go-ethereum-timing/p2p/discv5" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/nat" + "go-ethereum-timing/p2p/netutil" ) func main() { diff --git a/cmd/clef/main.go b/cmd/clef/main.go index 519d63b3c1..84751e1955 100644 --- a/cmd/clef/main.go +++ b/cmd/clef/main.go @@ -35,17 +35,17 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/rules" - "github.com/ethereum/go-ethereum/signer/storage" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/common" + "go-ethereum-timing/console" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/rpc" + "go-ethereum-timing/signer/core" + "go-ethereum-timing/signer/rules" + "go-ethereum-timing/signer/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/clef/tutorial.md b/cmd/clef/tutorial.md index dfb31ba4ef..2804ccff8f 100644 --- a/cmd/clef/tutorial.md +++ b/cmd/clef/tutorial.md @@ -53,7 +53,7 @@ INFO [02-21|12:14:38] Ruleset attestation updated sha256=6c21d17374 ...and (this is required only for non-production versions) load a mock-up `4byte.json` by copying the file from the source to your current working directory: ```text -#cp $GOPATH/src/github.com/ethereum/go-ethereum/cmd/clef/4byte.json $PWD +#cp $GOPATH/src/go-ethereum-timing/cmd/clef/4byte.json $PWD ``` At this point, we can start the signer with the rule-file: diff --git a/cmd/ethkey/changepassphrase.go b/cmd/ethkey/changepassphrase.go index d1ae2ae0d8..b598641255 100644 --- a/cmd/ethkey/changepassphrase.go +++ b/cmd/ethkey/changepassphrase.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go index fe9a0c1519..d717ccfb44 100644 --- a/cmd/ethkey/generate.go +++ b/cmd/ethkey/generate.go @@ -23,10 +23,10 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" "github.com/pborman/uuid" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go index ba03d4d936..fbea396e12 100644 --- a/cmd/ethkey/inspect.go +++ b/cmd/ethkey/inspect.go @@ -21,9 +21,9 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index c434da0c05..264c0980bf 100644 --- a/cmd/ethkey/main.go +++ b/cmd/ethkey/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" + "go-ethereum-timing/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go index 5caea69ff6..908605f5d4 100644 --- a/cmd/ethkey/message.go +++ b/cmd/ethkey/message.go @@ -21,10 +21,10 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go index 6006f6b5bb..ef37159e6b 100644 --- a/cmd/ethkey/run_test.go +++ b/cmd/ethkey/run_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" + "go-ethereum-timing/internal/cmdtest" ) type testEthkey struct { diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go index 6f60ebaf1b..68d5364771 100644 --- a/cmd/ethkey/utils.go +++ b/cmd/ethkey/utils.go @@ -22,9 +22,9 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/console" + "go-ethereum-timing/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index c019a2fe70..4aec6a24aa 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -21,7 +21,7 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" + "go-ethereum-timing/cmd/evm/internal/compiler" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index 69f611e39b..cef17430df 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/core/asm" + "go-ethereum-timing/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 753ca62264..5e20a62741 100644 --- a/cmd/evm/internal/compiler/compiler.go +++ b/cmd/evm/internal/compiler/compiler.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/core/asm" + "go-ethereum-timing/core/asm" ) func Compile(fn string, src []byte, debug bool) (string, error) { diff --git a/cmd/evm/main.go b/cmd/evm/main.go index a59cb1fb84..3f93e0ff9d 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -22,7 +22,7 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/cmd/utils" + "go-ethereum-timing/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index 54b67ce101..c524fdbc72 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -27,16 +27,16 @@ import ( "runtime/pprof" "time" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/core/vm/runtime" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/cmd/evm/internal/compiler" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/core/vm/runtime" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/log" + "go-ethereum-timing/params" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index b3c69d9b9d..956e1a0b4e 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -23,10 +23,10 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/tests" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/log" + "go-ethereum-timing/tests" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index a7c20db773..1f095f5025 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -41,23 +41,23 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/accounts" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/types" + "go-ethereum-timing/eth" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/ethclient" + "go-ethereum-timing/ethstats" + "go-ethereum-timing/les" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/discv5" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/nat" + "go-ethereum-timing/params" "golang.org/x/net/websocket" ) @@ -449,7 +449,7 @@ func (f *faucet) apiHandler(conn *websocket.Conn) { case *noauthFlag: username, avatar, address, err = authNoAuth(msg.URL) default: - err = errors.New("Something funky happened, please open an issue at https://github.com/ethereum/go-ethereum/issues") + err = errors.New("Something funky happened, please open an issue at https://go-ethereum-timing/issues") } if err != nil { if err = sendError(conn, err); err != nil { diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go index 071be85397..6c355dd804 100644 --- a/cmd/geth/accountcmd.go +++ b/cmd/geth/accountcmd.go @@ -20,12 +20,12 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/accounts" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/console" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go index 3ea22ccfab..d14e9e7d6d 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/ethereum/go-ethereum/issues/1785 +// https://go-ethereum-timing/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 0adc69d1fa..8b7eb74834 100644 --- a/cmd/geth/bugcmd.go +++ b/cmd/geth/bugcmd.go @@ -26,10 +26,10 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/cmd/internal/browser" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/cmd/internal/browser" + "go-ethereum-timing/params" - "github.com/ethereum/go-ethereum/cmd/utils" + "go-ethereum-timing/cmd/utils" cli "gopkg.in/urfave/cli.v1" ) @@ -41,7 +41,7 @@ var bugCommand = cli.Command{ Category: "MISCELLANEOUS COMMANDS", } -const issueURL = "https://github.com/ethereum/go-ethereum/issues/new" +const issueURL = "https://go-ethereum-timing/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 562c7e0dee..0644d4c93c 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -25,18 +25,18 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" "github.com/syndtr/goleveldb/leveldb/util" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/common" + "go-ethereum-timing/console" + "go-ethereum-timing/core" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/trie" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index f1e2811966..d5f76dce02 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -27,13 +27,13 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/dashboard" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" "github.com/naoina/toml" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/dashboard" + "go-ethereum-timing/eth" + "go-ethereum-timing/node" + "go-ethereum-timing/params" + whisper "go-ethereum-timing/whisper/whisperv6" ) var ( diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index 2500a969cf..9fe7e2dfd6 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -24,10 +24,10 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/console" + "go-ethereum-timing/node" + "go-ethereum-timing/rpc" "gopkg.in/urfave/cli.v1" ) @@ -43,7 +43,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/ethereum/go-ethereum/wiki/JavaScript-Console.`, +See https://go-ethereum-timing/wiki/JavaScript-Console.`, } attachCommand = cli.Command{ @@ -56,7 +56,7 @@ See https://github.com/ethereum/go-ethereum/wiki/JavaScript-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/ethereum/go-ethereum/wiki/JavaScript-Console. +See https://go-ethereum-timing/wiki/JavaScript-Console. This command allows to open a console on a running geth node.`, } @@ -69,7 +69,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/ethereum/go-ethereum/wiki/JavaScript-Console`, +JavaScript API. See https://go-ethereum-timing/wiki/JavaScript-Console`, } ) diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index 34ba877020..9317340620 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/params" ) const ( diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go index 52983ff2af..97ebd5e291 100644 --- a/cmd/geth/dao_test.go +++ b/cmd/geth/dao_test.go @@ -23,10 +23,10 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/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 e60a27e43e..9222146207 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -19,6 +19,7 @@ package main import ( "fmt" + "go-ethereum-timing/log2" "math" "os" godebug "runtime/debug" @@ -28,17 +29,17 @@ import ( "time" "github.com/elastic/gosigar" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" - cli "gopkg.in/urfave/cli.v1" + "go-ethereum-timing/accounts" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/console" + "go-ethereum-timing/eth" + "go-ethereum-timing/ethclient" + "go-ethereum-timing/internal/debug" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/node" + "gopkg.in/urfave/cli.v1" ) const ( @@ -167,6 +168,10 @@ var ( utils.MetricsInfluxDBPasswordFlag, utils.MetricsInfluxDBTagsFlag, } + + timingFlags = []cli.Flag{ + utils.TimingOutputFlag, + } ) func init() { @@ -210,6 +215,7 @@ func init() { app.Flags = append(app.Flags, debug.Flags...) app.Flags = append(app.Flags, whisperFlags...) app.Flags = append(app.Flags, metricsFlags...) + app.Flags = append(app.Flags, timingFlags...) app.Before = func(ctx *cli.Context) error { logdir := "" @@ -265,6 +271,9 @@ func geth(ctx *cli.Context) error { if args := ctx.Args(); len(args) > 0 { return fmt.Errorf("invalid command: %q", args[0]) } + + log2.InitOutputFile(ctx.String(utils.TimingOutputFlag.Name)) + node := makeFullNode(ctx) startNode(ctx, node) node.Wait() diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index f62e254786..abdbfb1733 100644 --- a/cmd/geth/misccmd.go +++ b/cmd/geth/misccmd.go @@ -23,10 +23,10 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/eth" + "go-ethereum-timing/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/monitorcmd.go b/cmd/geth/monitorcmd.go index e4ba96a7a6..53d49b13d1 100644 --- a/cmd/geth/monitorcmd.go +++ b/cmd/geth/monitorcmd.go @@ -25,10 +25,10 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" "github.com/gizak/termui" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/node" + "go-ethereum-timing/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/run_test.go b/cmd/geth/run_test.go index da82facac3..5f66f219b1 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/ethereum/go-ethereum/internal/cmdtest" + "go-ethereum-timing/internal/cmdtest" ) func tmpdir(t *testing.T) string { diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index 6823aa36c2..26de3abc43 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -24,8 +24,8 @@ import ( "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/internal/debug" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/internal/debug" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index f2c1bf9703..f2af517c0b 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -45,12 +45,12 @@ import ( "strings" "text/tabwriter" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go index ae7675cd9b..5ee9fccb6f 100644 --- a/cmd/puppeth/genesis.go +++ b/cmd/puppeth/genesis.go @@ -23,12 +23,12 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - math2 "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + math2 "go-ethereum-timing/common/math" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/params" ) // alethGenesisSpec represents the genesis specification format used by the diff --git a/cmd/puppeth/genesis_test.go b/cmd/puppeth/genesis_test.go index 83e7383605..c001f66ec6 100644 --- a/cmd/puppeth/genesis_test.go +++ b/cmd/puppeth/genesis_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/core" + "go-ethereum-timing/core" ) // Tests the go-ethereum to Aleth chainspec conversion for the Stureby testnet. diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go index b6a029a01a..0e7078622f 100644 --- a/cmd/puppeth/module.go +++ b/cmd/puppeth/module.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) var ( diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 9a77587b4a..026f617063 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) // dashboardContent is the actual dashboard HTML content to serve up when users @@ -256,7 +256,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.*;
@@ -287,7 +287,7 @@ node.start();

Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for ObjC/Swift based iOS projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from iOS too.

Under the hood the iOS library is backed by a go-ethereum light node, meaning that given a not-too-old Apple device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.


-

Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework. +

Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework.

Before connecting to the Ethereum network, download the {{.GethGenesis}} genesis json file and either store it in your iOS project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.

Inside your Swift code you can now import the geth framework and connect to Ethereum (ObjC should be analogous): 

import Geth
@@ -419,7 +419,7 @@ try! node?.start();

Puppeth is a tool to aid you in creating a new Ethereum network down to the genesis block, bootnodes, signers, ethstats server, crypto faucet, wallet browsers, block explorer, dashboard and more; without the hassle that it would normally entail to manually configure all these services one by one.

Puppeth uses ssh to dial in to remote servers, and builds its network components out of docker containers using docker-compose. The user is guided through the process via a command line wizard that does the heavy lifting and topology configuration automatically behind the scenes.


-

Puppeth is distributed as part of the Geth & Tools bundles, but can also be installed separately via:

go get github.com/ethereum/go-ethereum/cmd/puppeth

+

Puppeth is distributed as part of the Geth & Tools bundles, but can also be installed separately via:

go get go-ethereum-timing/cmd/puppeth


Copyright 2017. The go-ethereum Authors.

diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index 58ecb83951..0c4226db14 100644 --- a/cmd/puppeth/module_ethstats.go +++ b/cmd/puppeth/module_ethstats.go @@ -25,7 +25,7 @@ import ( "strings" "text/template" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) // ethstatsDockerfile is the Dockerfile required to build an ethstats backend diff --git a/cmd/puppeth/module_explorer.go b/cmd/puppeth/module_explorer.go index e465fa04ad..42c61a8e57 100644 --- a/cmd/puppeth/module_explorer.go +++ b/cmd/puppeth/module_explorer.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) // explorerDockerfile is the Dockerfile required to run a block explorer. diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go index 3a06bf3c68..27ab42d392 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -26,8 +26,8 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/log" ) // faucetDockerfile is the Dockerfile required to build a faucet container to diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go index 1b1ae61ff5..67578425bd 100644 --- a/cmd/puppeth/module_nginx.go +++ b/cmd/puppeth/module_nginx.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strconv" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/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 5d9ef46523..6b836371ec 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -26,8 +26,8 @@ import ( "strings" "text/template" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/log" ) // nodeDockerfile is the Dockerfile required to run an Ethereum node. diff --git a/cmd/puppeth/module_wallet.go b/cmd/puppeth/module_wallet.go index ebaa5b6ae1..3e87ff9e61 100644 --- a/cmd/puppeth/module_wallet.go +++ b/cmd/puppeth/module_wallet.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) // walletDockerfile is the Dockerfile required to run a web wallet. diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index c3de5f9360..f558b6fb74 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index c507596065..e59ed3c97c 100644 --- a/cmd/puppeth/ssh.go +++ b/cmd/puppeth/ssh.go @@ -28,7 +28,7 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/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 83536506c4..7be5ac2853 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -31,9 +31,9 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index 8a8370845b..6d7885b9d9 100644 --- a/cmd/puppeth/wizard_dashboard.go +++ b/cmd/puppeth/wizard_dashboard.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/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 58ff3efbe9..b9486a6a11 100644 --- a/cmd/puppeth/wizard_ethstats.go +++ b/cmd/puppeth/wizard_ethstats.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) // deployEthstats queries the user for various input on deploying an ethstats diff --git a/cmd/puppeth/wizard_explorer.go b/cmd/puppeth/wizard_explorer.go index a128fb9fb5..343a49ecf7 100644 --- a/cmd/puppeth/wizard_explorer.go +++ b/cmd/puppeth/wizard_explorer.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) // deployExplorer creates a new block explorer based on some user input. diff --git a/cmd/puppeth/wizard_faucet.go b/cmd/puppeth/wizard_faucet.go index 9068c1d30b..7f8a68f3d9 100644 --- a/cmd/puppeth/wizard_faucet.go +++ b/cmd/puppeth/wizard_faucet.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/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 6aed09f141..8ef2728c4c 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -29,10 +29,10 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/log" + "go-ethereum-timing/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 75fb04b76f..cfa39fbe26 100644 --- a/cmd/puppeth/wizard_intro.go +++ b/cmd/puppeth/wizard_intro.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index 99ca11bb17..86696f64c6 100644 --- a/cmd/puppeth/wizard_netstats.go +++ b/cmd/puppeth/wizard_netstats.go @@ -23,9 +23,9 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" "github.com/olekukonko/tablewriter" + "go-ethereum-timing/core" + "go-ethereum-timing/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 83b10cf375..c899d31c4d 100644 --- a/cmd/puppeth/wizard_network.go +++ b/cmd/puppeth/wizard_network.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/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 8397b7fd57..e4ce8e0a8a 100644 --- a/cmd/puppeth/wizard_nginx.go +++ b/cmd/puppeth/wizard_nginx.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/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 e37297f6d6..5fc9fd7232 100644 --- a/cmd/puppeth/wizard_node.go +++ b/cmd/puppeth/wizard_node.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/common" + "go-ethereum-timing/log" ) // deployNode creates a new node configuration based on some user input. diff --git a/cmd/puppeth/wizard_wallet.go b/cmd/puppeth/wizard_wallet.go index ca1ea5bd25..41a3b35283 100644 --- a/cmd/puppeth/wizard_wallet.go +++ b/cmd/puppeth/wizard_wallet.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) // deployWallet creates a new web wallet based on some user input. diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index d0f993c5b8..a9a8813712 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -26,7 +26,7 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/rlp" ) var ( diff --git a/cmd/swarm/access.go b/cmd/swarm/access.go index 072541b659..9d3ed84fee 100644 --- a/cmd/swarm/access.go +++ b/cmd/swarm/access.go @@ -23,9 +23,9 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/api/client" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/swarm/api" + "go-ethereum-timing/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/access_test.go b/cmd/swarm/access_test.go index 967ef27424..b32fd8193e 100644 --- a/cmd/swarm/access_test.go +++ b/cmd/swarm/access_test.go @@ -31,12 +31,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - swarmapi "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/testutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/crypto/ecies" + "go-ethereum-timing/log" + "go-ethereum-timing/swarm/api" + swarmapi "go-ethereum-timing/swarm/api/client" + "go-ethereum-timing/swarm/testutil" "golang.org/x/crypto/sha3" ) diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go index 98d4dee7b9..976c1b8b40 100644 --- a/cmd/swarm/config.go +++ b/cmd/swarm/config.go @@ -29,13 +29,13 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" "github.com/naoina/toml" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/common" + "go-ethereum-timing/log" + "go-ethereum-timing/node" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" + bzzapi "go-ethereum-timing/swarm/api" ) var ( @@ -97,7 +97,7 @@ var tomlSettings = toml.Config{ MissingField: func(rt reflect.Type, field string) error { link := "" if unicode.IsUpper(rune(rt.Name()[0])) && rt.PkgPath() != "main" { - link = fmt.Sprintf(", check github.com/ethereum/go-ethereum/swarm/api/config.go for available fields") + link = fmt.Sprintf(", check go-ethereum-timing/swarm/api/config.go for available fields") } return fmt.Errorf("field '%s' is not defined in %s%s", field, rt.String(), link) }, diff --git a/cmd/swarm/config_test.go b/cmd/swarm/config_test.go index 18be316e5f..33633500d5 100644 --- a/cmd/swarm/config_test.go +++ b/cmd/swarm/config_test.go @@ -27,10 +27,10 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm" - "github.com/ethereum/go-ethereum/swarm/api" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm" + "go-ethereum-timing/swarm/api" ) func TestConfigDump(t *testing.T) { diff --git a/cmd/swarm/db.go b/cmd/swarm/db.go index 7916beffce..bd914fdf59 100644 --- a/cmd/swarm/db.go +++ b/cmd/swarm/db.go @@ -22,10 +22,10 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/common" + "go-ethereum-timing/log" + "go-ethereum-timing/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/download.go b/cmd/swarm/download.go index fcbefa0206..5b02ca77f3 100644 --- a/cmd/swarm/download.go +++ b/cmd/swarm/download.go @@ -21,10 +21,10 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/log" + "go-ethereum-timing/swarm/api" + swarm "go-ethereum-timing/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/explore.go b/cmd/swarm/explore.go index 5b5b8bf41f..f58e0e8640 100644 --- a/cmd/swarm/explore.go +++ b/cmd/swarm/explore.go @@ -22,8 +22,8 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/export_test.go b/cmd/swarm/export_test.go index e8671eea79..1c310571e9 100644 --- a/cmd/swarm/export_test.go +++ b/cmd/swarm/export_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/swarm" - "github.com/ethereum/go-ethereum/swarm/testutil" + "go-ethereum-timing/swarm" + "go-ethereum-timing/swarm/testutil" ) // TestCLISwarmExportImport perform the following test: diff --git a/cmd/swarm/feeds.go b/cmd/swarm/feeds.go index 6cd971a92c..5569cbe1f6 100644 --- a/cmd/swarm/feeds.go +++ b/cmd/swarm/feeds.go @@ -21,13 +21,13 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" - "github.com/ethereum/go-ethereum/cmd/utils" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/storage/feed" + "go-ethereum-timing/cmd/utils" + swarm "go-ethereum-timing/swarm/api/client" + "go-ethereum-timing/swarm/storage/feed" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/feeds_test.go b/cmd/swarm/feeds_test.go index 4c40f62a82..04f0df4fd6 100644 --- a/cmd/swarm/feeds_test.go +++ b/cmd/swarm/feeds_test.go @@ -23,15 +23,15 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - swarmhttp "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/storage/feed" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" - "github.com/ethereum/go-ethereum/swarm/testutil" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/swarm/api" + swarm "go-ethereum-timing/swarm/api/client" + swarmhttp "go-ethereum-timing/swarm/api/http" + "go-ethereum-timing/swarm/storage/feed" + "go-ethereum-timing/swarm/storage/feed/lookup" + "go-ethereum-timing/swarm/testutil" ) func TestCLIFeedUpdate(t *testing.T) { diff --git a/cmd/swarm/fs.go b/cmd/swarm/fs.go index edeeddff84..c7c216345e 100644 --- a/cmd/swarm/fs.go +++ b/cmd/swarm/fs.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/fuse" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/log" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm/fuse" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/fs_test.go b/cmd/swarm/fs_test.go index 5f58d6c0d8..1cebe984f2 100644 --- a/cmd/swarm/fs_test.go +++ b/cmd/swarm/fs_test.go @@ -29,8 +29,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/log" ) type testFile struct { diff --git a/cmd/swarm/global-store/global_store.go b/cmd/swarm/global-store/global_store.go index a55756e1c4..e9ed86b8d0 100644 --- a/cmd/swarm/global-store/global_store.go +++ b/cmd/swarm/global-store/global_store.go @@ -21,11 +21,11 @@ import ( "net/http" "os" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/storage/mock" - "github.com/ethereum/go-ethereum/swarm/storage/mock/db" - "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" + "go-ethereum-timing/log" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm/storage/mock" + "go-ethereum-timing/swarm/storage/mock/db" + "go-ethereum-timing/swarm/storage/mock/mem" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/global-store/global_store_test.go b/cmd/swarm/global-store/global_store_test.go index 85f361ed4f..4fd853c807 100644 --- a/cmd/swarm/global-store/global_store_test.go +++ b/cmd/swarm/global-store/global_store_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" - mockRPC "github.com/ethereum/go-ethereum/swarm/storage/mock/rpc" + "go-ethereum-timing/common" + "go-ethereum-timing/rpc" + mockRPC "go-ethereum-timing/swarm/storage/mock/rpc" ) // TestHTTP_InMemory tests in-memory global store that exposes diff --git a/cmd/swarm/global-store/main.go b/cmd/swarm/global-store/main.go index 51df0099ac..f6a06cb35b 100644 --- a/cmd/swarm/global-store/main.go +++ b/cmd/swarm/global-store/main.go @@ -19,8 +19,8 @@ package main import ( "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/log" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/global-store/run_test.go b/cmd/swarm/global-store/run_test.go index d7ef626e55..0700275cf6 100644 --- a/cmd/swarm/global-store/run_test.go +++ b/cmd/swarm/global-store/run_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" + "go-ethereum-timing/internal/cmdtest" ) func init() { diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go index 471feb53d6..df06ce1764 100644 --- a/cmd/swarm/hash.go +++ b/cmd/swarm/hash.go @@ -22,8 +22,8 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go index 5d35154a57..826b0d96de 100644 --- a/cmd/swarm/list.go +++ b/cmd/swarm/list.go @@ -22,8 +22,8 @@ import ( "strings" "text/tabwriter" - "github.com/ethereum/go-ethereum/cmd/utils" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "go-ethereum-timing/cmd/utils" + swarm "go-ethereum-timing/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 3053ea1b3b..4f380b7cfe 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -29,24 +29,24 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" - swarmmetrics "github.com/ethereum/go-ethereum/swarm/metrics" - "github.com/ethereum/go-ethereum/swarm/storage/mock" - mockrpc "github.com/ethereum/go-ethereum/swarm/storage/mock/rpc" - "github.com/ethereum/go-ethereum/swarm/tracing" - sv "github.com/ethereum/go-ethereum/swarm/version" + "go-ethereum-timing/accounts" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/common" + "go-ethereum-timing/console" + "go-ethereum-timing/crypto" + "go-ethereum-timing/internal/debug" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm" + bzzapi "go-ethereum-timing/swarm/api" + swarmmetrics "go-ethereum-timing/swarm/metrics" + "go-ethereum-timing/swarm/storage/mock" + mockrpc "go-ethereum-timing/swarm/storage/mock/rpc" + "go-ethereum-timing/swarm/tracing" + sv "go-ethereum-timing/swarm/version" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go index 312c72fa21..5df064efaa 100644 --- a/cmd/swarm/manifest.go +++ b/cmd/swarm/manifest.go @@ -22,9 +22,9 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/swarm/api" + swarm "go-ethereum-timing/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest_test.go b/cmd/swarm/manifest_test.go index 01d982aa7a..c997491173 100644 --- a/cmd/swarm/manifest_test.go +++ b/cmd/swarm/manifest_test.go @@ -24,9 +24,9 @@ import ( "runtime" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - swarmhttp "github.com/ethereum/go-ethereum/swarm/api/http" + "go-ethereum-timing/swarm/api" + swarm "go-ethereum-timing/swarm/api/client" + swarmhttp "go-ethereum-timing/swarm/api/http" ) // TestManifestChange tests manifest add, update and remove diff --git a/cmd/swarm/mimegen/generator.go b/cmd/swarm/mimegen/generator.go index 68f9e306e5..157d410288 100644 --- a/cmd/swarm/mimegen/generator.go +++ b/cmd/swarm/mimegen/generator.go @@ -101,7 +101,7 @@ func main() { } } -var tpl = `// Code generated by github.com/ethereum/go-ethereum/cmd/swarm/mimegen. DO NOT EDIT. +var tpl = `// Code generated by go-ethereum-timing/cmd/swarm/mimegen. DO NOT EDIT. package {{ .PackageName }} diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index 4a6a56d9b8..8cd32cb647 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -33,15 +33,15 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm" - "github.com/ethereum/go-ethereum/swarm/api" - swarmhttp "github.com/ethereum/go-ethereum/swarm/api/http" + "go-ethereum-timing/accounts" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/internal/cmdtest" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm" + "go-ethereum-timing/swarm/api" + swarmhttp "go-ethereum-timing/swarm/api/http" ) var loglevel = flag.Int("loglevel", 3, "verbosity of logs") diff --git a/cmd/swarm/swarm-smoke/feed_upload_and_sync.go b/cmd/swarm/swarm-smoke/feed_upload_and_sync.go index 6b3fed0c7e..57e466bb7b 100644 --- a/cmd/swarm/swarm-smoke/feed_upload_and_sync.go +++ b/cmd/swarm/swarm-smoke/feed_upload_and_sync.go @@ -12,13 +12,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/storage/feed" - "github.com/ethereum/go-ethereum/swarm/testutil" "github.com/pborman/uuid" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/swarm/storage/feed" + "go-ethereum-timing/swarm/testutil" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-smoke/main.go b/cmd/swarm/swarm-smoke/main.go index 43d2c1ff51..2a9b72bd46 100644 --- a/cmd/swarm/swarm-smoke/main.go +++ b/cmd/swarm/swarm-smoke/main.go @@ -21,13 +21,13 @@ import ( "os" "sort" - "github.com/ethereum/go-ethereum/cmd/utils" - gethmetrics "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" - swarmmetrics "github.com/ethereum/go-ethereum/swarm/metrics" - "github.com/ethereum/go-ethereum/swarm/tracing" + "go-ethereum-timing/cmd/utils" + gethmetrics "go-ethereum-timing/metrics" + "go-ethereum-timing/metrics/influxdb" + swarmmetrics "go-ethereum-timing/swarm/metrics" + "go-ethereum-timing/swarm/tracing" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-smoke/sliding_window.go b/cmd/swarm/swarm-smoke/sliding_window.go index d313bbc37a..1e0d841b4b 100644 --- a/cmd/swarm/swarm-smoke/sliding_window.go +++ b/cmd/swarm/swarm-smoke/sliding_window.go @@ -22,10 +22,10 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/testutil" "github.com/pborman/uuid" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/swarm/testutil" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-smoke/upload_and_sync.go b/cmd/swarm/swarm-smoke/upload_and_sync.go index 90230df253..bdd494573e 100644 --- a/cmd/swarm/swarm-smoke/upload_and_sync.go +++ b/cmd/swarm/swarm-smoke/upload_and_sync.go @@ -26,13 +26,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" "github.com/pborman/uuid" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm/api" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/testutil" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-smoke/upload_speed.go b/cmd/swarm/swarm-smoke/upload_speed.go index 20bf7b86ca..a78763db90 100644 --- a/cmd/swarm/swarm-smoke/upload_speed.go +++ b/cmd/swarm/swarm-smoke/upload_speed.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/testutil" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/swarm/testutil" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-smoke/util.go b/cmd/swarm/swarm-smoke/util.go index 87abb44b0b..a29dcd644c 100644 --- a/cmd/swarm/swarm-smoke/util.go +++ b/cmd/swarm/swarm-smoke/util.go @@ -32,13 +32,13 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/spancontext" opentracing "github.com/opentracing/opentracing-go" "github.com/pborman/uuid" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/swarm/api" + "go-ethereum-timing/swarm/api/client" + "go-ethereum-timing/swarm/spancontext" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-snapshot/create.go b/cmd/swarm/swarm-snapshot/create.go index 127fde8ae2..5100152dff 100644 --- a/cmd/swarm/swarm-snapshot/create.go +++ b/cmd/swarm/swarm-snapshot/create.go @@ -29,12 +29,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/network/simulation" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-snapshot/create_test.go b/cmd/swarm/swarm-snapshot/create_test.go index c9445168d8..59f6758ee6 100644 --- a/cmd/swarm/swarm-snapshot/create_test.go +++ b/cmd/swarm/swarm-snapshot/create_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/p2p/simulations" + "go-ethereum-timing/p2p/simulations" ) // TestSnapshotCreate is a high level e2e test that tests for snapshot generation. diff --git a/cmd/swarm/swarm-snapshot/main.go b/cmd/swarm/swarm-snapshot/main.go index 184727e4d7..95ae6e33db 100644 --- a/cmd/swarm/swarm-snapshot/main.go +++ b/cmd/swarm/swarm-snapshot/main.go @@ -19,8 +19,8 @@ package main import ( "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/log" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-snapshot/run_test.go b/cmd/swarm/swarm-snapshot/run_test.go index d9a041597e..108af50ed6 100644 --- a/cmd/swarm/swarm-snapshot/run_test.go +++ b/cmd/swarm/swarm-snapshot/run_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" + "go-ethereum-timing/internal/cmdtest" ) func init() { diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go index 992f2d6e97..a104f2585c 100644 --- a/cmd/swarm/upload.go +++ b/cmd/swarm/upload.go @@ -29,10 +29,10 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "go-ethereum-timing/log" + swarm "go-ethereum-timing/swarm/api/client" - "github.com/ethereum/go-ethereum/cmd/utils" + "go-ethereum-timing/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/upload_test.go b/cmd/swarm/upload_test.go index 616486e37c..a5b11743c2 100644 --- a/cmd/swarm/upload_test.go +++ b/cmd/swarm/upload_test.go @@ -30,10 +30,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - swarmapi "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/testutil" "github.com/mattn/go-colorable" + "go-ethereum-timing/log" + swarmapi "go-ethereum-timing/swarm/api/client" + "go-ethereum-timing/swarm/testutil" ) func init() { diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index f23aa5775b..7ed78592cb 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -27,16 +27,16 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/internal/debug" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index e5bf8724c1..046949b0f3 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -27,7 +27,7 @@ import ( "path" "strings" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 55e84b8765..2ebcc90198 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -28,35 +28,35 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/dashboard" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "go-ethereum-timing/accounts" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/common" + "go-ethereum-timing/common/fdlimit" + "go-ethereum-timing/consensus" + "go-ethereum-timing/consensus/clique" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/dashboard" + "go-ethereum-timing/eth" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/eth/gasprice" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/ethstats" + "go-ethereum-timing/les" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/metrics/influxdb" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/discv5" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/nat" + "go-ethereum-timing/p2p/netutil" + "go-ethereum-timing/params" + whisper "go-ethereum-timing/whisper/whisperv6" cli "gopkg.in/urfave/cli.v1" ) @@ -638,6 +638,13 @@ var ( Usage: "External EVM configuration (default = built-in interpreter)", Value: "", } + + //Timing flag + TimingOutputFlag = cli.StringFlag{ + Name: "timing.output", + Usage: "The output file of timing.", + Value: "", + } ) // MakeDataDir retrieves the currently requested data directory, terminating diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go index 97e5852013..da0e23083d 100644 --- a/cmd/wnode/main.go +++ b/cmd/wnode/main.go @@ -35,16 +35,16 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/whisper/mailserver" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/common" + "go-ethereum-timing/console" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/nat" + "go-ethereum-timing/whisper/mailserver" + whisper "go-ethereum-timing/whisper/whisperv6" "golang.org/x/crypto/pbkdf2" ) diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index 13a13011dc..37f85190a0 100644 --- a/common/bitutil/compress_test.go +++ b/common/bitutil/compress_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/debug.go b/common/debug.go index 61acd8ce70..3f92c4e513 100644 --- a/common/debug.go +++ b/common/debug.go @@ -26,7 +26,7 @@ import ( // Report gives off a warning requesting the user to submit an issue to the github tracker. func Report(extra ...interface{}) { - fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/ethereum/go-ethereum/issues") + fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://go-ethereum-timing/issues") fmt.Fprintln(os.Stderr, extra...) _, file, line, _ := runtime.Caller(1) diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go index 80180d9186..6ddc98bd7b 100644 --- a/common/hexutil/json_example_test.go +++ b/common/hexutil/json_example_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index be9810dc8c..4eccb562c8 100644 --- a/common/math/big_test.go +++ b/common/math/big_test.go @@ -22,7 +22,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/types.go b/common/types.go index 0f4892d287..65edca83ce 100644 --- a/common/types.go +++ b/common/types.go @@ -26,7 +26,7 @@ import ( "reflect" "strings" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common/hexutil" "golang.org/x/crypto/sha3" ) diff --git a/consensus/clique/api.go b/consensus/clique/api.go index 6bcf987af5..1a419bd585 100644 --- a/consensus/clique/api.go +++ b/consensus/clique/api.go @@ -17,10 +17,10 @@ package clique import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus" + "go-ethereum-timing/core/types" + "go-ethereum-timing/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 c79c30caed..97f57df9d2 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -25,20 +25,20 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" lru "github.com/hashicorp/golang-lru" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/consensus" + "go-ethereum-timing/consensus/misc" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/log" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" + "go-ethereum-timing/rpc" "golang.org/x/crypto/sha3" ) diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index 54d4555f3b..a2b9e44c72 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -21,11 +21,11 @@ import ( "encoding/json" "sort" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" lru "github.com/hashicorp/golang-lru" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/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 41dae1426f..fc30c37083 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -22,13 +22,13 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" ) // testerAccountPool is a pool to maintain currently active tester accounts, @@ -363,7 +363,7 @@ func TestClique(t *testing.T) { failure: errRecentlySigned, }, { // Recent signatures should not reset on checkpoint blocks imported in a new - // batch (https://github.com/ethereum/go-ethereum/issues/17593). Whilst this + // batch (https://go-ethereum-timing/issues/17593). Whilst this // seems overly specific and weird, it was a Rinkeby consensus split. epoch: 3, signers: []string{"A", "B", "C"}, diff --git a/consensus/consensus.go b/consensus/consensus.go index 487b07be77..70a891810b 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -20,11 +20,11 @@ package consensus import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/common" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/params" + "go-ethereum-timing/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 d6c871092e..5b73b5faaa 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -27,10 +27,10 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/common/bitutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" "golang.org/x/crypto/sha3" ) diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index c58479e289..87ff587e94 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -26,9 +26,9 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/core/types" ) // prepare converts an ethash cache or dataset from a byte stream into the internal diff --git a/consensus/ethash/api.go b/consensus/ethash/api.go index 4d8eed4161..043a6b68a4 100644 --- a/consensus/ethash/api.go +++ b/consensus/ethash/api.go @@ -19,9 +19,9 @@ package ethash import ( "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/core/types" ) var errEthashStopped = errors.New("ethash stopped") diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index 62e3f8fca9..cec03db8cb 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -25,14 +25,14 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/consensus" + "go-ethereum-timing/consensus/misc" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" "golang.org/x/crypto/sha3" ) diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index 438a99dd66..5899fe24ab 100644 --- a/consensus/ethash/consensus_test.go +++ b/consensus/ethash/consensus_test.go @@ -23,9 +23,9 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common/math" + "go-ethereum-timing/core/types" + "go-ethereum-timing/params" ) type diffTest struct { diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index 78892e1da8..07ef670239 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -34,13 +34,13 @@ import ( "unsafe" mmap "github.com/edsrzf/mmap-go" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rpc" "github.com/hashicorp/golang-lru/simplelru" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus" + "go-ethereum-timing/core/types" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/rpc" ) var ErrInvalidDumpMagic = errors.New("invalid dump magic") diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index 90cb6470f7..17b604a617 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/core/types" ) // Tests that ethash works correctly in test mode. @@ -55,7 +55,7 @@ func TestTestMode(t *testing.T) { } // This test checks that cache lru logic doesn't crash under load. -// It reproduces https://github.com/ethereum/go-ethereum/issues/14943 +// It reproduces https://go-ethereum-timing/issues/14943 func TestCacheFileEvict(t *testing.T) { tmpdir, err := ioutil.TempDir("", "ethash-test") if err != nil { diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go index 3a0919ca99..b856df63de 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -29,11 +29,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/consensus" + "go-ethereum-timing/core/types" + "go-ethereum-timing/log" ) const ( diff --git a/consensus/ethash/sealer_test.go b/consensus/ethash/sealer_test.go index 436359af7c..1e32ff2be6 100644 --- a/consensus/ethash/sealer_test.go +++ b/consensus/ethash/sealer_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" ) // Tests whether remote HTTP servers are correctly notified of new work. diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index 9b22bd7a52..5c03c3c156 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/params" ) var ( diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go index 4a5e7c37e0..a26b10b485 100644 --- a/consensus/misc/forks.go +++ b/consensus/misc/forks.go @@ -19,9 +19,9 @@ package misc import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/params" ) // VerifyForkHashes verifies that blocks conforming to network hard-forks do have diff --git a/console/bridge.go b/console/bridge.go index b0b4d37985..70cff8bcff 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" "github.com/robertkrimen/otto" + "go-ethereum-timing/accounts/usbwallet" + "go-ethereum-timing/log" + "go-ethereum-timing/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 3c397f8006..6b6eaffe79 100644 --- a/console/console.go +++ b/console/console.go @@ -28,12 +28,12 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/internal/web3ext" - "github.com/ethereum/go-ethereum/rpc" "github.com/mattn/go-colorable" "github.com/peterh/liner" "github.com/robertkrimen/otto" + "go-ethereum-timing/internal/jsre" + "go-ethereum-timing/internal/web3ext" + "go-ethereum-timing/rpc" ) var ( diff --git a/console/console_test.go b/console/console_test.go index 26465ca6f4..867baf24f9 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/node" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/eth" + "go-ethereum-timing/internal/jsre" + "go-ethereum-timing/node" ) const ( diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile index 1f3e1112ec..7b8238163e 100644 --- a/containers/docker/develop-alpine/Dockerfile +++ b/containers/docker/develop-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 RUN \ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - git clone --depth 1 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 https://go-ethereum-timing && \ (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 8c4fe9f595..220fa1ba65 100644 --- a/containers/docker/develop-ubuntu/Dockerfile +++ b/containers/docker/develop-ubuntu/Dockerfile @@ -5,7 +5,7 @@ ENV PATH=/usr/lib/go-1.9/bin:$PATH RUN \ apt-get update && apt-get upgrade -q -y && \ apt-get install -y --no-install-recommends golang-1.9 git make gcc libc-dev ca-certificates && \ - git clone --depth 1 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 https://go-ethereum-timing && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apt-get remove -y golang-1.9 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 8d4e7fe81a..134ce7a98e 100644 --- a/containers/docker/master-alpine/Dockerfile +++ b/containers/docker/master-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 RUN \ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - git clone --depth 1 --branch release/1.8 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 --branch release/1.8 https://go-ethereum-timing && \ (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 4cfc4f58c0..b0a5ec7bc7 100644 --- a/containers/docker/master-ubuntu/Dockerfile +++ b/containers/docker/master-ubuntu/Dockerfile @@ -5,7 +5,7 @@ ENV PATH=/usr/lib/go-1.9/bin:$PATH RUN \ apt-get update && apt-get upgrade -q -y && \ apt-get install -y --no-install-recommends golang-1.9 git make gcc libc-dev ca-certificates && \ - git clone --depth 1 --branch release/1.8 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 --branch release/1.8 https://go-ethereum-timing && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apt-get remove -y golang-1.9 git make gcc libc-dev && apt autoremove -y && apt-get clean && \ diff --git a/contracts/chequebook/api.go b/contracts/chequebook/api.go index fb7080308b..35d13cc17b 100644 --- a/contracts/chequebook/api.go +++ b/contracts/chequebook/api.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) const Version = "1.0" diff --git a/contracts/chequebook/cheque.go b/contracts/chequebook/cheque.go index 53eb093a61..80abbe9ac8 100644 --- a/contracts/chequebook/cheque.go +++ b/contracts/chequebook/cheque.go @@ -36,14 +36,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/contracts/chequebook/contract" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/contracts/chequebook/contract" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/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 4bd2e176b1..4088f84c22 100644 --- a/contracts/chequebook/cheque_test.go +++ b/contracts/chequebook/cheque_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/chequebook/contract" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/accounts/abi/bind/backends" + "go-ethereum-timing/common" + "go-ethereum-timing/contracts/chequebook/contract" + "go-ethereum-timing/core" + "go-ethereum-timing/crypto" ) var ( diff --git a/contracts/chequebook/contract/chequebook.go b/contracts/chequebook/contract/chequebook.go index 3129b811c6..b225d5b2dc 100644 --- a/contracts/chequebook/contract/chequebook.go +++ b/contracts/chequebook/contract/chequebook.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "go-ethereum-timing" + "go-ethereum-timing/accounts/abi" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/event" ) // ChequebookABI is the input ABI used to generate the binding from. diff --git a/contracts/chequebook/gencode.go b/contracts/chequebook/gencode.go index ddfe8d1512..bc449718f8 100644 --- a/contracts/chequebook/gencode.go +++ b/contracts/chequebook/gencode.go @@ -25,11 +25,11 @@ import ( "io/ioutil" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/contracts/chequebook/contract" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/accounts/abi/bind/backends" + "go-ethereum-timing/contracts/chequebook/contract" + "go-ethereum-timing/core" + "go-ethereum-timing/crypto" ) var ( diff --git a/contracts/ens/contract/ens.go b/contracts/ens/contract/ens.go index 8827071afc..6a28072764 100644 --- a/contracts/ens/contract/ens.go +++ b/contracts/ens/contract/ens.go @@ -6,12 +6,12 @@ package contract import ( "strings" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "go-ethereum-timing" + "go-ethereum-timing/accounts/abi" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/event" ) // ENSABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/contract/fifsregistrar.go b/contracts/ens/contract/fifsregistrar.go index a08380adfc..c188f646ad 100644 --- a/contracts/ens/contract/fifsregistrar.go +++ b/contracts/ens/contract/fifsregistrar.go @@ -6,10 +6,10 @@ package contract import ( "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/accounts/abi" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" ) // FIFSRegistrarABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/contract/publicresolver.go b/contracts/ens/contract/publicresolver.go index c567d5884a..704424fb87 100644 --- a/contracts/ens/contract/publicresolver.go +++ b/contracts/ens/contract/publicresolver.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "go-ethereum-timing" + "go-ethereum-timing/accounts/abi" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/event" ) // PublicResolverABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/ens.go b/contracts/ens/ens.go index b1841ab17d..1d22536e47 100644 --- a/contracts/ens/ens.go +++ b/contracts/ens/ens.go @@ -23,11 +23,11 @@ package ens import ( "strings" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens/contract" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/common" + "go-ethereum-timing/contracts/ens/contract" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" ) var ( diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index cd64fbf15f..42c6db26e5 100644 --- a/contracts/ens/ens_test.go +++ b/contracts/ens/ens_test.go @@ -20,12 +20,12 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens/contract" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/accounts/abi/bind/backends" + "go-ethereum-timing/common" + "go-ethereum-timing/contracts/ens/contract" + "go-ethereum-timing/core" + "go-ethereum-timing/crypto" ) var ( diff --git a/core/asm/asm.go b/core/asm/asm.go index 4257198cc7..aba93376ce 100644 --- a/core/asm/asm.go +++ b/core/asm/asm.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "fmt" - "github.com/ethereum/go-ethereum/core/vm" + "go-ethereum-timing/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index c7a5440701..2bdf3ecf85 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -22,8 +22,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "go-ethereum-timing/common/math" + "go-ethereum-timing/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index 53cba05170..5a6eb52cac 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -23,15 +23,15 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index 3b9496fece..55ee798ad6 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -19,10 +19,10 @@ package core import ( "fmt" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/consensus" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/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 9319a7835d..57bec75a42 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index 0d2d71b4d8..0351779b83 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -27,22 +27,22 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/common/mclock" + "go-ethereum-timing/common/prque" + "go-ethereum-timing/consensus" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" + "go-ethereum-timing/trie" "github.com/hashicorp/golang-lru" ) diff --git a/core/blockchain_insert.go b/core/blockchain_insert.go index cfa32c5aab..35f4d4998a 100644 --- a/core/blockchain_insert.go +++ b/core/blockchain_insert.go @@ -19,10 +19,10 @@ package core import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/common/mclock" + "go-ethereum-timing/core/types" + "go-ethereum-timing/log" ) // insertStats tracks and reports on block insertion. diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 504ad0eaf7..13976b22f3 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -24,16 +24,16 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" ) // So we can deterministically seed different blockchains @@ -1230,7 +1230,7 @@ func TestEIP161AccountRemoval(t *testing.T) { // tests that under weird reorg conditions the blockchain and its internal header- // chain return the same latest block/header. // -// https://github.com/ethereum/go-ethereum/pull/15941 +// https://go-ethereum-timing/pull/15941 func TestBlockchainHeaderchainReorgConsistency(t *testing.T) { // Generate a canonical chain to act as the main dataset engine := ethash.NewFaker() @@ -1489,8 +1489,8 @@ func BenchmarkBlockChain_1x1000Executions(b *testing.B) { // overtake the 'canon' chain until after it's passed canon by about 200 blocks. // // Details at: -// - https://github.com/ethereum/go-ethereum/issues/18977 -// - https://github.com/ethereum/go-ethereum/pull/18988 +// - https://go-ethereum-timing/issues/18977 +// - https://go-ethereum-timing/pull/18988 func TestLowDiffLongChain(t *testing.T) { // Generate a canonical chain to act as the main dataset engine := ethash.NewFaker() diff --git a/core/blocks.go b/core/blocks.go index f20ba4aaf2..6107578147 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -16,7 +16,7 @@ package core -import "github.com/ethereum/go-ethereum/common" +import "go-ethereum-timing/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 ae07481ada..6f62b51e9c 100644 --- a/core/bloombits/generator.go +++ b/core/bloombits/generator.go @@ -19,7 +19,7 @@ package bloombits import ( "errors" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/core/types" ) var ( diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go index f9bcef96e0..d3a59db4bf 100644 --- a/core/bloombits/generator_test.go +++ b/core/bloombits/generator_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/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 3ec0d5ae94..20d8aef7c3 100644 --- a/core/bloombits/matcher.go +++ b/core/bloombits/matcher.go @@ -26,8 +26,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/common/bitutil" + "go-ethereum-timing/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 91143e525e..811e46ad06 100644 --- a/core/bloombits/matcher_test.go +++ b/core/bloombits/matcher_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) const testSectionSize = 4096 @@ -82,7 +82,7 @@ func TestMatcherRandom(t *testing.T) { // Tests that the matcher can properly find matches if the starting block is // shifter from a multiple of 8. This is needed to cover an optimisation with -// bitset matching https://github.com/ethereum/go-ethereum/issues/15309. +// bitset matching https://go-ethereum-timing/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 1adde1fcb4..cfb048abd6 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -24,12 +24,12 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/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 a029dec626..a89439711a 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index 0b5a3d1843..b29b7c6bbb 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -20,14 +20,14 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus" + "go-ethereum-timing/consensus/misc" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" ) // BlockGen creates blocks for testing. diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 64b64fd6a3..51824ab3f1 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -20,12 +20,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" ) func ExampleGenerateChain() { diff --git a/core/dao_test.go b/core/dao_test.go index 966139bce3..9ca789d8cf 100644 --- a/core/dao_test.go +++ b/core/dao_test.go @@ -20,10 +20,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/events.go b/core/events.go index 710bdb5894..638520b632 100644 --- a/core/events.go +++ b/core/events.go @@ -17,8 +17,8 @@ package core import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" ) // NewTxsEvent is posted when a batch of transactions enter the transaction pool. diff --git a/core/evm.go b/core/evm.go index d303c40a40..f4f19773b3 100644 --- a/core/evm.go +++ b/core/evm.go @@ -19,10 +19,10 @@ package core import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/gen_genesis.go b/core/gen_genesis.go index bb8ea1d6a2..1b5b26e8e1 100644 --- a/core/gen_genesis.go +++ b/core/gen_genesis.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" + "go-ethereum-timing/params" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index 64fb9b9248..cfa7efe3f7 100644 --- a/core/gen_genesis_account.go +++ b/core/gen_genesis_account.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index cbb6eecd28..e6fe5eb870 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -25,16 +25,16 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/log" + "go-ethereum-timing/params" + "go-ethereum-timing/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 c7d54f2057..534a58e315 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -22,12 +22,12 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" ) func TestDefaultGenesisBlock(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index d2093113c0..7ae86b293e 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -26,13 +26,13 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/log" + "go-ethereum-timing/params" "github.com/hashicorp/golang-lru" ) diff --git a/core/helper_test.go b/core/helper_test.go index 051384d854..0d51b186a0 100644 --- a/core/helper_test.go +++ b/core/helper_test.go @@ -19,9 +19,9 @@ package core import ( "container/list" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" ) // Implement our EthTest Manager diff --git a/core/mkalloc.go b/core/mkalloc.go index 565e8c5826..5696cf62b5 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -34,8 +34,8 @@ import ( "sort" "strconv" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/core" + "go-ethereum-timing/rlp" ) type allocItem struct{ Addr, Balance *big.Int } diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go index 491a125c65..494332b393 100644 --- a/core/rawdb/accessors_chain.go +++ b/core/rawdb/accessors_chain.go @@ -21,10 +21,10 @@ import ( "encoding/binary" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/log" + "go-ethereum-timing/rlp" ) // ReadCanonicalHash retrieves the hash assigned to a canonical block number. diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go index fcc36dc2b4..f23c7fd460 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_test.go @@ -21,10 +21,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go index 4ff7e5bd35..6106314a82 100644 --- a/core/rawdb/accessors_indexes.go +++ b/core/rawdb/accessors_indexes.go @@ -17,10 +17,10 @@ package rawdb import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/log" + "go-ethereum-timing/rlp" ) // ReadTxLookupEntry retrieves the positional metadata associated with a transaction diff --git a/core/rawdb/accessors_indexes_test.go b/core/rawdb/accessors_indexes_test.go index d9c10e1490..02944aa369 100644 --- a/core/rawdb/accessors_indexes_test.go +++ b/core/rawdb/accessors_indexes_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" ) // Tests that positional lookup metadata can be stored and retrieved. diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go index 82e4bf0455..ee057c1b40 100644 --- a/core/rawdb/accessors_metadata.go +++ b/core/rawdb/accessors_metadata.go @@ -19,10 +19,10 @@ package rawdb import ( "encoding/json" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/log" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" ) // ReadDatabaseVersion retrieves the version number of the database. diff --git a/core/rawdb/schema.go b/core/rawdb/schema.go index 8a9921ef40..f5cebc0544 100644 --- a/core/rawdb/schema.go +++ b/core/rawdb/schema.go @@ -20,8 +20,8 @@ package rawdb import ( "encoding/binary" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/metrics" + "go-ethereum-timing/common" + "go-ethereum-timing/metrics" ) // The fields below define the low level database schema prefixing. diff --git a/core/state/database.go b/core/state/database.go index f6ea144b9b..9f25f40d03 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -20,10 +20,10 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" lru "github.com/hashicorp/golang-lru" + "go-ethereum-timing/common" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/trie" ) // Trie cache generation limit after which to evict trie nodes from memory. diff --git a/core/state/dump.go b/core/state/dump.go index 072dbbf053..12a6cb37ca 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -20,9 +20,9 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/rlp" + "go-ethereum-timing/trie" ) type DumpAccount struct { diff --git a/core/state/iterator.go b/core/state/iterator.go index 6a5c73d3d1..ec6c016ec8 100644 --- a/core/state/iterator.go +++ b/core/state/iterator.go @@ -20,9 +20,9 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/rlp" + "go-ethereum-timing/trie" ) // NodeIterator is an iterator to traverse the entire state trie post-order, diff --git a/core/state/iterator_test.go b/core/state/iterator_test.go index 9e46c851cd..de89bc208a 100644 --- a/core/state/iterator_test.go +++ b/core/state/iterator_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common" + "go-ethereum-timing/ethdb" ) // Tests that the node iterator indeed walks over the entire database contents. diff --git a/core/state/journal.go b/core/state/journal.go index a03ca57dbc..7669ee6df1 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -19,7 +19,7 @@ package state import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) // journalEntry is a modification entry in the state change journal that can be diff --git a/core/state/managed_state.go b/core/state/managed_state.go index 1390ef4a00..c2ce3cff0b 100644 --- a/core/state/managed_state.go +++ b/core/state/managed_state.go @@ -19,7 +19,7 @@ package state import ( "sync" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) type account struct { diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go index 3d9c4e8676..c38e7bd8f6 100644 --- a/core/state/managed_state_test.go +++ b/core/state/managed_state_test.go @@ -19,8 +19,8 @@ package state import ( "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common" + "go-ethereum-timing/ethdb" ) var addr = common.BytesToAddress([]byte("test")) diff --git a/core/state/state_object.go b/core/state/state_object.go index f41ab04092..92027b54f1 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -22,9 +22,9 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/rlp" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index a09273f3b1..a94c2ba70f 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" checker "gopkg.in/check.v1" ) diff --git a/core/state/statedb.go b/core/state/statedb.go index 2230b10ef0..b921afc6f7 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -23,12 +23,12 @@ import ( "math/big" "sort" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/rlp" + "go-ethereum-timing/trie" ) type revision struct { @@ -507,7 +507,7 @@ func (self *StateDB) Copy() *StateDB { } // Copy the dirty states, logs, and preimages for addr := range self.journal.dirties { - // As documented [here](https://github.com/ethereum/go-ethereum/pull/16485#issuecomment-380438527), + // As documented [here](https://go-ethereum-timing/pull/16485#issuecomment-380438527), // and in the Finalise-method, there is a case where an object is in the journal but not // in the stateObjects: OOG after touch on ripeMD prior to Byzantium. Thus, we need to check for // nil diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index cbd5bc75e7..f115e5ee77 100644 --- a/core/state/statedb_test.go +++ b/core/state/statedb_test.go @@ -30,9 +30,9 @@ import ( check "gopkg.in/check.v1" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" ) // Tests that updating a state trie does not leak any database writes prior to @@ -119,7 +119,7 @@ func TestIntermediateLeaks(t *testing.T) { // TestCopy tests that copying a statedb object indeed makes the original and // the copy independent of each other. This test is a regression test against -// https://github.com/ethereum/go-ethereum/pull/15549. +// https://go-ethereum-timing/pull/15549. func TestCopy(t *testing.T) { // Create a random state test to copy and modify "independently" orig, _ := New(common.Hash{}, NewDatabase(ethdb.NewMemDatabase())) @@ -422,7 +422,7 @@ func (s *StateSuite) TestTouchDelete(c *check.C) { } // TestCopyOfCopy tests that modified objects are carried over to the copy, and the copy of the copy. -// See https://github.com/ethereum/go-ethereum/pull/15225#issuecomment-380191512 +// See https://go-ethereum-timing/pull/15225#issuecomment-380191512 func TestCopyOfCopy(t *testing.T) { sdb, _ := New(common.Hash{}, NewDatabase(ethdb.NewMemDatabase())) addr := common.HexToAddress("aaaa") diff --git a/core/state/sync.go b/core/state/sync.go index c566e79073..925485ce9e 100644 --- a/core/state/sync.go +++ b/core/state/sync.go @@ -19,9 +19,9 @@ package state import ( "bytes" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/rlp" + "go-ethereum-timing/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index 3177401608..230f6278ca 100644 --- a/core/state/sync_test.go +++ b/core/state/sync_test.go @@ -21,10 +21,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/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 503a35d16a..bb5eeeff9b 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -17,14 +17,14 @@ package core import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus" + "go-ethereum-timing/consensus/misc" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/params" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/state_transition.go b/core/state_transition.go index fda081b7d1..16d411363b 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -18,13 +18,15 @@ package core import ( "errors" + "go-ethereum-timing/log2" "math" "math/big" + "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/log" + "go-ethereum-timing/params" ) var ( @@ -205,6 +207,9 @@ func (st *StateTransition) TransitionDb() (ret []byte, usedGas uint64, failed bo // error. vmerr error ) + + startTime:=time.Now() + if contractCreation { ret, _, st.gas, vmerr = evm.Create(sender, st.data, st.gas, st.value) } else { @@ -212,6 +217,11 @@ func (st *StateTransition) TransitionDb() (ret []byte, usedGas uint64, failed bo st.state.SetNonce(msg.From(), st.state.GetNonce(sender.Address())+1) ret, st.gas, vmerr = evm.Call(sender, st.to(), st.data, st.gas, st.value) } + + endTime:=time.Now() + executionTime := endTime.Sub(startTime) + log2.Record(st.msg,executionTime) + if vmerr != nil { log.Debug("VM returned with error", "err", vmerr) // The only possible consensus-error would be if there wasn't diff --git a/core/tx_cacher.go b/core/tx_cacher.go index b1e5d676a2..c5ef53d67f 100644 --- a/core/tx_cacher.go +++ b/core/tx_cacher.go @@ -19,7 +19,7 @@ package core import ( "runtime" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/core/types" ) // senderCacher is a concurrent transaction sender recoverer and cacher. diff --git a/core/tx_journal.go b/core/tx_journal.go index 41b5156d4a..740769f569 100644 --- a/core/tx_journal.go +++ b/core/tx_journal.go @@ -21,10 +21,10 @@ import ( "io" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/log" + "go-ethereum-timing/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 57abc51486..2c646397bb 100644 --- a/core/tx_list.go +++ b/core/tx_list.go @@ -22,9 +22,9 @@ import ( "math/big" "sort" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/log" ) // nonceHeap is a heap.Interface implementation over 64bit unsigned integers for diff --git a/core/tx_list_test.go b/core/tx_list_test.go index d579f501af..44a0ff7421 100644 --- a/core/tx_list_test.go +++ b/core/tx_list_test.go @@ -20,8 +20,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/core/types" + "go-ethereum-timing/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 552d3692b3..6d516d33fa 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/common/prque" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/params" ) const ( diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 6d3bd7a5a5..8124d7645e 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/params" ) // testTxPoolConfig is a transaction pool configuration without stateful disk diff --git a/core/types.go b/core/types.go index d0bbaf0aa7..14843776ce 100644 --- a/core/types.go +++ b/core/types.go @@ -17,9 +17,9 @@ package core import ( - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/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 57905d8c7a..baa7d4daa0 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -26,9 +26,9 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/types/block_test.go b/core/types/block_test.go index a35fbc25b1..855cdb0dd9 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -23,8 +23,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index d045c9e667..7f7808e853 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index a28ac0e7af..2a2a63fc8e 100644 --- a/core/types/bloom9_test.go +++ b/core/types/bloom9_test.go @@ -54,7 +54,7 @@ func TestBloom(t *testing.T) { import ( "testing" - "github.com/ethereum/go-ethereum/core/state" + "go-ethereum-timing/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go index 00c42c5bc6..29b543ecfc 100644 --- a/core/types/derive_sha.go +++ b/core/types/derive_sha.go @@ -19,9 +19,9 @@ package types import ( "bytes" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/rlp" + "go-ethereum-timing/trie" ) type DerivableList interface { diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 59a1c9c439..e4f781952b 100644 --- a/core/types/gen_header_json.go +++ b/core/types/gen_header_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" ) var _ = (*headerMarshaling)(nil) diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 1b5ae3c653..f27190e438 100644 --- a/core/types/gen_log_json.go +++ b/core/types/gen_log_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index 5c807a4ccb..8f5755cacd 100644 --- a/core/types/gen_receipt_json.go +++ b/core/types/gen_receipt_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go index c27da67096..dde6ea26d2 100644 --- a/core/types/gen_tx_json.go +++ b/core/types/gen_tx_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" ) var _ = (*txdataMarshaling)(nil) diff --git a/core/types/log.go b/core/types/log.go index 717cd2e5a0..6b561ba979 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -19,9 +19,9 @@ package types import ( "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/rlp" ) //go:generate gencodec -type Log -field-override logMarshaling -out gen_log_json.go diff --git a/core/types/log_test.go b/core/types/log_test.go index 0e56acfe4a..e97716b8e8 100644 --- a/core/types/log_test.go +++ b/core/types/log_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index 3d1fc95aab..f3d23cb5d9 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -22,9 +22,9 @@ import ( "io" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/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 ba3d5de91d..4531e90ad9 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -23,10 +23,10 @@ import ( "math/big" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/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 63132048ee..1b732f0d0a 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -22,9 +22,9 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/params" ) var ( diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 689fc38a9b..52d382b6e8 100644 --- a/core/types/transaction_signing_test.go +++ b/core/types/transaction_signing_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index f38d8e7177..fb759736da 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -23,9 +23,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/vm/analysis_test.go b/core/vm/analysis_test.go index fd2d744d87..4bc0a9173f 100644 --- a/core/vm/analysis_test.go +++ b/core/vm/analysis_test.go @@ -19,7 +19,7 @@ package vm import ( "testing" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/crypto" ) func TestJumpDestAnalysis(t *testing.T) { diff --git a/core/vm/common.go b/core/vm/common.go index 17de38decb..8a50d003df 100644 --- a/core/vm/common.go +++ b/core/vm/common.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" ) // calculates the memory size required for a step diff --git a/core/vm/contract.go b/core/vm/contract.go index 20baa6e751..53c84784c1 100644 --- a/core/vm/contract.go +++ b/core/vm/contract.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 20b741f8f1..ed6e6386b8 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -21,11 +21,11 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/bn256" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/crypto" + "go-ethereum-timing/crypto/bn256" + "go-ethereum-timing/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 96083337c9..8b701067a4 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -21,7 +21,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/evm.go b/core/vm/evm.go index ba4d1e9eb8..eea1fedd1a 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/params" ) // emptyCodeHash is used by create to ensure deployment is disallowed to already diff --git a/core/vm/gas.go b/core/vm/gas.go index bba7058c7e..cf85042664 100644 --- a/core/vm/gas.go +++ b/core/vm/gas.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/params" ) // Gas costs diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 9203e10a70..0a30a8ea20 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -17,9 +17,9 @@ package vm import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/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 726012e59e..96d828d5a9 100644 --- a/core/vm/gen_structlog.go +++ b/core/vm/gen_structlog.go @@ -6,9 +6,9 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" ) var _ = (*structLogMarshaling)(nil) diff --git a/core/vm/instructions.go b/core/vm/instructions.go index 5195e716b2..86e8e447f7 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -21,10 +21,10 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/core/types" + "go-ethereum-timing/params" "golang.org/x/crypto/sha3" ) diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 8a48d765dd..b12b77851b 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/params" ) type twoOperandTest struct { diff --git a/core/vm/interface.go b/core/vm/interface.go index fc15082f18..67c8bfccad 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index 952d96dd4d..84a50bc172 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -21,9 +21,9 @@ import ( "hash" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/params" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index deedf70cdb..931ed430e2 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index 1733bf2700..8f0294a69e 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -23,10 +23,10 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" + "go-ethereum-timing/core/types" ) // Storage represents a contract's storage. diff --git a/core/vm/logger_json.go b/core/vm/logger_json.go index ff379a4efd..0c81da4669 100644 --- a/core/vm/logger_json.go +++ b/core/vm/logger_json.go @@ -22,8 +22,8 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" ) type JSONLogger struct { diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index 2ea7535a79..9e40d63014 100644 --- a/core/vm/logger_test.go +++ b/core/vm/logger_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/core/state" + "go-ethereum-timing/params" ) type dummyContractRef struct { diff --git a/core/vm/memory.go b/core/vm/memory.go index 7e6f0eb940..3c49909570 100644 --- a/core/vm/memory.go +++ b/core/vm/memory.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common/math" ) // Memory implements a simple memory model for the ethereum virtual machine. diff --git a/core/vm/memory_table.go b/core/vm/memory_table.go index 8fa6c90ca7..ffb9fb8670 100644 --- a/core/vm/memory_table.go +++ b/core/vm/memory_table.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common/math" ) func memorySha3(stack *Stack) *big.Int { diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index 31c9b9cf9d..4c097064b1 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -17,9 +17,9 @@ package runtime import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/vm" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index cda49a34b4..f7e1fadc1c 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -21,12 +21,12 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" ) // Config is a basic type specifying certain configuration flags for running diff --git a/core/vm/runtime/runtime_example_test.go b/core/vm/runtime/runtime_example_test.go index b7d0ddc384..e488afbf58 100644 --- a/core/vm/runtime/runtime_example_test.go +++ b/core/vm/runtime/runtime_example_test.go @@ -19,8 +19,8 @@ package runtime_test import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm/runtime" + "go-ethereum-timing/common" + "go-ethereum-timing/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index bac06e524b..0dc0b25e37 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -21,12 +21,12 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/accounts/abi" + "go-ethereum-timing/common" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index a4b1cfcd89..52b94b8868 100644 --- a/core/vm/stack_table.go +++ b/core/vm/stack_table.go @@ -19,7 +19,7 @@ package vm import ( "fmt" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/params" ) func makeStackFunc(pop, push int) stackValidationFunc { diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go index 5c081493b0..601d0d8c48 100644 --- a/crypto/bn256/bn256_fast.go +++ b/crypto/bn256/bn256_fast.go @@ -7,7 +7,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" +import "go-ethereum-timing/crypto/bn256/cloudflare" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/crypto/bn256/bn256_fuzz.go b/crypto/bn256/bn256_fuzz.go index 6aa1421170..2d9e58d218 100644 --- a/crypto/bn256/bn256_fuzz.go +++ b/crypto/bn256/bn256_fuzz.go @@ -10,8 +10,8 @@ import ( "bytes" "math/big" - cloudflare "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" - google "github.com/ethereum/go-ethereum/crypto/bn256/google" + cloudflare "go-ethereum-timing/crypto/bn256/cloudflare" + google "go-ethereum-timing/crypto/bn256/google" ) // FuzzAdd fuzzez bn256 addition between the Google and Cloudflare libraries. diff --git a/crypto/bn256/bn256_slow.go b/crypto/bn256/bn256_slow.go index 47df49d417..d7d9dad3e9 100644 --- a/crypto/bn256/bn256_slow.go +++ b/crypto/bn256/bn256_slow.go @@ -7,7 +7,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import "github.com/ethereum/go-ethereum/crypto/bn256/google" +import "go-ethereum-timing/crypto/bn256/google" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/crypto/crypto.go b/crypto/crypto.go index 4567fafc72..6ebfd9cac1 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -28,9 +28,9 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/rlp" "golang.org/x/crypto/sha3" ) diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 177c19c0cf..ab7dc54f02 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -26,8 +26,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index f33f204d5b..1d7eb56477 100644 --- a/crypto/ecies/ecies_test.go +++ b/crypto/ecies/ecies_test.go @@ -40,7 +40,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/crypto" ) var dumpEnc bool diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 6312daf5a1..13385ba7e3 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -42,7 +42,7 @@ import ( "fmt" "hash" - ethcrypto "github.com/ethereum/go-ethereum/crypto" + ethcrypto "go-ethereum-timing/crypto" ) var ( diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index 340bfc221e..ca6de1a1c0 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -23,8 +23,8 @@ import ( "crypto/elliptic" "fmt" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "go-ethereum-timing/common/math" + "go-ethereum-timing/crypto/secp256k1" ) // Ecrecover returns the uncompressed public key that created the given signature. diff --git a/crypto/signature_test.go b/crypto/signature_test.go index aecff76bfb..2f444e8176 100644 --- a/crypto/signature_test.go +++ b/crypto/signature_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" ) var ( diff --git a/dashboard/assets.go b/dashboard/assets.go index f3e7cf9815..af52824251 100644 --- a/dashboard/assets.go +++ b/dashboard/assets.go @@ -32727,7 +32727,7 @@ var _bundleJs = []byte((((((((((`!function(modules) { }, _react2.default.createElement("span", { style: _common.styles.light }, "Commit "), _react2.default.createElement("a", { - href: "https://github.com/ethereum/go-ethereum/commit/" + general.commit, + href: "https://go-ethereum-timing/commit/" + general.commit, target: "_blank", style: { color: "inherit", diff --git a/dashboard/assets/components/Footer.jsx b/dashboard/assets/components/Footer.jsx index 20830cbba8..c1a1794c95 100644 --- a/dashboard/assets/components/Footer.jsx +++ b/dashboard/assets/components/Footer.jsx @@ -165,7 +165,7 @@ class Footer extends Component { {general.commit && ( {'Commit '} - + {general.commit.substring(0, 8)} diff --git a/dashboard/cpu.go b/dashboard/cpu.go index c89879028d..27920aa400 100644 --- a/dashboard/cpu.go +++ b/dashboard/cpu.go @@ -21,7 +21,7 @@ package dashboard import ( "syscall" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) // getProcessCPUTime retrieves the process' CPU time since program startup. diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go index 3ba92ac73e..1095de7aff 100644 --- a/dashboard/dashboard.go +++ b/dashboard/dashboard.go @@ -35,12 +35,12 @@ import ( "io" "github.com/elastic/gosigar" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" "github.com/mohae/deepcopy" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/p2p" + "go-ethereum-timing/params" + "go-ethereum-timing/rpc" "golang.org/x/net/websocket" ) diff --git a/dashboard/log.go b/dashboard/log.go index 5d852d60a4..a56b4c4824 100644 --- a/dashboard/log.go +++ b/dashboard/log.go @@ -26,9 +26,9 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/log" "github.com/mohae/deepcopy" "github.com/rjeczalik/notify" + "go-ethereum-timing/log" ) var emptyChunk = json.RawMessage("[]") diff --git a/eth/api.go b/eth/api.go index 816b9cd335..af18d70085 100644 --- a/eth/api.go +++ b/eth/api.go @@ -28,17 +28,17 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/internal/ethapi" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" + "go-ethereum-timing/rpc" + "go-ethereum-timing/trie" ) // PublicEthereumAPI provides an API to access Ethereum full node-related diff --git a/eth/api_backend.go b/eth/api_backend.go index a48815e0db..e3efa5f9c2 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -20,20 +20,20 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/core" + "go-ethereum-timing/core/bloombits" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/eth/gasprice" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/params" + "go-ethereum-timing/rpc" ) // EthAPIBackend implements ethapi.Backend for full nodes diff --git a/eth/api_test.go b/eth/api_test.go index 47b062a40c..f20f63bfa6 100644 --- a/eth/api_test.go +++ b/eth/api_test.go @@ -21,9 +21,9 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common" + "go-ethereum-timing/core/state" + "go-ethereum-timing/ethdb" ) var dumper = spew.ConfigState{Indent: " "} diff --git a/eth/api_tracer.go b/eth/api_tracer.go index a3a0b4e1ec..7bd13e6804 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -28,19 +28,19 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/eth/tracers" + "go-ethereum-timing/internal/ethapi" + "go-ethereum-timing/log" + "go-ethereum-timing/rlp" + "go-ethereum-timing/rpc" + "go-ethereum-timing/trie" ) const ( diff --git a/eth/backend.go b/eth/backend.go index 2a9d56c5c1..b6b6e7af58 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -25,30 +25,30 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/consensus" + "go-ethereum-timing/consensus/clique" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/bloombits" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/eth/filters" + "go-ethereum-timing/eth/gasprice" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/internal/ethapi" + "go-ethereum-timing/log" + "go-ethereum-timing/miner" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" + "go-ethereum-timing/rpc" ) type LesServer interface { diff --git a/eth/bloombits.go b/eth/bloombits.go index c7bb561402..93f6b54991 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -20,13 +20,13 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common" + "go-ethereum-timing/common/bitutil" + "go-ethereum-timing/core" + "go-ethereum-timing/core/bloombits" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" ) const ( diff --git a/eth/config.go b/eth/config.go index 7c041d1af7..7607fcaf28 100644 --- a/eth/config.go +++ b/eth/config.go @@ -24,13 +24,13 @@ import ( "runtime" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/eth/gasprice" + "go-ethereum-timing/params" ) // DefaultConfig contains default settings for use on the Ethereum main net. diff --git a/eth/downloader/api.go b/eth/downloader/api.go index 57ff3d71af..62eac81288 100644 --- a/eth/downloader/api.go +++ b/eth/downloader/api.go @@ -20,9 +20,9 @@ import ( "context" "sync" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + ethereum "go-ethereum-timing" + "go-ethereum-timing/event" + "go-ethereum-timing/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 4db689f73b..3513150a3d 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -25,15 +25,15 @@ import ( "sync/atomic" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + ethereum "go-ethereum-timing" + "go-ethereum-timing/common" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/params" ) var ( diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index 1a42965d39..ceb405375e 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/trie" + ethereum "go-ethereum-timing" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/trie" ) // Reduce some of the parameters to make the tester faster. diff --git a/eth/downloader/fakepeer.go b/eth/downloader/fakepeer.go index 59832facaa..44ceedda6e 100644 --- a/eth/downloader/fakepeer.go +++ b/eth/downloader/fakepeer.go @@ -19,11 +19,11 @@ package downloader import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" ) // FakePeer is a mock downloader peer that operates on a local database instance diff --git a/eth/downloader/metrics.go b/eth/downloader/metrics.go index d4eb337946..9231cc9bdf 100644 --- a/eth/downloader/metrics.go +++ b/eth/downloader/metrics.go @@ -19,7 +19,7 @@ package downloader import ( - "github.com/ethereum/go-ethereum/metrics" + "go-ethereum-timing/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index 60f86d0e14..2248bb3e27 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -29,9 +29,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/event" + "go-ethereum-timing/log" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index 7c33953811..939f6051c3 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "go-ethereum-timing/common" + "go-ethereum-timing/common/prque" + "go-ethereum-timing/core/types" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" ) var ( diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index 0675a91cdc..2520b66821 100644 --- a/eth/downloader/statesync.go +++ b/eth/downloader/statesync.go @@ -22,12 +22,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/state" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/log" + "go-ethereum-timing/trie" "golang.org/x/crypto/sha3" ) diff --git a/eth/downloader/testchain_test.go b/eth/downloader/testchain_test.go index 0b5a214257..ac3f00f5f1 100644 --- a/eth/downloader/testchain_test.go +++ b/eth/downloader/testchain_test.go @@ -21,13 +21,13 @@ import ( "math/big" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" ) // Test chain parameters. diff --git a/eth/downloader/types.go b/eth/downloader/types.go index ff70bfa0e3..bf2e64248d 100644 --- a/eth/downloader/types.go +++ b/eth/downloader/types.go @@ -19,7 +19,7 @@ package downloader import ( "fmt" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/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 f0b5e8064b..619e2556b1 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -22,11 +22,11 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/common/prque" + "go-ethereum-timing/consensus" + "go-ethereum-timing/core/types" + "go-ethereum-timing/log" ) const ( diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index 3d4f0d1e59..40cd75afae 100644 --- a/eth/fetcher/fetcher_test.go +++ b/eth/fetcher/fetcher_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" ) var ( diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go index d68d12f000..e4070bf5a9 100644 --- a/eth/fetcher/metrics.go +++ b/eth/fetcher/metrics.go @@ -19,7 +19,7 @@ package fetcher import ( - "github.com/ethereum/go-ethereum/metrics" + "go-ethereum-timing/metrics" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index 5ed80a8875..100c291ef2 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -25,13 +25,13 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + ethereum "go-ethereum-timing" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/rpc" ) var ( diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 02229a7549..a5c70c4622 100644 --- a/eth/filters/api_test.go +++ b/eth/filters/api_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/common" + "go-ethereum-timing/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index c5f681e024..f6185df0e6 100644 --- a/eth/filters/bench_test.go +++ b/eth/filters/bench_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/node" + "go-ethereum-timing/common" + "go-ethereum-timing/common/bitutil" + "go-ethereum-timing/core/bloombits" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 071613ad7a..6671c3d551 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -21,13 +21,13 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/bloombits" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/rpc" ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index 70139c1a96..713c981f71 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,14 +25,14 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + ethereum "go-ethereum-timing" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/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 e71080b1ab..ce0df9a041 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -25,17 +25,17 @@ import ( "testing" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + ethereum "go-ethereum-timing" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/bloombits" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/params" + "go-ethereum-timing/rpc" ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 396a03d611..c4e89c80c8 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -23,15 +23,15 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/params" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 3b8db78a1c..4660c3dfe6 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -22,11 +22,11 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/internal/ethapi" + "go-ethereum-timing/params" + "go-ethereum-timing/rpc" ) var maxPrice = big.NewInt(500 * params.GWei) diff --git a/eth/gen_config.go b/eth/gen_config.go index 2777aa9e83..4db568ba9b 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -6,12 +6,12 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/eth/gasprice" ) var _ = (*configMarshaling)(nil) diff --git a/eth/handler.go b/eth/handler.go index b42612a566..d560123759 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -26,20 +26,20 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/fetcher" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus" + "go-ethereum-timing/consensus/misc" + "go-ethereum-timing/core" + "go-ethereum-timing/core/types" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/eth/fetcher" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" ) const ( diff --git a/eth/handler_test.go b/eth/handler_test.go index 9fffd95811..3b42b89b50 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -24,18 +24,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/p2p" + "go-ethereum-timing/params" ) // Tests that protocol versions and modes of operations are matched up properly. diff --git a/eth/helper_test.go b/eth/helper_test.go index b18a02baf9..81ae46ec4c 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -27,18 +27,18 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/params" ) var ( diff --git a/eth/metrics.go b/eth/metrics.go index 0533a2a875..bf8161ac0c 100644 --- a/eth/metrics.go +++ b/eth/metrics.go @@ -17,8 +17,8 @@ package eth import ( - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" + "go-ethereum-timing/metrics" + "go-ethereum-timing/p2p" ) var ( diff --git a/eth/peer.go b/eth/peer.go index b5f4508559..54e41d72f1 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -24,10 +24,10 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rlp" ) var ( diff --git a/eth/protocol.go b/eth/protocol.go index 497ba4c597..4fb0b0bf82 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -21,11 +21,11 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/types" + "go-ethereum-timing/event" + "go-ethereum-timing/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocol_test.go b/eth/protocol_test.go index aa43dfa920..5b6abc3429 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rlp" ) func init() { diff --git a/eth/sync.go b/eth/sync.go index bfcfb6716e..d4a57231aa 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -21,11 +21,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/enode" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index e4c99ff587..17969fe246 100644 --- a/eth/sync_test.go +++ b/eth/sync_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" ) // Tests that fast sync gets disabled as soon as a real block is successfully diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index 9d6701868c..4b3b856aa2 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -25,11 +25,11 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" duktape "gopkg.in/olebedev/go-duktape.v3" ) diff --git a/eth/tracers/tracer_test.go b/eth/tracers/tracer_test.go index a45a121159..df8f14c1ef 100644 --- a/eth/tracers/tracer_test.go +++ b/eth/tracers/tracer_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/params" ) type account struct{} diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index 4e1ef23ad2..9be0396686 100644 --- a/eth/tracers/tracers.go +++ b/eth/tracers/tracers.go @@ -21,7 +21,7 @@ import ( "strings" "unicode" - "github.com/ethereum/go-ethereum/eth/tracers/internal/tracers" + "go-ethereum-timing/eth/tracers/internal/tracers" ) // all contains all the built in JavaScript tracers by name. diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go index b435b1694b..dec55edc0b 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -27,17 +27,17 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/tests" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" + "go-ethereum-timing/core" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" + "go-ethereum-timing/tests" ) // To generate a new callTracer test, copy paste the makeTest method below into diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index f3163e19b3..eba2fecaae 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -24,12 +24,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/core/types" + "go-ethereum-timing/rlp" + "go-ethereum-timing/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index 3e8bf974c2..241285f11f 100644 --- a/ethclient/ethclient_test.go +++ b/ethclient/ethclient_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing" + "go-ethereum-timing/common" ) // Verify that Client implements the ethereum interfaces. diff --git a/ethclient/signer.go b/ethclient/signer.go index 74a93f1e2f..d80a95a767 100644 --- a/ethclient/signer.go +++ b/ethclient/signer.go @@ -20,8 +20,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/common" + "go-ethereum-timing/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 6c62d6a386..78da09ceab 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/filter" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/util" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" ) const ( diff --git a/ethdb/database_js_test.go b/ethdb/database_js_test.go index b4c12ae0bc..15e94eb914 100644 --- a/ethdb/database_js_test.go +++ b/ethdb/database_js_test.go @@ -19,7 +19,7 @@ package ethdb_test import ( - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/ethdb" ) var _ ethdb.Database = ðdb.LDBDatabase{} diff --git a/ethdb/database_test.go b/ethdb/database_test.go index 382fedbf9e..a9ff9f6c0a 100644 --- a/ethdb/database_test.go +++ b/ethdb/database_test.go @@ -27,7 +27,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/ethdb" ) func newTestLDB() (*ethdb.LDBDatabase, func()) { diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go index 727f2f7ca3..118be3720f 100644 --- a/ethdb/memory_database.go +++ b/ethdb/memory_database.go @@ -20,7 +20,7 @@ import ( "errors" "sync" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) /* diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index 9f3d7237e9..2fbd166f92 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -30,17 +30,17 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/common" + "go-ethereum-timing/common/mclock" + "go-ethereum-timing/consensus" + "go-ethereum-timing/core" + "go-ethereum-timing/core/types" + "go-ethereum-timing/eth" + "go-ethereum-timing/event" + "go-ethereum-timing/les" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rpc" "golang.org/x/net/websocket" ) diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 9b5ad50df5..01db4c8945 100644 --- a/event/example_feed_test.go +++ b/event/example_feed_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/ethereum/go-ethereum/event" + "go-ethereum-timing/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index 825a8deeac..552c3eac43 100644 --- a/event/example_scope_test.go +++ b/event/example_scope_test.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/event" + "go-ethereum-timing/event" ) // This example demonstrates how SubscriptionScope can be used to control the lifetime of diff --git a/event/example_subscription_test.go b/event/example_subscription_test.go index 5c76b55d98..83d05c1d2a 100644 --- a/event/example_subscription_test.go +++ b/event/example_subscription_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/ethereum/go-ethereum/event" + "go-ethereum-timing/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index d03f465075..cea40df0fb 100644 --- a/event/subscription.go +++ b/event/subscription.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "go-ethereum-timing/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 be78344062..ebe3558614 100644 --- a/interfaces.go +++ b/interfaces.go @@ -22,8 +22,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" ) // NotFound is returned by API methods if the requested item does not exist. diff --git a/internal/debug/api.go b/internal/debug/api.go index 86a4218f6a..1d92da84cf 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -34,7 +34,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 46c8fe9f80..a7baf1c2a8 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -24,12 +24,12 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/exp" "github.com/fjl/memsize/memsizeui" colorable "github.com/mattn/go-colorable" "github.com/mattn/go-isatty" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/metrics/exp" "gopkg.in/urfave/cli.v1" ) diff --git a/internal/debug/trace.go b/internal/debug/trace.go index cab5deaafd..1b6e46dd82 100644 --- a/internal/debug/trace.go +++ b/internal/debug/trace.go @@ -23,7 +23,7 @@ import ( "os" "runtime/trace" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index 61ddff688c..968d300bdb 100644 --- a/internal/ethapi/addrlock.go +++ b/internal/ethapi/addrlock.go @@ -19,7 +19,7 @@ package ethapi import ( "sync" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 73b629bd9c..0c73b8a5a1 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -26,24 +26,24 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" + "go-ethereum-timing/accounts" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" + "go-ethereum-timing/rpc" ) const ( @@ -429,7 +429,7 @@ func signHash(data []byte) []byte { // // The key used to calculate the signature is decrypted with the given password. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_sign +// https://go-ethereum-timing/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} @@ -457,7 +457,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 27 or 28 for legacy reasons. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_ecRecover +// https://go-ethereum-timing/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 e23ee03b15..ddf5108548 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -21,17 +21,17 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/params" + "go-ethereum-timing/rpc" ) // Backend interface provides the common API services (that are provided by diff --git a/internal/guide/guide_test.go b/internal/guide/guide_test.go index 9c7ad16d18..0266bf1315 100644 --- a/internal/guide/guide_test.go +++ b/internal/guide/guide_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/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 df920bb1d3..3ba22fd4fd 100644 --- a/internal/jsre/deps/web3.js +++ b/internal/jsre/deps/web3.js @@ -5862,7 +5862,7 @@ module.exports = Shh; * @author Alex Beregszaszi * @date 2016 * - * Reference: https://github.com/ethereum/go-ethereum/blob/swarm/internal/web3ext/web3ext.go#L33 + * Reference: https://go-ethereum-timing/blob/swarm/internal/web3ext/web3ext.go#L33 */ "use strict"; diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index 4c7664f1cc..71dbe820f1 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -26,9 +26,9 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/jsre/deps" "github.com/robertkrimen/otto" + "go-ethereum-timing/common" + "go-ethereum-timing/internal/jsre/deps" ) var ( diff --git a/les/api_backend.go b/les/api_backend.go index 7531396235..7d8af1a206 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -20,22 +20,22 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/core" + "go-ethereum-timing/core/bloombits" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/eth/gasprice" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/light" + "go-ethereum-timing/params" + "go-ethereum-timing/rpc" ) type LesApiBackend struct { diff --git a/les/backend.go b/les/backend.go index d0db71019e..07e9489d05 100644 --- a/les/backend.go +++ b/les/backend.go @@ -22,27 +22,27 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - rpc "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/consensus" + "go-ethereum-timing/core" + "go-ethereum-timing/core/bloombits" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/eth" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/eth/filters" + "go-ethereum-timing/eth/gasprice" + "go-ethereum-timing/event" + "go-ethereum-timing/internal/ethapi" + "go-ethereum-timing/light" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/discv5" + "go-ethereum-timing/params" + rpc "go-ethereum-timing/rpc" ) type LightEthereum struct { diff --git a/les/bloombits.go b/les/bloombits.go index aea0fcd5f4..0a0d78115d 100644 --- a/les/bloombits.go +++ b/les/bloombits.go @@ -19,8 +19,8 @@ package les import ( "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/light" + "go-ethereum-timing/common/bitutil" + "go-ethereum-timing/light" ) const ( diff --git a/les/commons.go b/les/commons.go index 21fb25714a..1b26e7cb80 100644 --- a/les/commons.go +++ b/les/commons.go @@ -20,14 +20,14 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/eth" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/light" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/params" ) // lesCommons contains fields needed by both server and client. diff --git a/les/fetcher.go b/les/fetcher.go index 2615f69df9..63c68a95de 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/common/mclock" + "go-ethereum-timing/consensus" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/light" + "go-ethereum-timing/log" ) const ( diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index 8ef4ba511f..45f15352bc 100644 --- a/les/flowcontrol/control.go +++ b/les/flowcontrol/control.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "go-ethereum-timing/common/mclock" ) const fcTimeConst = time.Millisecond diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go index 28cc6f0fe7..33473e5372 100644 --- a/les/flowcontrol/manager.go +++ b/les/flowcontrol/manager.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "go-ethereum-timing/common/mclock" ) const rcConst = 1000000 diff --git a/les/freeclient.go b/les/freeclient.go index 5ee607be8f..9741e69917 100644 --- a/les/freeclient.go +++ b/les/freeclient.go @@ -23,11 +23,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common/mclock" + "go-ethereum-timing/common/prque" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/log" + "go-ethereum-timing/rlp" ) // freeClientPool implements a client database that limits the connection time diff --git a/les/freeclient_test.go b/les/freeclient_test.go index e95abc7aad..dd89466b3f 100644 --- a/les/freeclient_test.go +++ b/les/freeclient_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common/mclock" + "go-ethereum-timing/ethdb" ) func TestFreeClientPoolL10C100(t *testing.T) { diff --git a/les/handler.go b/les/handler.go index 19ccbcd2b6..299a02fea1 100644 --- a/les/handler.go +++ b/les/handler.go @@ -26,23 +26,23 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/common/mclock" + "go-ethereum-timing/consensus" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/light" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/discv5" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" + "go-ethereum-timing/trie" ) const ( diff --git a/les/handler_test.go b/les/handler_test.go index 43be7f41b1..d006f5262f 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -23,19 +23,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/light" + "go-ethereum-timing/p2p" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" + "go-ethereum-timing/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 b46d41f174..1c295ee3ca 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -26,20 +26,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/eth" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/les/flowcontrol" + "go-ethereum-timing/light" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/params" ) var ( diff --git a/les/metrics.go b/les/metrics.go index c282a62a1a..dc5912dcba 100644 --- a/les/metrics.go +++ b/les/metrics.go @@ -17,8 +17,8 @@ package les import ( - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" + "go-ethereum-timing/metrics" + "go-ethereum-timing/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index 9def05a676..1958814d34 100644 --- a/les/odr.go +++ b/les/odr.go @@ -19,10 +19,10 @@ package les import ( "context" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/core" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/light" + "go-ethereum-timing/log" ) // LesOdr implements light.OdrBackend diff --git a/les/odr_requests.go b/les/odr_requests.go index 0f2e5dd9ec..6186bf37c7 100644 --- a/les/odr_requests.go +++ b/les/odr_requests.go @@ -23,15 +23,15 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/light" + "go-ethereum-timing/log" + "go-ethereum-timing/rlp" + "go-ethereum-timing/trie" ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index ac81fbcf02..a2c54625c8 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/light" + "go-ethereum-timing/params" + "go-ethereum-timing/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 678384f0eb..916c61501f 100644 --- a/les/peer.go +++ b/les/peer.go @@ -24,13 +24,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/eth" + "go-ethereum-timing/les/flowcontrol" + "go-ethereum-timing/light" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rlp" ) var ( diff --git a/les/protocol.go b/les/protocol.go index 0b24f5aedb..b79c62f070 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -24,12 +24,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/request_test.go b/les/request_test.go index c9c1851982..80c96e0e52 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" + "go-ethereum-timing/common" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/light" ) var testBankSecureTrieKey = secAddr(testBankAddress) diff --git a/les/retrieve.go b/les/retrieve.go index d77cfea74e..b5168bd08e 100644 --- a/les/retrieve.go +++ b/les/retrieve.go @@ -26,8 +26,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/light" + "go-ethereum-timing/common/mclock" + "go-ethereum-timing/light" ) var ( diff --git a/les/server.go b/les/server.go index 2fa0456d69..f2b3c32ffd 100644 --- a/les/server.go +++ b/les/server.go @@ -23,19 +23,19 @@ import ( "math" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/eth" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/les/flowcontrol" + "go-ethereum-timing/light" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/discv5" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" ) type LesServer struct { diff --git a/les/serverpool.go b/les/serverpool.go index 52b54b371f..31848afaa4 100644 --- a/les/serverpool.go +++ b/les/serverpool.go @@ -28,14 +28,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common/mclock" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/discv5" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/rlp" ) const ( diff --git a/les/sync.go b/les/sync.go index 1ac6455852..23aba37022 100644 --- a/les/sync.go +++ b/les/sync.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/light" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/light" ) // syncer is responsible for periodically synchronising with the network, both diff --git a/les/txrelay.go b/les/txrelay.go index 7a02cc837e..aece91e930 100644 --- a/les/txrelay.go +++ b/les/txrelay.go @@ -19,8 +19,8 @@ package les import ( "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" ) type ltrInfo struct { diff --git a/light/lightchain.go b/light/lightchain.go index 8e2734c2d9..5e25d0416b 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -24,18 +24,18 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" "github.com/hashicorp/golang-lru" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" ) var ( diff --git a/light/lightchain_test.go b/light/lightchain_test.go index d45c0656d9..ebee16c97d 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -21,13 +21,13 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" ) // So we can deterministically seed different blockchains diff --git a/light/nodeset.go b/light/nodeset.go index 6f25219c13..d1cb4c42e2 100644 --- a/light/nodeset.go +++ b/light/nodeset.go @@ -20,10 +20,10 @@ import ( "errors" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/rlp" ) // NodeSet stores a set of trie nodes. It implements trie.Database and can also diff --git a/light/odr.go b/light/odr.go index 900be05440..38858936e3 100644 --- a/light/odr.go +++ b/light/odr.go @@ -23,11 +23,11 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/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 3da7b3055e..d76c00b224 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -24,19 +24,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" + "go-ethereum-timing/trie" ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index 073f0d6429..8c01b75eae 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -20,12 +20,12 @@ import ( "bytes" "context" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/rlp" ) var sha3_nil = crypto.Keccak256Hash(nil) diff --git a/light/postprocess.go b/light/postprocess.go index dd1b74a7be..5149b29515 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -24,16 +24,16 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/common/bitutil" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/log" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" + "go-ethereum-timing/trie" ) // IndexerConfig includes a set of configs for chain indexers. diff --git a/light/trie.go b/light/trie.go index ab4e18b43e..346fa499af 100644 --- a/light/trie.go +++ b/light/trie.go @@ -21,12 +21,12 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/common" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/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 5b5fce31d9..07e9d39482 100644 --- a/light/trie_test.go +++ b/light/trie_test.go @@ -23,13 +23,13 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" + "go-ethereum-timing/trie" ) func TestNodeIterator(t *testing.T) { diff --git a/light/txpool.go b/light/txpool.go index 767a797bdc..8a943cf835 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -22,16 +22,16 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/core" + "go-ethereum-timing/core/rawdb" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" ) const ( diff --git a/light/txpool_test.go b/light/txpool_test.go index ce77573efd..6ea14c5312 100644 --- a/light/txpool_test.go +++ b/light/txpool_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" ) type testTxRelay struct { diff --git a/log/format.go b/log/format.go index 7902b296e6..f7344ccc58 100644 --- a/log/format.go +++ b/log/format.go @@ -22,7 +22,7 @@ const ( // locationTrims are trimmed for display to avoid unwieldy log lines. var locationTrims = []string{ - "github.com/ethereum/go-ethereum/", + "go-ethereum-timing/", } // PrintOrigins sets or unsets log location (file:line) printing for terminal diff --git a/log2/logger.go b/log2/logger.go new file mode 100644 index 0000000000..01a3560f6e --- /dev/null +++ b/log2/logger.go @@ -0,0 +1,45 @@ +package log2 + +import ( + "encoding/hex" + "encoding/json" + "go-ethereum-timing/core" + "log" + "os" + "time" +) + +var file *os.File + +type TimingLog struct { + From string + To string + TimeCost int64 + Timestamp int64 + DataFirst4ByteHex string +} + +func InitOutputFile(outputFile string) { + var err error + file, err = os.OpenFile(outputFile, os.O_APPEND|os.O_CREATE, 0644) + if err != nil { + log.Fatalln("Fail to create log file for timing.") + } +} +func Record(message core.Message, timeCost time.Duration) error { + timingLog := TimingLog{ + From: message.From().String(), + To: message.From().String(), + TimeCost: timeCost.Nanoseconds(), + DataFirst4ByteHex: hex.EncodeToString(message.Data()[0:4]), + Timestamp: time.Now().Unix(), + } + b, err := json.Marshal(timingLog) + if err != nil { + return err + } + b = append(b, '\n') + + _, err = file.Write(b) + return err +} diff --git a/metrics/exp/exp.go b/metrics/exp/exp.go index 325a193c77..b1a7497da2 100644 --- a/metrics/exp/exp.go +++ b/metrics/exp/exp.go @@ -8,7 +8,7 @@ import ( "net/http" "sync" - "github.com/ethereum/go-ethereum/metrics" + "go-ethereum-timing/metrics" ) type exp struct { diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go index c4ef927234..4c9c58f480 100644 --- a/metrics/influxdb/influxdb.go +++ b/metrics/influxdb/influxdb.go @@ -5,9 +5,9 @@ import ( uurl "net/url" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" "github.com/influxdata/influxdb/client" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" ) type reporter struct { diff --git a/metrics/librato/librato.go b/metrics/librato/librato.go index 2138e01ae8..41687f7ddf 100644 --- a/metrics/librato/librato.go +++ b/metrics/librato/librato.go @@ -7,7 +7,7 @@ import ( "regexp" "time" - "github.com/ethereum/go-ethereum/metrics" + "go-ethereum-timing/metrics" ) // a regexp for extracting the unit from time.Duration.String diff --git a/metrics/metrics.go b/metrics/metrics.go index 2a2b804e7c..33ef4aaf8b 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) // Enabled is checked by the constructor functions for all of the diff --git a/miner/miner.go b/miner/miner.go index 5218c12107..1ad38b19e6 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -22,15 +22,15 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus" + "go-ethereum-timing/core" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/params" ) // Backend wraps all methods required for mining. diff --git a/miner/stress_clique.go b/miner/stress_clique.go index 7e19975aec..2b6690ddaa 100644 --- a/miner/stress_clique.go +++ b/miner/stress_clique.go @@ -28,19 +28,19 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/common" + "go-ethereum-timing/common/fdlimit" + "go-ethereum-timing/core" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/eth" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/params" ) func main() { diff --git a/miner/stress_ethash.go b/miner/stress_ethash.go index 044ca9a218..f4b8e19ae8 100644 --- a/miner/stress_ethash.go +++ b/miner/stress_ethash.go @@ -28,20 +28,20 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/common" + "go-ethereum-timing/common/fdlimit" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/eth" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/params" ) func main() { diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index 3a176e8bd6..060580e7cd 100644 --- a/miner/unconfirmed.go +++ b/miner/unconfirmed.go @@ -20,9 +20,9 @@ import ( "container/ring" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/log" ) // chainRetriever 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 42e77f3e64..8d084814c2 100644 --- a/miner/unconfirmed_test.go +++ b/miner/unconfirmed_test.go @@ -19,8 +19,8 @@ package miner import ( "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" ) // noopChainRetriever is an implementation of headerRetriever that always diff --git a/miner/worker.go b/miner/worker.go index 48473796bc..db85e39c47 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -25,15 +25,15 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus" + "go-ethereum-timing/consensus/misc" + "go-ethereum-timing/core" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/params" ) const ( diff --git a/miner/worker_test.go b/miner/worker_test.go index 7c8f167a12..e3e1f72716 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -21,17 +21,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/consensus" + "go-ethereum-timing/consensus/clique" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/params" ) var ( diff --git a/mobile/accounts.go b/mobile/accounts.go index 4d979bffff..d6446318dd 100644 --- a/mobile/accounts.go +++ b/mobile/accounts.go @@ -23,10 +23,10 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/accounts" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" ) const ( diff --git a/mobile/android_test.go b/mobile/android_test.go index 3d3bd66d08..44fa25ab52 100644 --- a/mobile/android_test.go +++ b/mobile/android_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/build" + "go-ethereum-timing/internal/build" ) // androidTestClass is a Java class to do some lightweight tests against the Android @@ -207,7 +207,7 @@ func TestAndroid(t *testing.T) { } } // Generate the mobile bindings for Geth and add the tester class - gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/ethereum/go-ethereum/mobile") + gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "go-ethereum-timing/mobile") if output, err := gobind.CombinedOutput(); err != nil { t.Logf("%s", output) t.Fatalf("failed to run gomobile bind: %v", err) diff --git a/mobile/big.go b/mobile/big.go index 86ea93245a..167e3cf7bc 100644 --- a/mobile/big.go +++ b/mobile/big.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) // A BigInt represents a signed multi-precision integer. diff --git a/mobile/bind.go b/mobile/bind.go index d6e621a258..e07b5461e3 100644 --- a/mobile/bind.go +++ b/mobile/bind.go @@ -22,10 +22,10 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/accounts/abi" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" ) // Signer is an interaface defining the callback when a contract requires a diff --git a/mobile/common.go b/mobile/common.go index 047d8e1f65..9d2c597e97 100644 --- a/mobile/common.go +++ b/mobile/common.go @@ -24,7 +24,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) // Hash represents the 32 byte Keccak256 hash of arbitrary data. diff --git a/mobile/discover.go b/mobile/discover.go index 9b3c93ccd9..4fb1e81c0b 100644 --- a/mobile/discover.go +++ b/mobile/discover.go @@ -22,7 +22,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/p2p/discv5" + "go-ethereum-timing/p2p/discv5" ) // Enode represents a host on the network. diff --git a/mobile/ethclient.go b/mobile/ethclient.go index 662125c4ad..6c4a038f90 100644 --- a/mobile/ethclient.go +++ b/mobile/ethclient.go @@ -21,8 +21,8 @@ package geth import ( "math/big" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethclient" + "go-ethereum-timing/core/types" + "go-ethereum-timing/ethclient" ) // EthereumClient provides access to the Ethereum APIs. diff --git a/mobile/ethereum.go b/mobile/ethereum.go index 59da852397..51bb01d3f5 100644 --- a/mobile/ethereum.go +++ b/mobile/ethereum.go @@ -21,8 +21,8 @@ package geth import ( "errors" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" + ethereum "go-ethereum-timing" + "go-ethereum-timing/common" ) // Subscription represents an event subscription where events are diff --git a/mobile/geth.go b/mobile/geth.go index e3e2e905da..1e9f4ac4ae 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -24,18 +24,18 @@ import ( "fmt" "path/filepath" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "go-ethereum-timing/core" + "go-ethereum-timing/eth" + "go-ethereum-timing/eth/downloader" + "go-ethereum-timing/ethclient" + "go-ethereum-timing/ethstats" + "go-ethereum-timing/internal/debug" + "go-ethereum-timing/les" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/nat" + "go-ethereum-timing/params" + whisper "go-ethereum-timing/whisper/whisperv6" ) // NodeConfig represents the collection of configuration values to fine tune the Geth diff --git a/mobile/init.go b/mobile/init.go index 2025d85edc..26f458385b 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -22,7 +22,7 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) func init() { diff --git a/mobile/interface.go b/mobile/interface.go index ac0c26088a..9ae6099c96 100644 --- a/mobile/interface.go +++ b/mobile/interface.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) // Interface represents a wrapped version of Go's interface{}, with the capacity diff --git a/mobile/logger.go b/mobile/logger.go index 7078c4fd2c..5bef7155d3 100644 --- a/mobile/logger.go +++ b/mobile/logger.go @@ -19,7 +19,7 @@ package geth import ( "os" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) // SetVerbosity sets the global verbosity level (between 0 and 6 - see logger/verbosity.go). diff --git a/mobile/p2p.go b/mobile/p2p.go index a80d9fff2e..f58f3a7765 100644 --- a/mobile/p2p.go +++ b/mobile/p2p.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/p2p" + "go-ethereum-timing/p2p" ) // NodeInfo represents pi short summary of the information known about the host. diff --git a/mobile/params.go b/mobile/params.go index 45fe870ee3..2b6f2ca61a 100644 --- a/mobile/params.go +++ b/mobile/params.go @@ -21,9 +21,9 @@ package geth import ( "encoding/json" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/core" + "go-ethereum-timing/p2p/discv5" + "go-ethereum-timing/params" ) // MainnetGenesis returns the JSON spec to use for the main Ethereum network. It diff --git a/mobile/shhclient.go b/mobile/shhclient.go index a069c9bd40..81d44a8e39 100644 --- a/mobile/shhclient.go +++ b/mobile/shhclient.go @@ -19,8 +19,8 @@ package geth import ( - "github.com/ethereum/go-ethereum/whisper/shhclient" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "go-ethereum-timing/whisper/shhclient" + whisper "go-ethereum-timing/whisper/whisperv6" ) // WhisperClient provides access to the Ethereum APIs. diff --git a/mobile/types.go b/mobile/types.go index 443d07ea93..9d8d55eef6 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -23,10 +23,10 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/rlp" + whisper "go-ethereum-timing/whisper/whisperv6" ) // A Nonce is a 64-bit hash which proves (combined with the mix-hash) that diff --git a/mobile/vm.go b/mobile/vm.go index 72093e3d5b..d8dd3e635a 100644 --- a/mobile/vm.go +++ b/mobile/vm.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/core/types" ) // Log represents a contract log event. These events are generated by the LOG diff --git a/node/api.go b/node/api.go index 6e36e505d1..d3688a902b 100644 --- a/node/api.go +++ b/node/api.go @@ -22,12 +22,12 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/metrics" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/rpc" ) // PrivateAdminAPI is the collection of administrative API methods exposed only diff --git a/node/config.go b/node/config.go index 7b32a59087..3e9e8d7099 100644 --- a/node/config.go +++ b/node/config.go @@ -26,15 +26,15 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/accounts" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/accounts/usbwallet" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/rpc" ) const ( diff --git a/node/config_test.go b/node/config_test.go index b81d3d6120..41ae308702 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -24,8 +24,8 @@ import ( "runtime" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index c1376dba0f..d76689664f 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,9 +22,9 @@ import ( "path/filepath" "runtime" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/nat" + "go-ethereum-timing/rpc" ) const ( diff --git a/node/node.go b/node/node.go index c35a509723..2396bb435c 100644 --- a/node/node.go +++ b/node/node.go @@ -26,14 +26,14 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" "github.com/prometheus/prometheus/util/flock" + "go-ethereum-timing/accounts" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/internal/debug" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/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 ee06f4065c..9ddacaed49 100644 --- a/node/node_example_test.go +++ b/node/node_example_test.go @@ -20,9 +20,9 @@ import ( "fmt" "log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/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 f833cd6880..b2d793d89f 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rpc" ) var ( diff --git a/node/service.go b/node/service.go index 6a96d9b1e1..ac27cd5b60 100644 --- a/node/service.go +++ b/node/service.go @@ -19,11 +19,11 @@ package node import ( "reflect" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/accounts" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/event" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rpc" ) // ServiceContext is a collection of service independent options inherited from diff --git a/node/utils_test.go b/node/utils_test.go index 9801b1ed45..e04053ecbf 100644 --- a/node/utils_test.go +++ b/node/utils_test.go @@ -22,8 +22,8 @@ package node import ( "reflect" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rpc" ) // NoopService is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index 075a0f9368..6dcc709d21 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -23,9 +23,9 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index f41ab77524..7015052e4d 100644 --- a/p2p/dial_test.go +++ b/p2p/dial_test.go @@ -24,9 +24,9 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/enr" + "go-ethereum-timing/p2p/netutil" ) func init() { diff --git a/p2p/discover/node.go b/p2p/discover/node.go index 8d4af166bb..a812fd522e 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -23,10 +23,10 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" - "github.com/ethereum/go-ethereum/p2p/enode" + "go-ethereum-timing/common/math" + "go-ethereum-timing/crypto" + "go-ethereum-timing/crypto/secp256k1" + "go-ethereum-timing/p2p/enode" ) // node represents a host on the network. diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index 1bb52399fb..c36b80c5e6 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -25,7 +25,7 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index ef0c08afce..15b0879404 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -33,11 +33,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/netutil" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index b5622e3a27..678c861c24 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -27,10 +27,10 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/enr" + "go-ethereum-timing/p2p/netutil" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/table_util_test.go b/p2p/discover/table_util_test.go index e61c9e6fc5..ee6e85a4d2 100644 --- a/p2p/discover/table_util_test.go +++ b/p2p/discover/table_util_test.go @@ -24,8 +24,8 @@ import ( "net" "sync" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/enr" ) var nullNode *enode.Node diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index df9a3065fa..55ab039f2a 100644 --- a/p2p/discover/udp.go +++ b/p2p/discover/udp.go @@ -26,11 +26,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/netutil" + "go-ethereum-timing/rlp" ) // Errors diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index 3d53c93099..23564dbb84 100644 --- a/p2p/discover/udp_test.go +++ b/p2p/discover/udp_test.go @@ -35,10 +35,10 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/rlp" ) func init() { diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index 3c2d5744c3..f779845f73 100644 --- a/p2p/discv5/database.go +++ b/p2p/discv5/database.go @@ -28,15 +28,15 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/storage" "github.com/syndtr/goleveldb/leveldb/util" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/rlp" ) var ( diff --git a/p2p/discv5/metrics.go b/p2p/discv5/metrics.go index cb11d7eacf..8b831db77f 100644 --- a/p2p/discv5/metrics.go +++ b/p2p/discv5/metrics.go @@ -1,6 +1,6 @@ package discv5 -import "github.com/ethereum/go-ethereum/metrics" +import "go-ethereum-timing/metrics" var ( ingressTrafficMeter = metrics.NewRegisteredMeter("discv5/InboundTraffic", nil) diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index de7d8de6aa..aa2a38127a 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -24,12 +24,12 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/mclock" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/netutil" + "go-ethereum-timing/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go index 1a8137673d..15429defc7 100644 --- a/p2p/discv5/net_test.go +++ b/p2p/discv5/net_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go index 3d47485122..7f17ca3f04 100644 --- a/p2p/discv5/node.go +++ b/p2p/discv5/node.go @@ -30,8 +30,8 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" ) // Node represents a host on the network. diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go index ce4ad9e4d4..972982604b 100644 --- a/p2p/discv5/node_test.go +++ b/p2p/discv5/node_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" ) func ExampleNewNode() { diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index 4fb5f657ae..2a638f4167 100644 --- a/p2p/discv5/ntp.go +++ b/p2p/discv5/ntp.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) const ( diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go index 543faecd48..75ead2dedf 100644 --- a/p2p/discv5/sim_test.go +++ b/p2p/discv5/sim_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) // In this test, nodes try to randomly resolve each other. diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go index 4f4b2426f4..55fab367e1 100644 --- a/p2p/discv5/table.go +++ b/p2p/discv5/table.go @@ -29,7 +29,7 @@ import ( "net" "sort" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) const ( diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go index a29943dab9..63d71d3714 100644 --- a/p2p/discv5/table_test.go +++ b/p2p/discv5/table_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" ) type nullTransport struct{} diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go index ae4b18e7cd..f87e22d549 100644 --- a/p2p/discv5/ticket.go +++ b/p2p/discv5/ticket.go @@ -25,10 +25,10 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/common/mclock" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" ) const ( diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go index 609a41297f..0ae491a01c 100644 --- a/p2p/discv5/topic.go +++ b/p2p/discv5/topic.go @@ -23,8 +23,8 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common/mclock" + "go-ethereum-timing/log" ) const ( diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go index ba79993f29..b56fe0c930 100644 --- a/p2p/discv5/topic_test.go +++ b/p2p/discv5/topic_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" + "go-ethereum-timing/common" + "go-ethereum-timing/common/mclock" ) func TestTopicRadius(t *testing.T) { diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index ff5ed983ba..4dbf2344f8 100644 --- a/p2p/discv5/udp.go +++ b/p2p/discv5/udp.go @@ -24,12 +24,12 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/nat" + "go-ethereum-timing/p2p/netutil" + "go-ethereum-timing/rlp" ) const Version = 4 diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go index 62184aa9d3..2dc909ae6d 100644 --- a/p2p/discv5/udp_test.go +++ b/p2p/discv5/udp_test.go @@ -26,9 +26,9 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/rlp" ) func init() { diff --git a/p2p/enode/idscheme.go b/p2p/enode/idscheme.go index c1834f0699..7033116aa8 100644 --- a/p2p/enode/idscheme.go +++ b/p2p/enode/idscheme.go @@ -21,10 +21,10 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common/math" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p/enr" + "go-ethereum-timing/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/enode/idscheme_test.go b/p2p/enode/idscheme_test.go index 0910e6e83f..2d7f67644f 100644 --- a/p2p/enode/idscheme_test.go +++ b/p2p/enode/idscheme_test.go @@ -23,11 +23,11 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p/enr" + "go-ethereum-timing/rlp" ) var ( diff --git a/p2p/enode/localnode.go b/p2p/enode/localnode.go index 623f8eae18..ff41ebd03f 100644 --- a/p2p/enode/localnode.go +++ b/p2p/enode/localnode.go @@ -26,9 +26,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/enr" + "go-ethereum-timing/p2p/netutil" ) const ( diff --git a/p2p/enode/localnode_test.go b/p2p/enode/localnode_test.go index f5e3496d63..0a91210a25 100644 --- a/p2p/enode/localnode_test.go +++ b/p2p/enode/localnode_test.go @@ -19,8 +19,8 @@ package enode import ( "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p/enr" ) func newLocalNodeForTesting() (*LocalNode, *DB) { diff --git a/p2p/enode/node.go b/p2p/enode/node.go index b454ab2554..32e34b1085 100644 --- a/p2p/enode/node.go +++ b/p2p/enode/node.go @@ -26,7 +26,7 @@ import ( "net" "strings" - "github.com/ethereum/go-ethereum/p2p/enr" + "go-ethereum-timing/p2p/enr" ) // Node represents a host on the network. diff --git a/p2p/enode/node_test.go b/p2p/enode/node_test.go index 861a70bd64..9bab7a9626 100644 --- a/p2p/enode/node_test.go +++ b/p2p/enode/node_test.go @@ -21,9 +21,9 @@ import ( "fmt" "testing" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" "github.com/stretchr/testify/assert" + "go-ethereum-timing/p2p/enr" + "go-ethereum-timing/rlp" ) var pyRecord, _ = hex.DecodeString("f884b8407098ad865b00a582051940cb9cf36836572411a47278783077011599ed5cd16b76f2635f4e234738f30813a89eb9137e3e3df5266e3a1f11df72ecf1145ccb9c01826964827634826970847f00000189736563703235366b31a103ca634cae0d49acb401d8a4c6b6fe8c55b70d115bf400769cc1400f3258cd31388375647082765f") diff --git a/p2p/enode/nodedb.go b/p2p/enode/nodedb.go index 9353b155c1..355260b5db 100644 --- a/p2p/enode/nodedb.go +++ b/p2p/enode/nodedb.go @@ -26,13 +26,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/storage" "github.com/syndtr/goleveldb/leveldb/util" + "go-ethereum-timing/rlp" ) // Keys in the node database. diff --git a/p2p/enode/urlv4.go b/p2p/enode/urlv4.go index 50e9485d04..016606baea 100644 --- a/p2p/enode/urlv4.go +++ b/p2p/enode/urlv4.go @@ -26,9 +26,9 @@ import ( "regexp" "strconv" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" + "go-ethereum-timing/common/math" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p/enr" ) var incompleteNodeURL = regexp.MustCompile("(?i)^(?:enode://)?([0-9a-f]+)$") diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index 444820c158..5d078168a6 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -40,7 +40,7 @@ import ( "io" "sort" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/rlp" ) const SizeLimit = 300 // maximum encoded size of a node record in bytes diff --git a/p2p/enr/enr_test.go b/p2p/enr/enr_test.go index 449c898a84..78fd648059 100644 --- a/p2p/enr/enr_test.go +++ b/p2p/enr/enr_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go-ethereum-timing/rlp" ) var rnd = rand.New(rand.NewSource(time.Now().UnixNano())) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index 347990ab64..d284c19d6b 100644 --- a/p2p/enr/entries.go +++ b/p2p/enr/entries.go @@ -21,7 +21,7 @@ import ( "io" "net" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/message.go b/p2p/message.go index ac12666e41..cf6377f5fa 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -25,9 +25,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/event" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index 8df82bb074..1f87182d8e 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -25,11 +25,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "go-ethereum-timing/p2p/enode" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" ) const ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index 8fad921c48..4664dcdc90 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" "github.com/jackpal/go-nat-pmp" + "go-ethereum-timing/log" ) // An implementation of nat.Interface can map local ports to ports diff --git a/p2p/netutil/iptrack.go b/p2p/netutil/iptrack.go index b9cbd5e1ca..f0ee4820ec 100644 --- a/p2p/netutil/iptrack.go +++ b/p2p/netutil/iptrack.go @@ -19,7 +19,7 @@ package netutil import ( "time" - "github.com/ethereum/go-ethereum/common/mclock" + "go-ethereum-timing/common/mclock" ) // IPTracker predicts the external endpoint, i.e. IP address and port, of the local host diff --git a/p2p/netutil/iptrack_test.go b/p2p/netutil/iptrack_test.go index a9a2998a65..9d0294160d 100644 --- a/p2p/netutil/iptrack_test.go +++ b/p2p/netutil/iptrack_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "go-ethereum-timing/common/mclock" ) const ( diff --git a/p2p/peer.go b/p2p/peer.go index af019d07a8..c0541eb82c 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -25,12 +25,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common/mclock" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/enr" + "go-ethereum-timing/rlp" ) var ( diff --git a/p2p/protocol.go b/p2p/protocol.go index 9438ab8e47..d113f0938e 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -19,8 +19,8 @@ package p2p import ( "fmt" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/enr" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/protocols/accounting.go b/p2p/protocols/accounting.go index 558247254a..5f605f4edf 100644 --- a/p2p/protocols/accounting.go +++ b/p2p/protocols/accounting.go @@ -19,7 +19,7 @@ package protocols import ( "time" - "github.com/ethereum/go-ethereum/metrics" + "go-ethereum-timing/metrics" ) // define some metrics diff --git a/p2p/protocols/accounting_simulation_test.go b/p2p/protocols/accounting_simulation_test.go index e90a1d81d2..0fa7221007 100644 --- a/p2p/protocols/accounting_simulation_test.go +++ b/p2p/protocols/accounting_simulation_test.go @@ -31,14 +31,14 @@ import ( "github.com/mattn/go-colorable" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/log" + "go-ethereum-timing/rpc" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" ) const ( diff --git a/p2p/protocols/accounting_test.go b/p2p/protocols/accounting_test.go index 3810ae2c9b..21d6604806 100644 --- a/p2p/protocols/accounting_test.go +++ b/p2p/protocols/accounting_test.go @@ -19,9 +19,9 @@ package protocols import ( "testing" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/rlp" ) //dummy Balance implementation diff --git a/p2p/protocols/protocol.go b/p2p/protocols/protocol.go index bf879b9851..edb13af712 100644 --- a/p2p/protocols/protocol.go +++ b/p2p/protocols/protocol.go @@ -38,13 +38,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/tracing" opentracing "github.com/opentracing/opentracing-go" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rlp" + "go-ethereum-timing/swarm/spancontext" + "go-ethereum-timing/swarm/tracing" ) // error codes used by this protocol scheme diff --git a/p2p/protocols/protocol_test.go b/p2p/protocols/protocol_test.go index 4bc1e547ee..1b9c59a60d 100644 --- a/p2p/protocols/protocol_test.go +++ b/p2p/protocols/protocol_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/rlp" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/adapters" + p2ptest "go-ethereum-timing/p2p/testing" ) // handshake message type diff --git a/p2p/protocols/reporter.go b/p2p/protocols/reporter.go index 215d4fe31b..90395d9316 100644 --- a/p2p/protocols/reporter.go +++ b/p2p/protocols/reporter.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/p2p/protocols/reporter_test.go b/p2p/protocols/reporter_test.go index c5c025d20e..2904ef849b 100644 --- a/p2p/protocols/reporter_test.go +++ b/p2p/protocols/reporter_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) //TestReporter tests that the metrics being collected for p2p accounting diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 67cc1d9bf3..eef6744cd6 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -35,12 +35,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/crypto/secp256k1" - "github.com/ethereum/go-ethereum/rlp" "github.com/golang/snappy" + "go-ethereum-timing/common/bitutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/crypto/ecies" + "go-ethereum-timing/crypto/secp256k1" + "go-ethereum-timing/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index 5d89818020..9b28e78e15 100644 --- a/p2p/rlpx_test.go +++ b/p2p/rlpx_test.go @@ -32,10 +32,10 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/crypto" + "go-ethereum-timing/crypto/ecies" + "go-ethereum-timing/p2p/simulations/pipes" + "go-ethereum-timing/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/server.go b/p2p/server.go index 566f01ffc5..aed4ceda7f 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -28,18 +28,18 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/mclock" + "go-ethereum-timing/crypto" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/discover" + "go-ethereum-timing/p2p/discv5" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/enr" + "go-ethereum-timing/p2p/nat" + "go-ethereum-timing/p2p/netutil" + "go-ethereum-timing/rlp" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index f665c14245..46623e7445 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/enr" "golang.org/x/crypto/sha3" ) diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index 9b588db1be..7f2b10e74d 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/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index eada9579ed..056a37e85d 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -23,13 +23,13 @@ import ( "net" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/pipes" + "go-ethereum-timing/rpc" ) // SimAdapter is a NodeAdapter which creates in-memory simulation nodes and diff --git a/p2p/simulations/adapters/inproc_test.go b/p2p/simulations/adapters/inproc_test.go index e1e092f6e1..e32fb36cdf 100644 --- a/p2p/simulations/adapters/inproc_test.go +++ b/p2p/simulations/adapters/inproc_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" + "go-ethereum-timing/p2p/simulations/pipes" ) func TestTCPPipe(t *testing.T) { diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index 6681726e40..23e988e1f3 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -26,11 +26,11 @@ import ( "strconv" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/crypto" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/rpc" ) // Node represents a node in a simulation network which is created by a diff --git a/p2p/simulations/connect.go b/p2p/simulations/connect.go index ede96b34c1..b0e5096782 100644 --- a/p2p/simulations/connect.go +++ b/p2p/simulations/connect.go @@ -20,7 +20,7 @@ import ( "errors" "strings" - "github.com/ethereum/go-ethereum/p2p/enode" + "go-ethereum-timing/p2p/enode" ) var ( diff --git a/p2p/simulations/connect_test.go b/p2p/simulations/connect_test.go index 32d18347d8..8a829f6166 100644 --- a/p2p/simulations/connect_test.go +++ b/p2p/simulations/connect_test.go @@ -19,9 +19,9 @@ package simulations import ( "testing" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/adapters" ) func newTestNetwork(t *testing.T, nodeCount int) (*Network, []enode.ID) { diff --git a/p2p/simulations/examples/ping-pong.go b/p2p/simulations/examples/ping-pong.go index cde2f3a677..de51956631 100644 --- a/p2p/simulations/examples/ping-pong.go +++ b/p2p/simulations/examples/ping-pong.go @@ -25,13 +25,13 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/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 1f44cc6675..930c9a0501 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -29,12 +29,12 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" "github.com/julienschmidt/httprouter" + "go-ethereum-timing/event" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/http_test.go b/p2p/simulations/http_test.go index ed43c0ed76..3b73d5d8d6 100644 --- a/p2p/simulations/http_test.go +++ b/p2p/simulations/http_test.go @@ -28,14 +28,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" "github.com/mattn/go-colorable" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/rpc" ) var ( diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index 8ce777a010..c05fbf0510 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/adapters" ) //a map of mocker names to its function diff --git a/p2p/simulations/mocker_test.go b/p2p/simulations/mocker_test.go index 069040257e..1e09e32365 100644 --- a/p2p/simulations/mocker_test.go +++ b/p2p/simulations/mocker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "go-ethereum-timing/p2p/enode" ) func TestMocker(t *testing.T) { diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index 2049a5108e..a4e2eb3ad9 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -26,11 +26,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "go-ethereum-timing/event" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/adapters" ) var DialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index 8b644ffb0f..6ef4e983c1 100644 --- a/p2p/simulations/network_test.go +++ b/p2p/simulations/network_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/adapters" ) // Tests that a created snapshot with a minimal service only contains the expected connections diff --git a/p2p/simulations/simulation.go b/p2p/simulations/simulation.go index ae62c42b9c..33814f0c3e 100644 --- a/p2p/simulations/simulation.go +++ b/p2p/simulations/simulation.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "go-ethereum-timing/p2p/enode" ) // Simulation provides a framework for running actions in a simulated network diff --git a/p2p/simulations/test.go b/p2p/simulations/test.go index beeb414e41..094656726d 100644 --- a/p2p/simulations/test.go +++ b/p2p/simulations/test.go @@ -3,10 +3,10 @@ package simulations import ( "testing" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/enr" + "go-ethereum-timing/rpc" ) // NoopService is the service that does not do anything diff --git a/p2p/testing/peerpool.go b/p2p/testing/peerpool.go index 01ccce67eb..fe694b99b5 100644 --- a/p2p/testing/peerpool.go +++ b/p2p/testing/peerpool.go @@ -20,8 +20,8 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/enode" ) type TestPeer interface { diff --git a/p2p/testing/protocolsession.go b/p2p/testing/protocolsession.go index 476c2a9840..d94d5b4d56 100644 --- a/p2p/testing/protocolsession.go +++ b/p2p/testing/protocolsession.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/adapters" ) var errTimedOut = errors.New("timed out") diff --git a/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go index cbd8ce6fe5..bbd60119ad 100644 --- a/p2p/testing/protocoltester.go +++ b/p2p/testing/protocoltester.go @@ -31,14 +31,14 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/rlp" + "go-ethereum-timing/rpc" ) // ProtocolTester is the tester environment used for unit testing protocol diff --git a/params/config.go b/params/config.go index 44b2ffeba8..6bc79f56d5 100644 --- a/params/config.go +++ b/params/config.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) // Genesis hashes to enforce below configs on. diff --git a/params/dao.go b/params/dao.go index da3c8dfc99..9822db2878 100644 --- a/params/dao.go +++ b/params/dao.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/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 6254c95ffd..f05b62b075 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -32,7 +32,7 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 3bb8717b80..049944f3fe 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -22,7 +22,7 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/rpc" ) // In this example, our client wishes to track the latest 'block number' diff --git a/rpc/client_test.go b/rpc/client_test.go index a8195c0af8..4b04a66d17 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -31,7 +31,7 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) func TestClientRequest(t *testing.T) { @@ -323,7 +323,7 @@ func TestClientSubscribeClose(t *testing.T) { } } -// This test reproduces https://github.com/ethereum/go-ethereum/issues/17837 where the +// This test reproduces https://go-ethereum-timing/issues/17837 where the // client hangs during shutdown when Unsubscribe races with Client.Close. func TestClientCloseUnsubscribeRace(t *testing.T) { service := &NotificationTestService{} diff --git a/rpc/endpoints.go b/rpc/endpoints.go index 8ca6d4eb0c..c52c5bbc78 100644 --- a/rpc/endpoints.go +++ b/rpc/endpoints.go @@ -19,7 +19,7 @@ package rpc import ( "net" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) // StartHTTPEndpoint starts the HTTP RPC endpoint, configured with cors/vhosts/modules diff --git a/rpc/http.go b/rpc/http.go index 674166fb3a..a37bf9ddb5 100644 --- a/rpc/http.go +++ b/rpc/http.go @@ -31,8 +31,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" "github.com/rs/cors" + "go-ethereum-timing/log" ) const ( diff --git a/rpc/ipc.go b/rpc/ipc.go index 4cce1cf74b..101594f84b 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -20,8 +20,8 @@ import ( "context" "net" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/netutil" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/netutil" ) // ServeListener accepts connections on l, serving JSON-RPC on them. diff --git a/rpc/ipc_unix.go b/rpc/ipc_unix.go index 707b47fd77..dff68e55f7 100644 --- a/rpc/ipc_unix.go +++ b/rpc/ipc_unix.go @@ -25,7 +25,7 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) /* diff --git a/rpc/json.go b/rpc/json.go index a523eeb8ef..d7ceafbc0c 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) const ( diff --git a/rpc/server.go b/rpc/server.go index 214e1d3ed9..e972ae5a18 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -26,7 +26,7 @@ import ( "sync/atomic" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) const MetadataApi = "rpc" diff --git a/rpc/types.go b/rpc/types.go index 4252c36027..667920d22c 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -24,7 +24,7 @@ import ( "sync" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common/hexutil" ) // API describes the set of methods offered over the RPC interface diff --git a/rpc/types_test.go b/rpc/types_test.go index 68b6d3c54f..ded9ca321f 100644 --- a/rpc/types_test.go +++ b/rpc/types_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index eae8320e56..31a3200ea5 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -31,7 +31,7 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" "golang.org/x/net/websocket" ) diff --git a/signer/core/abihelper.go b/signer/core/abihelper.go index 0fef249395..dba6fdebff 100644 --- a/signer/core/abihelper.go +++ b/signer/core/abihelper.go @@ -22,8 +22,8 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/accounts/abi" + "go-ethereum-timing/common" "bytes" "os" diff --git a/signer/core/abihelper_test.go b/signer/core/abihelper_test.go index 878210be1f..1e1a893e52 100644 --- a/signer/core/abihelper_test.go +++ b/signer/core/abihelper_test.go @@ -25,8 +25,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/accounts/abi" + "go-ethereum-timing/common" ) func verify(t *testing.T, jsondata, calldata string, exp []interface{}) { diff --git a/signer/core/api.go b/signer/core/api.go index e9a3357855..cc276baec4 100644 --- a/signer/core/api.go +++ b/signer/core/api.go @@ -25,15 +25,15 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/accounts" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/accounts/usbwallet" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/internal/ethapi" + "go-ethereum-timing/log" + "go-ethereum-timing/rlp" ) // numberOfAccountsToDerive For hardware wallets, the number of accounts to derive @@ -518,7 +518,7 @@ func (api *SignerAPI) SignTransaction(ctx context.Context, args SendTxArgs, meth // // The key used to calculate the signature is decrypted with the given password. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_sign +// https://go-ethereum-timing/wiki/Management-APIs#personal_sign func (api *SignerAPI) Sign(ctx context.Context, addr common.MixedcaseAddress, data hexutil.Bytes) (hexutil.Bytes, error) { sighash, msg := SignHash(data) // We make the request prior to looking up if we actually have the account, to prevent diff --git a/signer/core/api_test.go b/signer/core/api_test.go index a8aa23896e..d5c53cb507 100644 --- a/signer/core/api_test.go +++ b/signer/core/api_test.go @@ -28,13 +28,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/accounts/keystore" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/core/types" + "go-ethereum-timing/internal/ethapi" + "go-ethereum-timing/rlp" ) //Used for testing diff --git a/signer/core/auditlog.go b/signer/core/auditlog.go index 1f9c909185..cce6ce1a8c 100644 --- a/signer/core/auditlog.go +++ b/signer/core/auditlog.go @@ -21,11 +21,11 @@ import ( "encoding/json" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/internal/ethapi" + "go-ethereum-timing/log" ) type AuditLogger struct { diff --git a/signer/core/cliui.go b/signer/core/cliui.go index 940f1f43aa..755f01de47 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -25,9 +25,9 @@ import ( "sync" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/internal/ethapi" + "go-ethereum-timing/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/signer/core/stdioui.go b/signer/core/stdioui.go index 64032386fc..c499e17858 100644 --- a/signer/core/stdioui.go +++ b/signer/core/stdioui.go @@ -21,9 +21,9 @@ import ( "context" "sync" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/internal/ethapi" + "go-ethereum-timing/log" + "go-ethereum-timing/rpc" ) type StdIOUI struct { diff --git a/signer/core/types.go b/signer/core/types.go index 1280557748..a129d229fd 100644 --- a/signer/core/types.go +++ b/signer/core/types.go @@ -23,10 +23,10 @@ import ( "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/core/types" ) type Accounts []Account diff --git a/signer/core/validation.go b/signer/core/validation.go index 7c3ec42741..380b3454d3 100644 --- a/signer/core/validation.go +++ b/signer/core/validation.go @@ -23,7 +23,7 @@ import ( "math/big" "regexp" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) // The validation package contains validation checks for transactions @@ -118,7 +118,7 @@ func (v *Validator) validate(msgs *ValidationMessages, txargs *SendTxArgs, metho if txargs.To == nil { //Contract creation should contain sufficient data to deploy a contract // A typical error is omitting sender due to some quirk in the javascript call - // e.g. https://github.com/ethereum/go-ethereum/issues/16106 + // e.g. https://go-ethereum-timing/issues/16106 if len(data) == 0 { if txargs.Value.ToInt().Cmp(big.NewInt(0)) > 0 { // Sending ether into black hole diff --git a/signer/core/validation_test.go b/signer/core/validation_test.go index 155b25e92c..4c0ea5cd3e 100644 --- a/signer/core/validation_test.go +++ b/signer/core/validation_test.go @@ -21,8 +21,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" ) func hexAddr(a string) common.Address { return common.BytesToAddress(common.FromHex(a)) } diff --git a/signer/rules/rules.go b/signer/rules/rules.go index 07c34db220..9114b9c8ff 100644 --- a/signer/rules/rules.go +++ b/signer/rules/rules.go @@ -22,13 +22,13 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/rules/deps" - "github.com/ethereum/go-ethereum/signer/storage" "github.com/robertkrimen/otto" + "go-ethereum-timing/common" + "go-ethereum-timing/internal/ethapi" + "go-ethereum-timing/log" + "go-ethereum-timing/signer/core" + "go-ethereum-timing/signer/rules/deps" + "go-ethereum-timing/signer/storage" ) var ( diff --git a/signer/rules/rules_test.go b/signer/rules/rules_test.go index 0b520a15bf..f568d771ed 100644 --- a/signer/rules/rules_test.go +++ b/signer/rules/rules_test.go @@ -22,13 +22,13 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/storage" + "go-ethereum-timing/accounts" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/core/types" + "go-ethereum-timing/internal/ethapi" + "go-ethereum-timing/signer/core" + "go-ethereum-timing/signer/storage" ) const JS = ` diff --git a/signer/storage/aes_gcm_storage.go b/signer/storage/aes_gcm_storage.go index 9008318679..892715fd2d 100644 --- a/signer/storage/aes_gcm_storage.go +++ b/signer/storage/aes_gcm_storage.go @@ -26,7 +26,7 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) type storedCredential struct { diff --git a/signer/storage/aes_gcm_storage_test.go b/signer/storage/aes_gcm_storage_test.go index a421a8449d..74ab68b48e 100644 --- a/signer/storage/aes_gcm_storage_test.go +++ b/signer/storage/aes_gcm_storage_test.go @@ -23,9 +23,9 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" "github.com/mattn/go-colorable" + "go-ethereum-timing/common" + "go-ethereum-timing/log" ) func TestEncryption(t *testing.T) { diff --git a/swarm/README.md b/swarm/README.md index e81963217f..3f4a70594f 100644 --- a/swarm/README.md +++ b/swarm/README.md @@ -27,9 +27,9 @@ Swarm is a distributed storage platform and content distribution service, a nati Building Swarm requires Go (version 1.10 or later). - go get -d github.com/ethereum/go-ethereum + go get -d go-ethereum-timing - go install github.com/ethereum/go-ethereum/cmd/swarm + go install go-ethereum-timing/cmd/swarm ## Running Swarm @@ -90,12 +90,12 @@ Swarm documentation can be found at [https://swarm-guide.readthedocs.io](https:/ We assume that you have Go v1.10 installed, and `GOPATH` is set. -You must have your working copy under `$GOPATH/src/github.com/ethereum/go-ethereum`. +You must have your working copy under `$GOPATH/src/go-ethereum-timing`. Most likely you will be working from your fork of `go-ethereum`, let's say from `github.com/nirname/go-ethereum`. Clone or move your fork into the right place: ``` -git clone git@github.com:nirname/go-ethereum.git $GOPATH/src/github.com/ethereum/go-ethereum +git clone git@github.com:nirname/go-ethereum.git $GOPATH/src/go-ethereum-timing ``` @@ -181,7 +181,7 @@ Once you have `stateth` installed, and you have Docker running locally, you have 1. Run `stateth` and keep it running in the background ``` -stateth --rm --grafana-dashboards-folder $GOPATH/src/github.com/ethereum/go-ethereum/swarm/grafana_dashboards --influxdb-database metrics +stateth --rm --grafana-dashboards-folder $GOPATH/src/go-ethereum-timing/swarm/grafana_dashboards --influxdb-database metrics ``` 2. Run `swarm` with at least the following params: @@ -228,7 +228,7 @@ Please make sure your contributions adhere to our coding guidelines: * Code must adhere to the official Go [formatting](https://golang.org/doc/effective_go.html#formatting) guidelines (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)). * Code must be documented adhering to the official Go [commentary](https://golang.org/doc/effective_go.html#commentary) guidelines. * Pull requests need to be based on and opened against the `master` branch. - * [Code review guidelines](https://github.com/ethereum/go-ethereum/wiki/Code-Review-Guidelines). + * [Code review guidelines](https://go-ethereum-timing/wiki/Code-Review-Guidelines). * Commit messages should be prefixed with the package(s) they modify. * E.g. "swarm/fuse: ignore default manifest entry" diff --git a/swarm/api/act.go b/swarm/api/act.go index 9566720b03..63adeb2a50 100644 --- a/swarm/api/act.go +++ b/swarm/api/act.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/sctx" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/crypto/ecies" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/sctx" + "go-ethereum-timing/swarm/storage" "golang.org/x/crypto/scrypt" "golang.org/x/crypto/sha3" cli "gopkg.in/urfave/cli.v1" diff --git a/swarm/api/api.go b/swarm/api/api.go index c6ca1b5774..eb3ad3c3fa 100644 --- a/swarm/api/api.go +++ b/swarm/api/api.go @@ -37,15 +37,15 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "go-ethereum-timing/common" + "go-ethereum-timing/contracts/ens" + "go-ethereum-timing/core/types" + "go-ethereum-timing/metrics" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/spancontext" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/storage/feed" + "go-ethereum-timing/swarm/storage/feed/lookup" opentracing "github.com/opentracing/opentracing-go" ) diff --git a/swarm/api/api_test.go b/swarm/api/api_test.go index eb896f32aa..ed732ba64c 100644 --- a/swarm/api/api_test.go +++ b/swarm/api/api_test.go @@ -28,11 +28,11 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/sctx" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/log" + "go-ethereum-timing/swarm/sctx" + "go-ethereum-timing/swarm/storage" ) func init() { diff --git a/swarm/api/client/client.go b/swarm/api/client/client.go index 5e293cca72..0a6cf2c07e 100644 --- a/swarm/api/client/client.go +++ b/swarm/api/client/client.go @@ -37,12 +37,12 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/storage/feed" "github.com/pborman/uuid" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/swarm/api" + "go-ethereum-timing/swarm/spancontext" + "go-ethereum-timing/swarm/storage/feed" ) var ( diff --git a/swarm/api/client/client_test.go b/swarm/api/client/client_test.go index 39f6e4797d..a67ffc3a10 100644 --- a/swarm/api/client/client_test.go +++ b/swarm/api/client/client_test.go @@ -25,14 +25,14 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/storage/feed/lookup" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/swarm/api" - swarmhttp "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/storage/feed" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/swarm/api" + swarmhttp "go-ethereum-timing/swarm/api/http" + "go-ethereum-timing/swarm/storage/feed" ) func serverFunc(api *api.API) swarmhttp.TestServer { diff --git a/swarm/api/config.go b/swarm/api/config.go index b8de16f5f0..c6cabbb971 100644 --- a/swarm/api/config.go +++ b/swarm/api/config.go @@ -23,16 +23,16 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/services/swap" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/common" + "go-ethereum-timing/contracts/ens" + "go-ethereum-timing/crypto" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/pss" + "go-ethereum-timing/swarm/services/swap" + "go-ethereum-timing/swarm/storage" ) const ( diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go index bd7e1d8705..fd2b2a8eab 100644 --- a/swarm/api/config_test.go +++ b/swarm/api/config_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" ) func TestConfig(t *testing.T) { diff --git a/swarm/api/encrypt.go b/swarm/api/encrypt.go index 0d516b3d57..17f79f4c68 100644 --- a/swarm/api/encrypt.go +++ b/swarm/api/encrypt.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "errors" - "github.com/ethereum/go-ethereum/swarm/storage/encryption" + "go-ethereum-timing/swarm/storage/encryption" "golang.org/x/crypto/sha3" ) diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go index 266ef71bec..1f4f3509d9 100644 --- a/swarm/api/filesystem.go +++ b/swarm/api/filesystem.go @@ -26,9 +26,9 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/common" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/storage" ) const maxParallelFiles = 5 diff --git a/swarm/api/filesystem_test.go b/swarm/api/filesystem_test.go index 02f5bff658..3d6198e6f2 100644 --- a/swarm/api/filesystem_test.go +++ b/swarm/api/filesystem_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/common" + "go-ethereum-timing/swarm/storage" ) var testDownloadDir, _ = ioutil.TempDir(os.TempDir(), "bzz-test") diff --git a/swarm/api/gen_mime.go b/swarm/api/gen_mime.go index 109edeb506..6df4dd1d4e 100644 --- a/swarm/api/gen_mime.go +++ b/swarm/api/gen_mime.go @@ -1,4 +1,4 @@ -// Code generated by github.com/ethereum/go-ethereum/cmd/swarm/mimegen. DO NOT EDIT. +// Code generated by go-ethereum-timing/cmd/swarm/mimegen. DO NOT EDIT. package api diff --git a/swarm/api/http/middleware.go b/swarm/api/http/middleware.go index 320da30462..4848169540 100644 --- a/swarm/api/http/middleware.go +++ b/swarm/api/http/middleware.go @@ -7,12 +7,12 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/sctx" - "github.com/ethereum/go-ethereum/swarm/spancontext" "github.com/pborman/uuid" + "go-ethereum-timing/metrics" + "go-ethereum-timing/swarm/api" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/sctx" + "go-ethereum-timing/swarm/spancontext" ) // Adapt chains h (main request handler) main handler to adapters (middleware handlers) diff --git a/swarm/api/http/response.go b/swarm/api/http/response.go index d4e81d7f67..119079d8a1 100644 --- a/swarm/api/http/response.go +++ b/swarm/api/http/response.go @@ -24,9 +24,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/swarm/api" ) var ( diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go index be8ea39856..08f891890a 100644 --- a/swarm/api/http/roundtripper.go +++ b/swarm/api/http/roundtripper.go @@ -20,17 +20,17 @@ import ( "fmt" "net/http" - "github.com/ethereum/go-ethereum/swarm/log" + "go-ethereum-timing/swarm/log" ) /* http roundtripper to register for bzz url scheme -see https://github.com/ethereum/go-ethereum/issues/2040 +see https://go-ethereum-timing/issues/2040 Usage: import ( - "github.com/ethereum/go-ethereum/common/httpclient" - "github.com/ethereum/go-ethereum/swarm/api/http" + "go-ethereum-timing/common/httpclient" + "go-ethereum-timing/swarm/api/http" ) client := httpclient.New() // for (private) swarm proxy running locally diff --git a/swarm/api/http/sctx.go b/swarm/api/http/sctx.go index b8dafab0b7..d0d3db01df 100644 --- a/swarm/api/http/sctx.go +++ b/swarm/api/http/sctx.go @@ -3,8 +3,8 @@ package http import ( "context" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/sctx" + "go-ethereum-timing/swarm/api" + "go-ethereum-timing/swarm/sctx" ) type uriKey struct{} diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go index 3c6735a73e..e6c052ed19 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -35,13 +35,13 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed" "github.com/rs/cors" + "go-ethereum-timing/common" + "go-ethereum-timing/metrics" + "go-ethereum-timing/swarm/api" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/storage/feed" ) var ( diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go index e82762ce05..35e610e492 100644 --- a/swarm/api/http/server_test.go +++ b/swarm/api/http/server_test.go @@ -37,17 +37,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "go-ethereum-timing/swarm/storage/feed/lookup" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed" - "github.com/ethereum/go-ethereum/swarm/testutil" + "go-ethereum-timing/common" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/swarm/api" + swarm "go-ethereum-timing/swarm/api/client" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/storage/feed" + "go-ethereum-timing/swarm/testutil" ) func init() { diff --git a/swarm/api/http/templates.go b/swarm/api/http/templates.go index 986f5f8873..6f525f658c 100644 --- a/swarm/api/http/templates.go +++ b/swarm/api/http/templates.go @@ -22,7 +22,7 @@ import ( "html/template" "path" - "github.com/ethereum/go-ethereum/swarm/api" + "go-ethereum-timing/swarm/api" ) type htmlListData struct { diff --git a/swarm/api/http/test_server.go b/swarm/api/http/test_server.go index 9245c9c5b8..c5d027c2ed 100644 --- a/swarm/api/http/test_server.go +++ b/swarm/api/http/test_server.go @@ -23,9 +23,9 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed" + "go-ethereum-timing/swarm/api" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/storage/feed" ) type TestServer interface { diff --git a/swarm/api/inspector.go b/swarm/api/inspector.go index 6706b32e65..f170adbba0 100644 --- a/swarm/api/inspector.go +++ b/swarm/api/inspector.go @@ -19,8 +19,8 @@ package api import ( "context" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/storage" ) type Inspector struct { diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index 890ed88bd4..b1b61725da 100644 --- a/swarm/api/manifest.go +++ b/swarm/api/manifest.go @@ -27,11 +27,11 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/swarm/storage/feed" + "go-ethereum-timing/swarm/storage/feed" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/common" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/storage" ) const ( diff --git a/swarm/api/manifest_test.go b/swarm/api/manifest_test.go index 1c8e53c433..30c33bc6a3 100644 --- a/swarm/api/manifest_test.go +++ b/swarm/api/manifest_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/swarm/storage" ) func manifest(paths ...string) (manifestReader storage.LazySectionReader) { diff --git a/swarm/api/storage.go b/swarm/api/storage.go index 254375b777..f28f39f495 100644 --- a/swarm/api/storage.go +++ b/swarm/api/storage.go @@ -20,7 +20,7 @@ import ( "context" "path" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/swarm/storage" ) type Response struct { diff --git a/swarm/api/uri.go b/swarm/api/uri.go index 09cfa45020..f129d3999a 100644 --- a/swarm/api/uri.go +++ b/swarm/api/uri.go @@ -22,8 +22,8 @@ import ( "regexp" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/common" + "go-ethereum-timing/swarm/storage" ) //matches hex swarm hashes diff --git a/swarm/api/uri_test.go b/swarm/api/uri_test.go index a03874c433..52802faad7 100644 --- a/swarm/api/uri_test.go +++ b/swarm/api/uri_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/swarm/storage" ) func TestParseURI(t *testing.T) { diff --git a/swarm/bmt/bmt_test.go b/swarm/bmt/bmt_test.go index ab712d08c2..af3250f2d8 100644 --- a/swarm/bmt/bmt_test.go +++ b/swarm/bmt/bmt_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/testutil" + "go-ethereum-timing/swarm/testutil" "golang.org/x/crypto/sha3" ) diff --git a/swarm/dev/Makefile b/swarm/dev/Makefile index 365964b7f5..ff54d00b9e 100644 --- a/swarm/dev/Makefile +++ b/swarm/dev/Makefile @@ -3,12 +3,12 @@ default: build build: - go build -o bin/swarm github.com/ethereum/go-ethereum/cmd/swarm - go build -o bin/geth github.com/ethereum/go-ethereum/cmd/geth - go build -o bin/bootnode github.com/ethereum/go-ethereum/cmd/bootnode + go build -o bin/swarm go-ethereum-timing/cmd/swarm + go build -o bin/geth go-ethereum-timing/cmd/geth + go build -o bin/bootnode go-ethereum-timing/cmd/bootnode cluster: build scripts/boot-cluster.sh test: - go test -v github.com/ethereum/go-ethereum/swarm/... + go test -v go-ethereum-timing/swarm/... diff --git a/swarm/dev/bashrc b/swarm/dev/bashrc index efb504fa36..7f71ba1075 100644 --- a/swarm/dev/bashrc +++ b/swarm/dev/bashrc @@ -1,4 +1,4 @@ -export ROOT="${GOPATH}/src/github.com/ethereum/go-ethereum" +export ROOT="${GOPATH}/src/go-ethereum-timing" export PATH="${ROOT}/swarm/dev/bin:${PATH}" cd "${ROOT}/swarm/dev" diff --git a/swarm/dev/run.sh b/swarm/dev/run.sh index 2ad600dedf..72be146578 100755 --- a/swarm/dev/run.sh +++ b/swarm/dev/run.sh @@ -80,7 +80,7 @@ run_image() { --rm \ --hostname "${name}" \ --name "${name}" \ - --volume "${ROOT}:/go/src/github.com/ethereum/go-ethereum" \ + --volume "${ROOT}:/go/src/go-ethereum-timing" \ --volume "/var/run/docker.sock:/var/run/docker.sock" \ ${docker_args} \ "${name}" \ diff --git a/swarm/docker/Dockerfile b/swarm/docker/Dockerfile index 9450609dd8..390113a2de 100644 --- a/swarm/docker/Dockerfile +++ b/swarm/docker/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --update git gcc g++ linux-headers RUN mkdir -p $GOPATH/src/github.com/ethereum && \ cd $GOPATH/src/github.com/ethereum && \ git clone https://github.com/ethersphere/go-ethereum && \ - cd $GOPATH/src/github.com/ethereum/go-ethereum && \ + cd $GOPATH/src/go-ethereum-timing && \ git checkout ${VERSION} && \ go install -ldflags "-X main.gitCommit=${VERSION}" ./cmd/swarm && \ go install -ldflags "-X main.gitCommit=${VERSION}" ./cmd/swarm/swarm-smoke && \ diff --git a/swarm/fuse/fuse_dir.go b/swarm/fuse/fuse_dir.go index 7f66451f10..35a6c30e01 100644 --- a/swarm/fuse/fuse_dir.go +++ b/swarm/fuse/fuse_dir.go @@ -25,7 +25,7 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/ethereum/go-ethereum/swarm/log" + "go-ethereum-timing/swarm/log" "golang.org/x/net/context" ) diff --git a/swarm/fuse/fuse_file.go b/swarm/fuse/fuse_file.go index ca04f737e2..c09feb63c7 100644 --- a/swarm/fuse/fuse_file.go +++ b/swarm/fuse/fuse_file.go @@ -26,8 +26,8 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/storage" "golang.org/x/net/context" ) diff --git a/swarm/fuse/swarmfs.go b/swarm/fuse/swarmfs.go index c7aa983b7d..8b4ac1f9b4 100644 --- a/swarm/fuse/swarmfs.go +++ b/swarm/fuse/swarmfs.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/swarm/api" + "go-ethereum-timing/swarm/api" ) const ( diff --git a/swarm/fuse/swarmfs_test.go b/swarm/fuse/swarmfs_test.go index 460e31c4e9..2a4157b8c1 100644 --- a/swarm/fuse/swarmfs_test.go +++ b/swarm/fuse/swarmfs_test.go @@ -29,11 +29,11 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" colorable "github.com/mattn/go-colorable" + "go-ethereum-timing/log" + "go-ethereum-timing/swarm/api" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/testutil" ) var ( diff --git a/swarm/fuse/swarmfs_unix.go b/swarm/fuse/swarmfs_unix.go index 9ff55cc324..56b61812ea 100644 --- a/swarm/fuse/swarmfs_unix.go +++ b/swarm/fuse/swarmfs_unix.go @@ -30,9 +30,9 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/log" + "go-ethereum-timing/common" + "go-ethereum-timing/swarm/api" + "go-ethereum-timing/swarm/log" ) var ( diff --git a/swarm/fuse/swarmfs_util.go b/swarm/fuse/swarmfs_util.go index 4f2e1416b6..bfb10d29fa 100644 --- a/swarm/fuse/swarmfs_util.go +++ b/swarm/fuse/swarmfs_util.go @@ -24,7 +24,7 @@ import ( "os/exec" "runtime" - "github.com/ethereum/go-ethereum/swarm/log" + "go-ethereum-timing/swarm/log" ) func externalUnmount(mountPoint string) error { diff --git a/swarm/log/log.go b/swarm/log/log.go index ce372632e8..375b0d8955 100644 --- a/swarm/log/log.go +++ b/swarm/log/log.go @@ -1,8 +1,8 @@ package log import ( - l "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + l "go-ethereum-timing/log" + "go-ethereum-timing/metrics" ) const ( diff --git a/swarm/metrics/flags.go b/swarm/metrics/flags.go index d348dc3e4d..392d12deb9 100644 --- a/swarm/metrics/flags.go +++ b/swarm/metrics/flags.go @@ -19,10 +19,10 @@ package metrics import ( "time" - "github.com/ethereum/go-ethereum/cmd/utils" - gethmetrics "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" - "github.com/ethereum/go-ethereum/swarm/log" + "go-ethereum-timing/cmd/utils" + gethmetrics "go-ethereum-timing/metrics" + "go-ethereum-timing/metrics/influxdb" + "go-ethereum-timing/swarm/log" cli "gopkg.in/urfave/cli.v1" ) diff --git a/swarm/network/discovery.go b/swarm/network/discovery.go index 4c503047a5..a22c5ca515 100644 --- a/swarm/network/discovery.go +++ b/swarm/network/discovery.go @@ -21,7 +21,7 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/swarm/pot" + "go-ethereum-timing/swarm/pot" ) // discovery bzz extension for requesting and relaying node address records diff --git a/swarm/network/discovery_test.go b/swarm/network/discovery_test.go index dd3299c0f1..49a1a45943 100644 --- a/swarm/network/discovery_test.go +++ b/swarm/network/discovery_test.go @@ -19,7 +19,7 @@ package network import ( "testing" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + p2ptest "go-ethereum-timing/p2p/testing" ) /*** diff --git a/swarm/network/fetcher.go b/swarm/network/fetcher.go index 6b21751669..4bdb8293df 100644 --- a/swarm/network/fetcher.go +++ b/swarm/network/fetcher.go @@ -21,9 +21,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/swarm/storage" ) const ( diff --git a/swarm/network/fetcher_test.go b/swarm/network/fetcher_test.go index 4e464f10f3..1183b679ab 100644 --- a/swarm/network/fetcher_test.go +++ b/swarm/network/fetcher_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "go-ethereum-timing/p2p/enode" ) var requestedPeerID = enode.HexID("3431c3939e1ee2a6345e976a8234f9870152d64879f30bc272a074f6859e75e8") diff --git a/swarm/network/hive.go b/swarm/network/hive.go index a0b6b988ab..83832d6489 100644 --- a/swarm/network/hive.go +++ b/swarm/network/hive.go @@ -21,11 +21,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/state" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/state" ) /* diff --git a/swarm/network/hive_test.go b/swarm/network/hive_test.go index fea4347ead..46929b8ddf 100644 --- a/swarm/network/hive_test.go +++ b/swarm/network/hive_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/swarm/state" + p2ptest "go-ethereum-timing/p2p/testing" + "go-ethereum-timing/swarm/state" ) func newHiveTester(t *testing.T, params *HiveParams, n int, store state.Store) (*bzzTester, *Hive) { diff --git a/swarm/network/kademlia.go b/swarm/network/kademlia.go index 146f391067..47becd93ae 100644 --- a/swarm/network/kademlia.go +++ b/swarm/network/kademlia.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/pot" - sv "github.com/ethereum/go-ethereum/swarm/version" + "go-ethereum-timing/common" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/pot" + sv "go-ethereum-timing/swarm/version" ) /* diff --git a/swarm/network/kademlia_test.go b/swarm/network/kademlia_test.go index b4663eee5e..7946e0f257 100644 --- a/swarm/network/kademlia_test.go +++ b/swarm/network/kademlia_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/swarm/pot" + "go-ethereum-timing/common" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/protocols" + "go-ethereum-timing/swarm/pot" ) func init() { diff --git a/swarm/network/networkid_test.go b/swarm/network/networkid_test.go index 9d47cf9f6a..a0ea486102 100644 --- a/swarm/network/networkid_test.go +++ b/swarm/network/networkid_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/rpc" ) var ( diff --git a/swarm/network/priorityqueue/priorityqueue.go b/swarm/network/priorityqueue/priorityqueue.go index 5385026054..41e88d0be0 100644 --- a/swarm/network/priorityqueue/priorityqueue.go +++ b/swarm/network/priorityqueue/priorityqueue.go @@ -29,7 +29,7 @@ import ( "context" "errors" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/log" ) var ( diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go index 6f8eadad2a..5dadb7fa4d 100644 --- a/swarm/network/protocol.go +++ b/swarm/network/protocol.go @@ -24,13 +24,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/state" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/protocols" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/state" ) const ( diff --git a/swarm/network/protocol_test.go b/swarm/network/protocol_test.go index 64ce7ba4ab..48853986cb 100644 --- a/swarm/network/protocol_test.go +++ b/swarm/network/protocol_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/protocols" + p2ptest "go-ethereum-timing/p2p/testing" ) const ( diff --git a/swarm/network/simulation/bucket.go b/swarm/network/simulation/bucket.go index 49a1f43091..3cda487ee3 100644 --- a/swarm/network/simulation/bucket.go +++ b/swarm/network/simulation/bucket.go @@ -16,7 +16,7 @@ package simulation -import "github.com/ethereum/go-ethereum/p2p/enode" +import "go-ethereum-timing/p2p/enode" // BucketKey is the type that should be used for keys in simulation buckets. type BucketKey string diff --git a/swarm/network/simulation/bucket_test.go b/swarm/network/simulation/bucket_test.go index 2273d35a29..be00134654 100644 --- a/swarm/network/simulation/bucket_test.go +++ b/swarm/network/simulation/bucket_test.go @@ -20,8 +20,8 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/simulations/adapters" ) // TestServiceBucket tests all bucket functionality using subtests. diff --git a/swarm/network/simulation/events.go b/swarm/network/simulation/events.go index d73c3af4ee..5511465284 100644 --- a/swarm/network/simulation/events.go +++ b/swarm/network/simulation/events.go @@ -20,8 +20,8 @@ import ( "context" "sync" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations" ) // PeerEvent is the type of the channel returned by Simulation.PeerEvents. diff --git a/swarm/network/simulation/example_test.go b/swarm/network/simulation/example_test.go index 9d14929795..8b811a41f9 100644 --- a/swarm/network/simulation/example_test.go +++ b/swarm/network/simulation/example_test.go @@ -22,11 +22,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/network/simulation" ) // Every node can have a Kademlia associated using the node bucket under diff --git a/swarm/network/simulation/http.go b/swarm/network/simulation/http.go index 69ae3baec2..00413670d1 100644 --- a/swarm/network/simulation/http.go +++ b/swarm/network/simulation/http.go @@ -20,8 +20,8 @@ import ( "fmt" "net/http" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/simulations" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/simulations" ) // Package defaults. diff --git a/swarm/network/simulation/http_test.go b/swarm/network/simulation/http_test.go index dffd03a032..4827480c35 100644 --- a/swarm/network/simulation/http_test.go +++ b/swarm/network/simulation/http_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/simulations/adapters" ) func TestSimulationWithHTTPServer(t *testing.T) { diff --git a/swarm/network/simulation/kademlia.go b/swarm/network/simulation/kademlia.go index c58d402b09..e7e4cf8adc 100644 --- a/swarm/network/simulation/kademlia.go +++ b/swarm/network/simulation/kademlia.go @@ -21,10 +21,10 @@ import ( "encoding/hex" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/network" + "go-ethereum-timing/common" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/swarm/network" ) // BucketKeyKademlia is the key to be used for storing the kademlia diff --git a/swarm/network/simulation/kademlia_test.go b/swarm/network/simulation/kademlia_test.go index 36b244d3d0..7cf9e1daaf 100644 --- a/swarm/network/simulation/kademlia_test.go +++ b/swarm/network/simulation/kademlia_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/swarm/network" ) func TestWaitTillHealthy(t *testing.T) { diff --git a/swarm/network/simulation/node.go b/swarm/network/simulation/node.go index 24afe51a41..976d9d34f3 100644 --- a/swarm/network/simulation/node.go +++ b/swarm/network/simulation/node.go @@ -24,10 +24,10 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" ) // NodeIDs returns NodeIDs for all nodes in the network. diff --git a/swarm/network/simulation/node_test.go b/swarm/network/simulation/node_test.go index bae5afb260..e8c859a505 100644 --- a/swarm/network/simulation/node_test.go +++ b/swarm/network/simulation/node_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/swarm/network" ) func TestUpDownNodeIDs(t *testing.T) { diff --git a/swarm/network/simulation/service.go b/swarm/network/simulation/service.go index 0ac8149a94..2f304cc2e5 100644 --- a/swarm/network/simulation/service.go +++ b/swarm/network/simulation/service.go @@ -17,9 +17,9 @@ package simulation import ( - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/adapters" ) // Service returns a single Service by name on a particular node diff --git a/swarm/network/simulation/simulation.go b/swarm/network/simulation/simulation.go index e18d19a67c..9fe6a14bf1 100644 --- a/swarm/network/simulation/simulation.go +++ b/swarm/network/simulation/simulation.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/swarm/network" ) // Common errors that are returned by functions in this package. diff --git a/swarm/network/simulation/simulation_test.go b/swarm/network/simulation/simulation_test.go index 1d0338f593..8a26459d0b 100644 --- a/swarm/network/simulation/simulation_test.go +++ b/swarm/network/simulation/simulation_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" "github.com/mattn/go-colorable" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" ) var ( diff --git a/swarm/network/simulations/discovery/discovery_test.go b/swarm/network/simulations/discovery/discovery_test.go index 5227de3bb5..85af52b2f2 100644 --- a/swarm/network/simulations/discovery/discovery_test.go +++ b/swarm/network/simulations/discovery/discovery_test.go @@ -27,16 +27,16 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/state" colorable "github.com/mattn/go-colorable" + "go-ethereum-timing/common" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/state" ) // serviceName is used with the exec adapter so the exec'd binary knows which diff --git a/swarm/network/simulations/overlay.go b/swarm/network/simulations/overlay.go index 63938809e4..25cb095fff 100644 --- a/swarm/network/simulations/overlay.go +++ b/swarm/network/simulations/overlay.go @@ -27,14 +27,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/state" colorable "github.com/mattn/go-colorable" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/state" ) var ( diff --git a/swarm/network/simulations/overlay_test.go b/swarm/network/simulations/overlay_test.go index 41ed5ed265..045cb294bd 100644 --- a/swarm/network/simulations/overlay_test.go +++ b/swarm/network/simulations/overlay_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/swarm/log" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/swarm/log" ) var ( diff --git a/swarm/network/stream/common_test.go b/swarm/network/stream/common_test.go index afd08d2754..426d7983e6 100644 --- a/swarm/network/stream/common_test.go +++ b/swarm/network/stream/common_test.go @@ -30,17 +30,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - mockmem "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" - "github.com/ethereum/go-ethereum/swarm/testutil" colorable "github.com/mattn/go-colorable" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/adapters" + p2ptest "go-ethereum-timing/p2p/testing" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/network/simulation" + "go-ethereum-timing/swarm/state" + "go-ethereum-timing/swarm/storage" + mockmem "go-ethereum-timing/swarm/storage/mock/mem" + "go-ethereum-timing/swarm/testutil" ) var ( diff --git a/swarm/network/stream/delivery.go b/swarm/network/stream/delivery.go index fae6994f0c..778f6dd70e 100644 --- a/swarm/network/stream/delivery.go +++ b/swarm/network/stream/delivery.go @@ -21,13 +21,13 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/storage" opentracing "github.com/opentracing/opentracing-go" + "go-ethereum-timing/metrics" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/spancontext" + "go-ethereum-timing/swarm/storage" ) const ( diff --git a/swarm/network/stream/delivery_test.go b/swarm/network/stream/delivery_test.go index 49e4a423a7..b510a71b9e 100644 --- a/swarm/network/stream/delivery_test.go +++ b/swarm/network/stream/delivery_test.go @@ -25,19 +25,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - pq "github.com/ethereum/go-ethereum/swarm/network/priorityqueue" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/protocols" + "go-ethereum-timing/p2p/simulations/adapters" + p2ptest "go-ethereum-timing/p2p/testing" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/network" + pq "go-ethereum-timing/swarm/network/priorityqueue" + "go-ethereum-timing/swarm/network/simulation" + "go-ethereum-timing/swarm/state" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/testutil" ) //Tests initializing a retrieve request diff --git a/swarm/network/stream/intervals/dbstore_test.go b/swarm/network/stream/intervals/dbstore_test.go index 6716e593ab..087646c654 100644 --- a/swarm/network/stream/intervals/dbstore_test.go +++ b/swarm/network/stream/intervals/dbstore_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/state" + "go-ethereum-timing/swarm/state" ) // TestDBStore tests basic functionality of DBStore. diff --git a/swarm/network/stream/intervals/store_test.go b/swarm/network/stream/intervals/store_test.go index a36814b717..d0d18d5e89 100644 --- a/swarm/network/stream/intervals/store_test.go +++ b/swarm/network/stream/intervals/store_test.go @@ -19,7 +19,7 @@ package intervals import ( "testing" - "github.com/ethereum/go-ethereum/swarm/state" + "go-ethereum-timing/swarm/state" ) // TestInmemoryStore tests basic functionality of InmemoryStore. diff --git a/swarm/network/stream/intervals_test.go b/swarm/network/stream/intervals_test.go index 009a941ef4..a9ccfdc077 100644 --- a/swarm/network/stream/intervals_test.go +++ b/swarm/network/stream/intervals_test.go @@ -25,14 +25,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/swarm/network/simulation" + "go-ethereum-timing/swarm/state" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/testutil" ) func TestIntervalsLive(t *testing.T) { diff --git a/swarm/network/stream/lightnode_test.go b/swarm/network/stream/lightnode_test.go index 501660fab4..afb37d26ba 100644 --- a/swarm/network/stream/lightnode_test.go +++ b/swarm/network/stream/lightnode_test.go @@ -18,7 +18,7 @@ package stream import ( "testing" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + p2ptest "go-ethereum-timing/p2p/testing" ) // This test checks the default behavior of the server, that is diff --git a/swarm/network/stream/messages.go b/swarm/network/stream/messages.go index de4e8a3bb4..466e03849c 100644 --- a/swarm/network/stream/messages.go +++ b/swarm/network/stream/messages.go @@ -21,12 +21,12 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - bv "github.com/ethereum/go-ethereum/swarm/network/bitvector" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/storage" "github.com/opentracing/opentracing-go" + "go-ethereum-timing/metrics" + "go-ethereum-timing/swarm/log" + bv "go-ethereum-timing/swarm/network/bitvector" + "go-ethereum-timing/swarm/spancontext" + "go-ethereum-timing/swarm/storage" ) var syncBatchTimeout = 30 * time.Second diff --git a/swarm/network/stream/peer.go b/swarm/network/stream/peer.go index 68da8f44ad..d537ad64be 100644 --- a/swarm/network/stream/peer.go +++ b/swarm/network/stream/peer.go @@ -23,15 +23,15 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/swarm/log" - pq "github.com/ethereum/go-ethereum/swarm/network/priorityqueue" - "github.com/ethereum/go-ethereum/swarm/network/stream/intervals" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" opentracing "github.com/opentracing/opentracing-go" + "go-ethereum-timing/metrics" + "go-ethereum-timing/p2p/protocols" + "go-ethereum-timing/swarm/log" + pq "go-ethereum-timing/swarm/network/priorityqueue" + "go-ethereum-timing/swarm/network/stream/intervals" + "go-ethereum-timing/swarm/spancontext" + "go-ethereum-timing/swarm/state" + "go-ethereum-timing/swarm/storage" ) type notFoundError struct { diff --git a/swarm/network/stream/snapshot_retrieval_test.go b/swarm/network/stream/snapshot_retrieval_test.go index afb023ae29..61f2d7cef9 100644 --- a/swarm/network/stream/snapshot_retrieval_test.go +++ b/swarm/network/stream/snapshot_retrieval_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/network/simulation" + "go-ethereum-timing/swarm/state" + "go-ethereum-timing/swarm/storage" ) //constants for random file generation diff --git a/swarm/network/stream/snapshot_sync_test.go b/swarm/network/stream/snapshot_sync_test.go index b45d0aed50..72f4d81387 100644 --- a/swarm/network/stream/snapshot_sync_test.go +++ b/swarm/network/stream/snapshot_sync_test.go @@ -26,20 +26,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mock" - mockmem "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" - "github.com/ethereum/go-ethereum/swarm/testutil" + "go-ethereum-timing/common" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/network/simulation" + "go-ethereum-timing/swarm/pot" + "go-ethereum-timing/swarm/state" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/storage/mock" + mockmem "go-ethereum-timing/swarm/storage/mock/mem" + "go-ethereum-timing/swarm/testutil" ) const MaxTimeout = 600 diff --git a/swarm/network/stream/stream.go b/swarm/network/stream/stream.go index cb59121850..4874dd6450 100644 --- a/swarm/network/stream/stream.go +++ b/swarm/network/stream/stream.go @@ -25,16 +25,16 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/stream/intervals" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/metrics" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/protocols" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/network/stream/intervals" + "go-ethereum-timing/swarm/state" + "go-ethereum-timing/swarm/storage" ) const ( diff --git a/swarm/network/stream/streamer_test.go b/swarm/network/stream/streamer_test.go index e92ee37834..2b6eff1bd6 100644 --- a/swarm/network/stream/streamer_test.go +++ b/swarm/network/stream/streamer_test.go @@ -27,15 +27,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" + "go-ethereum-timing/common" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/adapters" + p2ptest "go-ethereum-timing/p2p/testing" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/network/simulation" + "go-ethereum-timing/swarm/state" "golang.org/x/crypto/sha3" ) diff --git a/swarm/network/stream/syncer.go b/swarm/network/stream/syncer.go index 4fb8b9342b..b81d1508aa 100644 --- a/swarm/network/stream/syncer.go +++ b/swarm/network/stream/syncer.go @@ -21,9 +21,9 @@ import ( "strconv" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/metrics" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/storage" ) const ( diff --git a/swarm/network/stream/syncer_test.go b/swarm/network/stream/syncer_test.go index be0752a9d0..e315e4c6cf 100644 --- a/swarm/network/stream/syncer_test.go +++ b/swarm/network/stream/syncer_test.go @@ -27,17 +27,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mock" - "github.com/ethereum/go-ethereum/swarm/testutil" + "go-ethereum-timing/common" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/network/simulation" + "go-ethereum-timing/swarm/state" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/storage/mock" + "go-ethereum-timing/swarm/testutil" ) const dataChunkCount = 200 diff --git a/swarm/network/stream/visualized_snapshot_sync_sim_test.go b/swarm/network/stream/visualized_snapshot_sync_sim_test.go index cf4405ec1a..7e06858374 100644 --- a/swarm/network/stream/visualized_snapshot_sync_sim_test.go +++ b/swarm/network/stream/visualized_snapshot_sync_sim_test.go @@ -28,17 +28,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/protocols" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/rlp" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/network/simulation" + "go-ethereum-timing/swarm/state" + "go-ethereum-timing/swarm/storage" ) /* diff --git a/swarm/network_test.go b/swarm/network_test.go index 71d4b8f16a..26b08b8f86 100644 --- a/swarm/network_test.go +++ b/swarm/network_test.go @@ -28,15 +28,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/storage" colorable "github.com/mattn/go-colorable" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/swarm/api" + "go-ethereum-timing/swarm/network/simulation" + "go-ethereum-timing/swarm/storage" ) var ( diff --git a/swarm/pot/address.go b/swarm/pot/address.go index 91cada2e88..19f840a566 100644 --- a/swarm/pot/address.go +++ b/swarm/pot/address.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) var ( diff --git a/swarm/pot/pot_test.go b/swarm/pot/pot_test.go index 83d604919f..91349588c8 100644 --- a/swarm/pot/pot_test.go +++ b/swarm/pot/pot_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/log" + "go-ethereum-timing/swarm/log" ) const ( diff --git a/swarm/pss/api.go b/swarm/pss/api.go index 4556d7b7c4..4ff26d61c1 100644 --- a/swarm/pss/api.go +++ b/swarm/pss/api.go @@ -21,11 +21,11 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm/log" ) // Wrapper for receiving pss messages when using the pss API diff --git a/swarm/pss/client/client.go b/swarm/pss/client/client.go index 5ee387aa79..b8eabdb6ef 100644 --- a/swarm/pss/client/client.go +++ b/swarm/pss/client/client.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/pss" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/protocols" + "go-ethereum-timing/rlp" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/pss" ) const ( diff --git a/swarm/pss/client/client_test.go b/swarm/pss/client/client_test.go index 1c6f2e522d..3682a43cea 100644 --- a/swarm/pss/client/client_test.go +++ b/swarm/pss/client/client_test.go @@ -27,18 +27,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/state" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/pss" + "go-ethereum-timing/swarm/state" + whisper "go-ethereum-timing/whisper/whisperv6" ) type protoCtrl struct { diff --git a/swarm/pss/client/doc.go b/swarm/pss/client/doc.go index 080af45a9a..d70c251c80 100644 --- a/swarm/pss/client/doc.go +++ b/swarm/pss/client/doc.go @@ -28,11 +28,11 @@ // "context" // "fmt" // "os" -// pss "github.com/ethereum/go-ethereum/swarm/pss/client" -// "github.com/ethereum/go-ethereum/p2p/protocols" -// "github.com/ethereum/go-ethereum/p2p" -// "github.com/ethereum/go-ethereum/swarm/pot" -// "github.com/ethereum/go-ethereum/swarm/log" +// pss "go-ethereum-timing/swarm/pss/client" +// "go-ethereum-timing/p2p/protocols" +// "go-ethereum-timing/p2p" +// "go-ethereum-timing/swarm/pot" +// "go-ethereum-timing/swarm/log" // ) // // type FooMsg struct { diff --git a/swarm/pss/forwarding_test.go b/swarm/pss/forwarding_test.go index 746d4dc404..e206aea2d5 100644 --- a/swarm/pss/forwarding_test.go +++ b/swarm/pss/forwarding_test.go @@ -6,13 +6,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pot" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/protocols" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/pot" + whisper "go-ethereum-timing/whisper/whisperv6" ) type testCase struct { diff --git a/swarm/pss/handshake.go b/swarm/pss/handshake.go index bb67b51563..c3f29c9129 100644 --- a/swarm/pss/handshake.go +++ b/swarm/pss/handshake.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rlp" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm/log" ) const ( diff --git a/swarm/pss/handshake_test.go b/swarm/pss/handshake_test.go index 895163f301..5c61c4d902 100644 --- a/swarm/pss/handshake_test.go +++ b/swarm/pss/handshake_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/log" + "go-ethereum-timing/swarm/log" ) // asymmetrical key exchange between two directly connected peers diff --git a/swarm/pss/keystore.go b/swarm/pss/keystore.go index 510d21bcfd..bd76779e8d 100644 --- a/swarm/pss/keystore.go +++ b/swarm/pss/keystore.go @@ -22,11 +22,11 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/metrics" + "go-ethereum-timing/swarm/log" + whisper "go-ethereum-timing/whisper/whisperv6" ) type KeyStore struct { diff --git a/swarm/pss/notify/notify.go b/swarm/pss/notify/notify.go index e9d40dc321..f80e6942ea 100644 --- a/swarm/pss/notify/notify.go +++ b/swarm/pss/notify/notify.go @@ -5,12 +5,12 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/pss" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rlp" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/pss" ) const ( diff --git a/swarm/pss/notify/notify_test.go b/swarm/pss/notify/notify_test.go index bd9b2a4c1b..5d710fd914 100644 --- a/swarm/pss/notify/notify_test.go +++ b/swarm/pss/notify/notify_test.go @@ -9,17 +9,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/state" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/pss" + "go-ethereum-timing/swarm/state" + whisper "go-ethereum-timing/whisper/whisperv6" ) var ( diff --git a/swarm/pss/ping.go b/swarm/pss/ping.go index ff635f40a4..db2455294a 100644 --- a/swarm/pss/ping.go +++ b/swarm/pss/ping.go @@ -23,9 +23,9 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/swarm/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/protocols" + "go-ethereum-timing/swarm/log" ) // Generic ping protocol implementation for diff --git a/swarm/pss/protocol.go b/swarm/pss/protocol.go index 7f186f6153..eddc758e0b 100644 --- a/swarm/pss/protocol.go +++ b/swarm/pss/protocol.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/protocols" + "go-ethereum-timing/rlp" + "go-ethereum-timing/swarm/log" ) const ( diff --git a/swarm/pss/protocol_test.go b/swarm/pss/protocol_test.go index 520c48a202..67ba8c20dc 100644 --- a/swarm/pss/protocol_test.go +++ b/swarm/pss/protocol_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/log" + "go-ethereum-timing/common" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/swarm/log" ) type protoCtrl struct { diff --git a/swarm/pss/pss.go b/swarm/pss/pss.go index 183aab04d2..23f1f793eb 100644 --- a/swarm/pss/pss.go +++ b/swarm/pss/pss.go @@ -27,18 +27,18 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/storage" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/metrics" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/protocols" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/pot" + "go-ethereum-timing/swarm/storage" + whisper "go-ethereum-timing/whisper/whisperv6" "golang.org/x/crypto/sha3" ) diff --git a/swarm/pss/pss_test.go b/swarm/pss/pss_test.go index 675b4cfcd6..f2bead06e4 100644 --- a/swarm/pss/pss_test.go +++ b/swarm/pss/pss_test.go @@ -34,23 +34,23 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/state" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/metrics/influxdb" + "go-ethereum-timing/node" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/protocols" + "go-ethereum-timing/p2p/simulations" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/pot" + "go-ethereum-timing/swarm/state" + whisper "go-ethereum-timing/whisper/whisperv6" ) var ( diff --git a/swarm/pss/types.go b/swarm/pss/types.go index 2ce1f5cfb0..edd202d012 100644 --- a/swarm/pss/types.go +++ b/swarm/pss/types.go @@ -21,12 +21,12 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/storage" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rlp" + "go-ethereum-timing/swarm/storage" + whisper "go-ethereum-timing/whisper/whisperv6" ) const ( diff --git a/swarm/pss/writeup.md b/swarm/pss/writeup.md index af731fe7fd..a4ea7c324f 100644 --- a/swarm/pss/writeup.md +++ b/swarm/pss/writeup.md @@ -36,22 +36,22 @@ go test -race -v ./swarm/pss -cpu 4 -run TestNetwork 1 ================== 2 WARNING: DATA RACE 3 Read at 0x00c424d456a0 by goroutine 1089: - 4 github.com/ethereum/go-ethereum/swarm/pss.(*Pss).forward.func1() - 5 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/swarm/pss/pss.go:654 +0x44f - 6 github.com/ethereum/go-ethereum/swarm/network.(*Kademlia).eachConn.func1() - 7 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/swarm/network/kademlia.go:350 +0xc9 - 8 github.com/ethereum/go-ethereum/pot.(*Pot).eachNeighbour.func1() - 9 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/pot/pot.go:599 +0x59 + 4 go-ethereum-timing/swarm/pss.(*Pss).forward.func1() + 5 /Users/nonsense/code/src/go-ethereum-timing/swarm/pss/pss.go:654 +0x44f + 6 go-ethereum-timing/swarm/network.(*Kademlia).eachConn.func1() + 7 /Users/nonsense/code/src/go-ethereum-timing/swarm/network/kademlia.go:350 +0xc9 + 8 go-ethereum-timing/pot.(*Pot).eachNeighbour.func1() + 9 /Users/nonsense/code/src/go-ethereum-timing/pot/pot.go:599 +0x59 ... 28 29 Previous write at 0x00c424d456a0 by goroutine 829: - 30 github.com/ethereum/go-ethereum/swarm/pss.(*Pss).Run() - 31 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/swarm/pss/pss.go:192 +0x16a - 32 github.com/ethereum/go-ethereum/swarm/pss.(*Pss).Run-fm() - 33 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/swarm/pss/pss.go:185 +0x63 - 34 github.com/ethereum/go-ethereum/p2p.(*Peer).startProtocols.func1() - 35 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/p2p/peer.go:347 +0x8b + 30 go-ethereum-timing/swarm/pss.(*Pss).Run() + 31 /Users/nonsense/code/src/go-ethereum-timing/swarm/pss/pss.go:192 +0x16a + 32 go-ethereum-timing/swarm/pss.(*Pss).Run-fm() + 33 /Users/nonsense/code/src/go-ethereum-timing/swarm/pss/pss.go:185 +0x63 + 34 go-ethereum-timing/p2p.(*Peer).startProtocols.func1() + 35 /Users/nonsense/code/src/go-ethereum-timing/p2p/peer.go:347 +0x8b ... ``` diff --git a/swarm/services/swap/swap.go b/swarm/services/swap/swap.go index 91fa54fcf0..b296250e5f 100644 --- a/swarm/services/swap/swap.go +++ b/swarm/services/swap/swap.go @@ -27,14 +27,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/contracts/chequebook/contract" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/common" + "go-ethereum-timing/contracts/chequebook" + "go-ethereum-timing/contracts/chequebook/contract" + "go-ethereum-timing/core/types" + "go-ethereum-timing/crypto" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/services/swap/swap" ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/services/swap/swap/swap.go b/swarm/services/swap/swap/swap.go index 0afca9ab30..149696341c 100644 --- a/swarm/services/swap/swap/swap.go +++ b/swarm/services/swap/swap/swap.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/swarm/log" + "go-ethereum-timing/swarm/log" ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/services/swap/swap/swap_test.go b/swarm/services/swap/swap/swap_test.go index d0e34f8a54..8da234f72f 100644 --- a/swarm/services/swap/swap/swap_test.go +++ b/swarm/services/swap/swap/swap_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) type testInPayment struct { diff --git a/swarm/shed/db.go b/swarm/shed/db.go index d4e5d1b231..95017cbef1 100644 --- a/swarm/shed/db.go +++ b/swarm/shed/db.go @@ -29,11 +29,11 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" + "go-ethereum-timing/metrics" + "go-ethereum-timing/swarm/log" ) const ( diff --git a/swarm/shed/example_store_test.go b/swarm/shed/example_store_test.go index 9a83855e70..6192f75d04 100644 --- a/swarm/shed/example_store_test.go +++ b/swarm/shed/example_store_test.go @@ -26,9 +26,9 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/swarm/shed" - "github.com/ethereum/go-ethereum/swarm/storage" "github.com/syndtr/goleveldb/leveldb" + "go-ethereum-timing/swarm/shed" + "go-ethereum-timing/swarm/storage" ) // Store holds fields and indexes (including their encoding functions) diff --git a/swarm/shed/field_struct.go b/swarm/shed/field_struct.go index 90daee7fc4..12601bd697 100644 --- a/swarm/shed/field_struct.go +++ b/swarm/shed/field_struct.go @@ -17,8 +17,8 @@ package shed import ( - "github.com/ethereum/go-ethereum/rlp" "github.com/syndtr/goleveldb/leveldb" + "go-ethereum-timing/rlp" ) // StructField is a helper to store complex structure by diff --git a/swarm/storage/chunker.go b/swarm/storage/chunker.go index 0fa5026dcd..411c500e94 100644 --- a/swarm/storage/chunker.go +++ b/swarm/storage/chunker.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/metrics" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/spancontext" opentracing "github.com/opentracing/opentracing-go" olog "github.com/opentracing/opentracing-go/log" + "go-ethereum-timing/metrics" + ch "go-ethereum-timing/swarm/chunk" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/spancontext" ) /* diff --git a/swarm/storage/chunker_test.go b/swarm/storage/chunker_test.go index 9a12594443..6ba608a196 100644 --- a/swarm/storage/chunker_test.go +++ b/swarm/storage/chunker_test.go @@ -24,7 +24,7 @@ import ( "io" "testing" - "github.com/ethereum/go-ethereum/swarm/testutil" + "go-ethereum-timing/swarm/testutil" "golang.org/x/crypto/sha3" ) diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go index 6955ee8279..ce7981e9f4 100644 --- a/swarm/storage/common_test.go +++ b/swarm/storage/common_test.go @@ -28,9 +28,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - ch "github.com/ethereum/go-ethereum/swarm/chunk" "github.com/mattn/go-colorable" + "go-ethereum-timing/log" + ch "go-ethereum-timing/swarm/chunk" ) var ( diff --git a/swarm/storage/database.go b/swarm/storage/database.go index 12367b9051..d316215dc8 100644 --- a/swarm/storage/database.go +++ b/swarm/storage/database.go @@ -20,10 +20,10 @@ package storage // no need for queueing/caching import ( - "github.com/ethereum/go-ethereum/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" + "go-ethereum-timing/metrics" ) const openFileLimit = 128 diff --git a/swarm/storage/encryption/encryption_test.go b/swarm/storage/encryption/encryption_test.go index 3b4f8a4e36..e7bf33c551 100644 --- a/swarm/storage/encryption/encryption_test.go +++ b/swarm/storage/encryption/encryption_test.go @@ -20,9 +20,9 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/swarm/testutil" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/swarm/testutil" "golang.org/x/crypto/sha3" ) diff --git a/swarm/storage/feed/binaryserializer.go b/swarm/storage/feed/binaryserializer.go index 4e4f67a094..fad542642d 100644 --- a/swarm/storage/feed/binaryserializer.go +++ b/swarm/storage/feed/binaryserializer.go @@ -16,7 +16,7 @@ package feed -import "github.com/ethereum/go-ethereum/common/hexutil" +import "go-ethereum-timing/common/hexutil" type binarySerializer interface { binaryPut(serializedData []byte) error diff --git a/swarm/storage/feed/binaryserializer_test.go b/swarm/storage/feed/binaryserializer_test.go index 37828d1c94..672271544c 100644 --- a/swarm/storage/feed/binaryserializer_test.go +++ b/swarm/storage/feed/binaryserializer_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common/hexutil" ) // KV mocks a key value store diff --git a/swarm/storage/feed/cacheentry.go b/swarm/storage/feed/cacheentry.go index be42008e99..8988fd1764 100644 --- a/swarm/storage/feed/cacheentry.go +++ b/swarm/storage/feed/cacheentry.go @@ -21,7 +21,7 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/swarm/storage" ) const ( diff --git a/swarm/storage/feed/feed.go b/swarm/storage/feed/feed.go index b6ea665a6f..018be2c259 100644 --- a/swarm/storage/feed/feed.go +++ b/swarm/storage/feed/feed.go @@ -20,9 +20,9 @@ import ( "hash" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/swarm/storage" ) // Feed represents a particular user's stream of updates on a topic diff --git a/swarm/storage/feed/handler.go b/swarm/storage/feed/handler.go index 063d3e92a3..84e0306a48 100644 --- a/swarm/storage/feed/handler.go +++ b/swarm/storage/feed/handler.go @@ -24,10 +24,10 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "go-ethereum-timing/swarm/storage/feed/lookup" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/storage" ) type Handler struct { diff --git a/swarm/storage/feed/handler_test.go b/swarm/storage/feed/handler_test.go index 2f8a524535..e0a858b23d 100644 --- a/swarm/storage/feed/handler_test.go +++ b/swarm/storage/feed/handler_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/swarm/chunk" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/storage/feed/lookup" ) var ( diff --git a/swarm/storage/feed/id.go b/swarm/storage/feed/id.go index 7e17743c11..9fe7bf777c 100644 --- a/swarm/storage/feed/id.go +++ b/swarm/storage/feed/id.go @@ -21,10 +21,10 @@ import ( "hash" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "go-ethereum-timing/common" + "go-ethereum-timing/swarm/storage/feed/lookup" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/swarm/storage" ) // ID uniquely identifies an update on the network. diff --git a/swarm/storage/feed/id_test.go b/swarm/storage/feed/id_test.go index e561ff9b46..2e42d59146 100644 --- a/swarm/storage/feed/id_test.go +++ b/swarm/storage/feed/id_test.go @@ -3,7 +3,7 @@ package feed import ( "testing" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "go-ethereum-timing/swarm/storage/feed/lookup" ) func getTestID() *ID { diff --git a/swarm/storage/feed/lookup/epoch_test.go b/swarm/storage/feed/lookup/epoch_test.go index 0629f3d1df..cc6ccf36fd 100644 --- a/swarm/storage/feed/lookup/epoch_test.go +++ b/swarm/storage/feed/lookup/epoch_test.go @@ -3,7 +3,7 @@ package lookup_test import ( "testing" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "go-ethereum-timing/swarm/storage/feed/lookup" ) func TestMarshallers(t *testing.T) { diff --git a/swarm/storage/feed/lookup/lookup_test.go b/swarm/storage/feed/lookup/lookup_test.go index d71e81e95f..e49f1a7ad7 100644 --- a/swarm/storage/feed/lookup/lookup_test.go +++ b/swarm/storage/feed/lookup/lookup_test.go @@ -21,8 +21,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/storage/feed/lookup" ) type Data struct { diff --git a/swarm/storage/feed/query.go b/swarm/storage/feed/query.go index 8be78a9520..f9bf5c58b1 100644 --- a/swarm/storage/feed/query.go +++ b/swarm/storage/feed/query.go @@ -20,8 +20,8 @@ import ( "fmt" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "go-ethereum-timing/common" + "go-ethereum-timing/swarm/storage/feed/lookup" ) // Query is used to specify constraints when performing an update lookup diff --git a/swarm/storage/feed/request.go b/swarm/storage/feed/request.go index dd91a7cf45..545f19edad 100644 --- a/swarm/storage/feed/request.go +++ b/swarm/storage/feed/request.go @@ -21,10 +21,10 @@ import ( "encoding/json" "hash" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/storage/feed/lookup" ) // Request represents a request to sign or signed feed update message diff --git a/swarm/storage/feed/request_test.go b/swarm/storage/feed/request_test.go index c30158fddf..ee7cdd9853 100644 --- a/swarm/storage/feed/request_test.go +++ b/swarm/storage/feed/request_test.go @@ -24,9 +24,9 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "go-ethereum-timing/crypto" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/storage/feed/lookup" ) func areEqualJSON(s1, s2 string) (bool, error) { diff --git a/swarm/storage/feed/sign.go b/swarm/storage/feed/sign.go index 5f0ea0b33c..7a1fa5ff33 100644 --- a/swarm/storage/feed/sign.go +++ b/swarm/storage/feed/sign.go @@ -19,8 +19,8 @@ package feed import ( "crypto/ecdsa" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" ) const signatureLength = 65 diff --git a/swarm/storage/feed/testutil.go b/swarm/storage/feed/testutil.go index caa39d9ffc..8fbe9166fb 100644 --- a/swarm/storage/feed/testutil.go +++ b/swarm/storage/feed/testutil.go @@ -22,8 +22,8 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/swarm/storage" ) const ( diff --git a/swarm/storage/feed/topic.go b/swarm/storage/feed/topic.go index 43a7b4ba4c..93dd58b21a 100644 --- a/swarm/storage/feed/topic.go +++ b/swarm/storage/feed/topic.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/common/bitutil" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/swarm/storage" ) // TopicLength establishes the max length of a topic string diff --git a/swarm/storage/feed/topic_test.go b/swarm/storage/feed/topic_test.go index 0403204f7f..e4ada65dff 100644 --- a/swarm/storage/feed/topic_test.go +++ b/swarm/storage/feed/topic_test.go @@ -3,7 +3,7 @@ package feed import ( "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common/hexutil" ) func TestTopic(t *testing.T) { diff --git a/swarm/storage/feed/update.go b/swarm/storage/feed/update.go index 21c004ca42..748dd29ec1 100644 --- a/swarm/storage/feed/update.go +++ b/swarm/storage/feed/update.go @@ -20,7 +20,7 @@ import ( "fmt" "strconv" - "github.com/ethereum/go-ethereum/swarm/chunk" + "go-ethereum-timing/swarm/chunk" ) // ProtocolVersion defines the current version of the protocol that will be included in each update message diff --git a/swarm/storage/filestore_test.go b/swarm/storage/filestore_test.go index 06c4be1d78..b226893dd4 100644 --- a/swarm/storage/filestore_test.go +++ b/swarm/storage/filestore_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/testutil" + "go-ethereum-timing/swarm/testutil" ) const testDataSize = 0x0001000 diff --git a/swarm/storage/hasherstore.go b/swarm/storage/hasherstore.go index 23b52ee0d8..8034d70a40 100644 --- a/swarm/storage/hasherstore.go +++ b/swarm/storage/hasherstore.go @@ -21,8 +21,8 @@ import ( "fmt" "sync/atomic" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/storage/encryption" + ch "go-ethereum-timing/swarm/chunk" + "go-ethereum-timing/swarm/storage/encryption" "golang.org/x/crypto/sha3" ) diff --git a/swarm/storage/hasherstore_test.go b/swarm/storage/hasherstore_test.go index 22cf98d0e8..343f48bb88 100644 --- a/swarm/storage/hasherstore_test.go +++ b/swarm/storage/hasherstore_test.go @@ -21,9 +21,9 @@ import ( "context" "testing" - "github.com/ethereum/go-ethereum/swarm/storage/encryption" + "go-ethereum-timing/swarm/storage/encryption" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) func TestHasherStore(t *testing.T) { diff --git a/swarm/storage/ldbstore.go b/swarm/storage/ldbstore.go index 9e4d638410..a093d9f965 100644 --- a/swarm/storage/ldbstore.go +++ b/swarm/storage/ldbstore.go @@ -34,11 +34,11 @@ import ( "io/ioutil" "sync" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock" "github.com/syndtr/goleveldb/leveldb" + "go-ethereum-timing/metrics" + "go-ethereum-timing/rlp" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/storage/mock" ) const ( diff --git a/swarm/storage/ldbstore_test.go b/swarm/storage/ldbstore_test.go index 45ae09b2cb..a4c313bf2e 100644 --- a/swarm/storage/ldbstore_test.go +++ b/swarm/storage/ldbstore_test.go @@ -28,11 +28,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" ldberrors "github.com/syndtr/goleveldb/leveldb/errors" + "go-ethereum-timing/common" + ch "go-ethereum-timing/swarm/chunk" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/storage/mock/mem" ) type testDbStore struct { diff --git a/swarm/storage/localstore.go b/swarm/storage/localstore.go index eefb7565a5..50e1d8cd06 100644 --- a/swarm/storage/localstore.go +++ b/swarm/storage/localstore.go @@ -21,9 +21,9 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "go-ethereum-timing/metrics" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/storage/mock" ) type LocalStoreParams struct { diff --git a/swarm/storage/localstore/gc.go b/swarm/storage/localstore/gc.go index 7718d1e589..345dd7a6d0 100644 --- a/swarm/storage/localstore/gc.go +++ b/swarm/storage/localstore/gc.go @@ -92,9 +92,9 @@ package localstore import ( "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/shed" "github.com/syndtr/goleveldb/leveldb" + "go-ethereum-timing/log" + "go-ethereum-timing/swarm/shed" ) var ( diff --git a/swarm/storage/localstore/gc_test.go b/swarm/storage/localstore/gc_test.go index eb039a554a..3bde94e614 100644 --- a/swarm/storage/localstore/gc_test.go +++ b/swarm/storage/localstore/gc_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/swarm/storage" ) // TestDB_collectGarbageWorker tests garbage collection runs diff --git a/swarm/storage/localstore/index_test.go b/swarm/storage/localstore/index_test.go index d9abf440f1..31abe04d88 100644 --- a/swarm/storage/localstore/index_test.go +++ b/swarm/storage/localstore/index_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/swarm/storage" ) // TestDB_pullIndex validates the ordering of keys in pull index. diff --git a/swarm/storage/localstore/localstore.go b/swarm/storage/localstore/localstore.go index 7a9fb54f55..37059870da 100644 --- a/swarm/storage/localstore/localstore.go +++ b/swarm/storage/localstore/localstore.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/shed" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "go-ethereum-timing/log" + "go-ethereum-timing/swarm/shed" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/storage/mock" ) var ( diff --git a/swarm/storage/localstore/localstore_test.go b/swarm/storage/localstore/localstore_test.go index c7309d3cd8..b2a4607786 100644 --- a/swarm/storage/localstore/localstore_test.go +++ b/swarm/storage/localstore/localstore_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/shed" - "github.com/ethereum/go-ethereum/swarm/storage" "github.com/syndtr/goleveldb/leveldb" + ch "go-ethereum-timing/swarm/chunk" + "go-ethereum-timing/swarm/shed" + "go-ethereum-timing/swarm/storage" ) // TestDB validates if the chunk can be uploaded and @@ -130,10 +130,10 @@ func TestDB_updateGCSem(t *testing.T) { // Measurements on MacBook Pro (Retina, 15-inch, Mid 2014) show // that New function executes around 1s for database with 1M chunks. // -// # go test -benchmem -run=none github.com/ethereum/go-ethereum/swarm/storage/localstore -bench BenchmarkNew -v -timeout 20m +// # go test -benchmem -run=none go-ethereum-timing/swarm/storage/localstore -bench BenchmarkNew -v -timeout 20m // goos: darwin // goarch: amd64 -// pkg: github.com/ethereum/go-ethereum/swarm/storage/localstore +// pkg: go-ethereum-timing/swarm/storage/localstore // BenchmarkNew/1000-8 200 11672414 ns/op 9570960 B/op 10008 allocs/op // BenchmarkNew/10000-8 100 14890609 ns/op 10490118 B/op 7759 allocs/op // BenchmarkNew/100000-8 20 58334080 ns/op 17763157 B/op 22978 allocs/op diff --git a/swarm/storage/localstore/mode_get.go b/swarm/storage/localstore/mode_get.go index 3a69f6e9d4..c517c5d4bb 100644 --- a/swarm/storage/localstore/mode_get.go +++ b/swarm/storage/localstore/mode_get.go @@ -17,10 +17,10 @@ package localstore import ( - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/shed" - "github.com/ethereum/go-ethereum/swarm/storage" "github.com/syndtr/goleveldb/leveldb" + "go-ethereum-timing/log" + "go-ethereum-timing/swarm/shed" + "go-ethereum-timing/swarm/storage" ) // ModeGet enumerates different Getter modes. diff --git a/swarm/storage/localstore/mode_put.go b/swarm/storage/localstore/mode_put.go index 1a5a3d1b10..58b5b7dfa4 100644 --- a/swarm/storage/localstore/mode_put.go +++ b/swarm/storage/localstore/mode_put.go @@ -17,9 +17,9 @@ package localstore import ( - "github.com/ethereum/go-ethereum/swarm/shed" - "github.com/ethereum/go-ethereum/swarm/storage" "github.com/syndtr/goleveldb/leveldb" + "go-ethereum-timing/swarm/shed" + "go-ethereum-timing/swarm/storage" ) // ModePut enumerates different Putter modes. diff --git a/swarm/storage/localstore/mode_put_test.go b/swarm/storage/localstore/mode_put_test.go index ffe6a4cb4e..796e75fa1d 100644 --- a/swarm/storage/localstore/mode_put_test.go +++ b/swarm/storage/localstore/mode_put_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/swarm/storage" ) // TestModePutRequest validates ModePutRequest index values on the provided DB. @@ -208,11 +208,11 @@ func TestModePutUpload_parallel(t *testing.T) { // // Measurements on MacBook Pro (Retina, 15-inch, Mid 2014) // -// # go test -benchmem -run=none github.com/ethereum/go-ethereum/swarm/storage/localstore -bench BenchmarkPutUpload -v +// # go test -benchmem -run=none go-ethereum-timing/swarm/storage/localstore -bench BenchmarkPutUpload -v // // goos: darwin // goarch: amd64 -// pkg: github.com/ethereum/go-ethereum/swarm/storage/localstore +// pkg: go-ethereum-timing/swarm/storage/localstore // BenchmarkPutUpload/count_100_parallel_1-8 300 5107704 ns/op 2081461 B/op 2374 allocs/op // BenchmarkPutUpload/count_100_parallel_2-8 300 5411742 ns/op 2081608 B/op 2364 allocs/op // BenchmarkPutUpload/count_100_parallel_4-8 500 3704964 ns/op 2081696 B/op 2324 allocs/op diff --git a/swarm/storage/localstore/mode_set.go b/swarm/storage/localstore/mode_set.go index a522f4447c..7119941f12 100644 --- a/swarm/storage/localstore/mode_set.go +++ b/swarm/storage/localstore/mode_set.go @@ -17,8 +17,8 @@ package localstore import ( - "github.com/ethereum/go-ethereum/swarm/storage" "github.com/syndtr/goleveldb/leveldb" + "go-ethereum-timing/swarm/storage" ) // ModeSet enumerates different Setter modes. diff --git a/swarm/storage/localstore/retrieval_index_test.go b/swarm/storage/localstore/retrieval_index_test.go index 9f5b452c5c..628c6ecb48 100644 --- a/swarm/storage/localstore/retrieval_index_test.go +++ b/swarm/storage/localstore/retrieval_index_test.go @@ -20,7 +20,7 @@ import ( "strconv" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/swarm/storage" ) // BenchmarkRetrievalIndexes uploads a number of chunks in order to measure @@ -32,10 +32,10 @@ import ( // Measurements on MacBook Pro (Retina, 15-inch, Mid 2014) show // that two separated indexes perform better. // -// # go test -benchmem -run=none github.com/ethereum/go-ethereum/swarm/storage/localstore -bench BenchmarkRetrievalIndexes -v +// # go test -benchmem -run=none go-ethereum-timing/swarm/storage/localstore -bench BenchmarkRetrievalIndexes -v // goos: darwin // goarch: amd64 -// pkg: github.com/ethereum/go-ethereum/swarm/storage/localstore +// pkg: go-ethereum-timing/swarm/storage/localstore // BenchmarkRetrievalIndexes/1000-8 20 75556686 ns/op 19033493 B/op 84500 allocs/op // BenchmarkRetrievalIndexes/10000-8 1 1079084922 ns/op 382792064 B/op 1429644 allocs/op // BenchmarkRetrievalIndexes/100000-8 1 16891305737 ns/op 2629165304 B/op 12465019 allocs/op @@ -104,10 +104,10 @@ func benchmarkRetrievalIndexes(b *testing.B, o *Options, count int) { // // Measurements on MacBook Pro (Retina, 15-inch, Mid 2014). // -// go test -benchmem -run=none github.com/ethereum/go-ethereum/swarm/storage/localstore -bench BenchmarkUpload -v +// go test -benchmem -run=none go-ethereum-timing/swarm/storage/localstore -bench BenchmarkUpload -v // goos: darwin // goarch: amd64 -// pkg: github.com/ethereum/go-ethereum/swarm/storage/localstore +// pkg: go-ethereum-timing/swarm/storage/localstore // BenchmarkUpload/1000-8 20 59437463 ns/op 25205193 B/op 23208 allocs/op // BenchmarkUpload/10000-8 2 580646362 ns/op 216532932 B/op 248090 allocs/op // BenchmarkUpload/100000-8 1 22373390892 ns/op 2323055312 B/op 3995903 allocs/op diff --git a/swarm/storage/localstore/subscription_pull.go b/swarm/storage/localstore/subscription_pull.go index a18f0915d9..20b44b2ac9 100644 --- a/swarm/storage/localstore/subscription_pull.go +++ b/swarm/storage/localstore/subscription_pull.go @@ -23,9 +23,9 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/shed" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/log" + "go-ethereum-timing/swarm/shed" + "go-ethereum-timing/swarm/storage" ) // SubscribePull returns a channel that provides chunk addresses and stored times from pull syncing index. diff --git a/swarm/storage/localstore/subscription_pull_test.go b/swarm/storage/localstore/subscription_pull_test.go index 5c99e0dec2..9e8591587b 100644 --- a/swarm/storage/localstore/subscription_pull_test.go +++ b/swarm/storage/localstore/subscription_pull_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/swarm/storage" ) // TestDB_SubscribePull uploads some chunks before and after diff --git a/swarm/storage/localstore/subscription_push.go b/swarm/storage/localstore/subscription_push.go index b13f293998..50c9723eb6 100644 --- a/swarm/storage/localstore/subscription_push.go +++ b/swarm/storage/localstore/subscription_push.go @@ -20,9 +20,9 @@ import ( "context" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/shed" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/log" + "go-ethereum-timing/swarm/shed" + "go-ethereum-timing/swarm/storage" ) // SubscribePush returns a channel that provides storage chunks with ordering from push syncing index. diff --git a/swarm/storage/localstore/subscription_push_test.go b/swarm/storage/localstore/subscription_push_test.go index 73e7c25f72..4d413424e7 100644 --- a/swarm/storage/localstore/subscription_push_test.go +++ b/swarm/storage/localstore/subscription_push_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/storage" + "go-ethereum-timing/swarm/storage" ) // TestDB_SubscribePush uploads some chunks before and after diff --git a/swarm/storage/localstore_test.go b/swarm/storage/localstore_test.go index ec69951c4f..6af4ea195b 100644 --- a/swarm/storage/localstore_test.go +++ b/swarm/storage/localstore_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - ch "github.com/ethereum/go-ethereum/swarm/chunk" + ch "go-ethereum-timing/swarm/chunk" ) var ( diff --git a/swarm/storage/memstore_test.go b/swarm/storage/memstore_test.go index 8aaf486a7b..d95fba9f82 100644 --- a/swarm/storage/memstore_test.go +++ b/swarm/storage/memstore_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/ethereum/go-ethereum/swarm/log" + "go-ethereum-timing/swarm/log" ) func newTestMemStore() *MemStore { diff --git a/swarm/storage/mock/db/db.go b/swarm/storage/mock/db/db.go index 73ae199e8b..0958040a14 100644 --- a/swarm/storage/mock/db/db.go +++ b/swarm/storage/mock/db/db.go @@ -27,8 +27,8 @@ import ( "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "go-ethereum-timing/common" + "go-ethereum-timing/swarm/storage/mock" ) // GlobalStore contains the LevelDB database that is storing diff --git a/swarm/storage/mock/db/db_test.go b/swarm/storage/mock/db/db_test.go index 782faaf35c..437542bc80 100644 --- a/swarm/storage/mock/db/db_test.go +++ b/swarm/storage/mock/db/db_test.go @@ -23,7 +23,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/storage/mock/test" + "go-ethereum-timing/swarm/storage/mock/test" ) // TestDBStore is running a test.MockStore tests diff --git a/swarm/storage/mock/mem/mem.go b/swarm/storage/mock/mem/mem.go index 3a0a2beb8d..213cd415f6 100644 --- a/swarm/storage/mock/mem/mem.go +++ b/swarm/storage/mock/mem/mem.go @@ -27,8 +27,8 @@ import ( "io/ioutil" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "go-ethereum-timing/common" + "go-ethereum-timing/swarm/storage/mock" ) // GlobalStore stores all chunk data and also keys and node addresses relations. diff --git a/swarm/storage/mock/mem/mem_test.go b/swarm/storage/mock/mem/mem_test.go index adcefaabb4..86ebf7aaca 100644 --- a/swarm/storage/mock/mem/mem_test.go +++ b/swarm/storage/mock/mem/mem_test.go @@ -19,7 +19,7 @@ package mem import ( "testing" - "github.com/ethereum/go-ethereum/swarm/storage/mock/test" + "go-ethereum-timing/swarm/storage/mock/test" ) // TestGlobalStore is running test for a GlobalStore diff --git a/swarm/storage/mock/mock.go b/swarm/storage/mock/mock.go index 626ba3fe1b..9d2aaff0f0 100644 --- a/swarm/storage/mock/mock.go +++ b/swarm/storage/mock/mock.go @@ -36,7 +36,7 @@ import ( "errors" "io" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) // ErrNotFound indicates that the chunk is not found. diff --git a/swarm/storage/mock/rpc/rpc.go b/swarm/storage/mock/rpc/rpc.go index 8cd6c83a7a..e3c0144046 100644 --- a/swarm/storage/mock/rpc/rpc.go +++ b/swarm/storage/mock/rpc/rpc.go @@ -26,10 +26,10 @@ package rpc import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "go-ethereum-timing/common" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/storage/mock" ) // GlobalStore is rpc.Client that connects to a centralized mock store. diff --git a/swarm/storage/mock/rpc/rpc_test.go b/swarm/storage/mock/rpc/rpc_test.go index f62340edec..26cee8de72 100644 --- a/swarm/storage/mock/rpc/rpc_test.go +++ b/swarm/storage/mock/rpc/rpc_test.go @@ -19,9 +19,9 @@ package rpc import ( "testing" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" - "github.com/ethereum/go-ethereum/swarm/storage/mock/test" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm/storage/mock/mem" + "go-ethereum-timing/swarm/storage/mock/test" ) // TestDBStore is running test for a GlobalStore diff --git a/swarm/storage/mock/test/test.go b/swarm/storage/mock/test/test.go index 69828b144f..eeb5025a2f 100644 --- a/swarm/storage/mock/test/test.go +++ b/swarm/storage/mock/test/test.go @@ -25,9 +25,9 @@ import ( "strconv" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "go-ethereum-timing/common" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/storage/mock" ) // MockStore creates NodeStore instances from provided GlobalStorer, diff --git a/swarm/storage/netstore.go b/swarm/storage/netstore.go index 202af2bf58..f3dec9d84d 100644 --- a/swarm/storage/netstore.go +++ b/swarm/storage/netstore.go @@ -24,9 +24,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/log" lru "github.com/hashicorp/golang-lru" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/swarm/log" ) type ( diff --git a/swarm/storage/netstore_test.go b/swarm/storage/netstore_test.go index 88ec6c28f4..47f7066ec6 100644 --- a/swarm/storage/netstore_test.go +++ b/swarm/storage/netstore_test.go @@ -27,9 +27,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/p2p/enode" - ch "github.com/ethereum/go-ethereum/swarm/chunk" + "go-ethereum-timing/common" + "go-ethereum-timing/p2p/enode" + ch "go-ethereum-timing/swarm/chunk" ) var sourcePeerID = enode.HexID("99d8594b52298567d2ca3f4c441a5ba0140ee9245e26460d01102a52773c73b9") diff --git a/swarm/storage/pyramid.go b/swarm/storage/pyramid.go index ed0f843b93..581ab8b543 100644 --- a/swarm/storage/pyramid.go +++ b/swarm/storage/pyramid.go @@ -25,8 +25,8 @@ import ( "sync" "time" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/log" + ch "go-ethereum-timing/swarm/chunk" + "go-ethereum-timing/swarm/log" ) /* diff --git a/swarm/storage/types.go b/swarm/storage/types.go index 7ec21328e2..045b0486d3 100644 --- a/swarm/storage/types.go +++ b/swarm/storage/types.go @@ -25,9 +25,9 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/bmt" - ch "github.com/ethereum/go-ethereum/swarm/chunk" + "go-ethereum-timing/common" + "go-ethereum-timing/swarm/bmt" + ch "go-ethereum-timing/swarm/chunk" "golang.org/x/crypto/sha3" ) diff --git a/swarm/swap/swap.go b/swarm/swap/swap.go index 5d636dc205..d47f1eba28 100644 --- a/swarm/swap/swap.go +++ b/swarm/swap/swap.go @@ -22,10 +22,10 @@ import ( "strconv" "sync" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/state" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/protocols" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/state" ) // SwAP Swarm Accounting Protocol diff --git a/swarm/swap/swap_test.go b/swarm/swap/swap_test.go index f2e3ba168a..9e1a3b884a 100644 --- a/swarm/swap/swap_test.go +++ b/swarm/swap/swap_test.go @@ -25,12 +25,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/state" colorable "github.com/mattn/go-colorable" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/protocols" + "go-ethereum-timing/p2p/simulations/adapters" + "go-ethereum-timing/swarm/state" ) var ( diff --git a/swarm/swarm.go b/swarm/swarm.go index 3ab98b3ab5..09aa76010b 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -29,30 +29,30 @@ import ( "time" "unicode" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/api" - httpapi "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/fuse" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/stream" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed" - "github.com/ethereum/go-ethereum/swarm/storage/mock" - "github.com/ethereum/go-ethereum/swarm/swap" - "github.com/ethereum/go-ethereum/swarm/tracing" + "go-ethereum-timing/accounts/abi/bind" + "go-ethereum-timing/common" + "go-ethereum-timing/contracts/chequebook" + "go-ethereum-timing/contracts/ens" + "go-ethereum-timing/ethclient" + "go-ethereum-timing/metrics" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/protocols" + "go-ethereum-timing/params" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm/api" + httpapi "go-ethereum-timing/swarm/api/http" + "go-ethereum-timing/swarm/fuse" + "go-ethereum-timing/swarm/log" + "go-ethereum-timing/swarm/network" + "go-ethereum-timing/swarm/network/stream" + "go-ethereum-timing/swarm/pss" + "go-ethereum-timing/swarm/state" + "go-ethereum-timing/swarm/storage" + "go-ethereum-timing/swarm/storage/feed" + "go-ethereum-timing/swarm/storage/mock" + "go-ethereum-timing/swarm/swap" + "go-ethereum-timing/swarm/tracing" ) var ( diff --git a/swarm/swarm_test.go b/swarm/swarm_test.go index d85eb91185..eceedc2524 100644 --- a/swarm/swarm_test.go +++ b/swarm/swarm_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/api" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/rpc" + "go-ethereum-timing/swarm/api" ) // TestNewSwarm validates Swarm fields in repsect to the provided configuration. diff --git a/swarm/tracing/tracing.go b/swarm/tracing/tracing.go index f95fa41b8f..18efefc652 100644 --- a/swarm/tracing/tracing.go +++ b/swarm/tracing/tracing.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" jaeger "github.com/uber/jaeger-client-go" jaegercfg "github.com/uber/jaeger-client-go/config" + "go-ethereum-timing/log" cli "gopkg.in/urfave/cli.v1" ) diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 9fa69bf4ed..2763cbb52b 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -24,18 +24,18 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" + "go-ethereum-timing/consensus" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index fde9db3ad4..0b512150ab 100644 --- a/tests/difficulty_test.go +++ b/tests/difficulty_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/params" ) var ( diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 00d699cf75..a98071031f 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -20,11 +20,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/consensus/ethash" + "go-ethereum-timing/core/types" + "go-ethereum-timing/params" ) //go:generate gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index 5cfd4bd0ae..ef02ef3f5c 100644 --- a/tests/gen_btheader.go +++ b/tests/gen_btheader.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" + "go-ethereum-timing/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index 88f36ce999..00478e1500 100644 --- a/tests/gen_difficultytest.go +++ b/tests/gen_difficultytest.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index 1d4baf2fd7..d1386f03e9 100644 --- a/tests/gen_stenv.go +++ b/tests/gen_stenv.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 451ffcbf43..438c18feca 100644 --- a/tests/gen_sttransaction.go +++ b/tests/gen_sttransaction.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/gen_tttransaction.go b/tests/gen_tttransaction.go index 2948842d97..30d492598e 100644 --- a/tests/gen_tttransaction.go +++ b/tests/gen_tttransaction.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" ) var _ = (*ttTransactionMarshaling)(nil) diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go index a5f01cf456..fc29d9d590 100644 --- a/tests/gen_vmexec.go +++ b/tests/gen_vmexec.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" ) var _ = (*vmExecMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index 188cdffe9d..239bf7d181 100644 --- a/tests/init.go +++ b/tests/init.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/params" ) // Forks table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index 053cbd6fcd..f15c0dbe50 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -30,7 +30,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index 9069ec55a1..7172d05984 100644 --- a/tests/rlp_test_util.go +++ b/tests/rlp_test_util.go @@ -24,7 +24,7 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index 8b69da91f2..cdf740e052 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -24,8 +24,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/core/vm" + "go-ethereum-timing/cmd/utils" + "go-ethereum-timing/core/vm" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 436284196d..9b884e8186 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -23,17 +23,17 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" + "go-ethereum-timing/core" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/types" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" "golang.org/x/crypto/sha3" ) diff --git a/tests/transaction_test.go b/tests/transaction_test.go index 42ad81877e..2d0b158909 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 8c3dac088c..f09e113565 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" + "go-ethereum-timing/core/types" + "go-ethereum-timing/params" + "go-ethereum-timing/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/tests/vm_test.go b/tests/vm_test.go index 441483dffa..abf75e3a4b 100644 --- a/tests/vm_test.go +++ b/tests/vm_test.go @@ -19,7 +19,7 @@ package tests import ( "testing" - "github.com/ethereum/go-ethereum/core/vm" + "go-ethereum-timing/core/vm" ) func TestVM(t *testing.T) { diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index cb81c5b94e..2998b40c0e 100644 --- a/tests/vm_test_util.go +++ b/tests/vm_test_util.go @@ -22,15 +22,15 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/common/math" + "go-ethereum-timing/core" + "go-ethereum-timing/core/state" + "go-ethereum-timing/core/vm" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/params" ) // VMTest checks EVM execution without block or transaction context. diff --git a/trie/database.go b/trie/database.go index 739a98addb..bdd03098fc 100644 --- a/trie/database.go +++ b/trie/database.go @@ -23,11 +23,11 @@ import ( "time" "github.com/allegro/bigcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" + "go-ethereum-timing/rlp" ) var ( diff --git a/trie/errors.go b/trie/errors.go index 567b80078c..fef3cbb0f3 100644 --- a/trie/errors.go +++ b/trie/errors.go @@ -19,7 +19,7 @@ package trie import ( "fmt" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index 9d6756b6f4..b025668721 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -20,8 +20,8 @@ import ( "hash" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/rlp" "golang.org/x/crypto/sha3" ) diff --git a/trie/iterator.go b/trie/iterator.go index 77f1681665..9cdf3f6b8b 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,8 +21,8 @@ import ( "container/heap" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/rlp" ) // Iterator is a key-value trie iterator that traverses a Trie. diff --git a/trie/iterator_test.go b/trie/iterator_test.go index 4f633b195f..eb796d77a3 100644 --- a/trie/iterator_test.go +++ b/trie/iterator_test.go @@ -22,8 +22,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common" + "go-ethereum-timing/ethdb" ) func TestIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index 1fafb7a538..bf2f0ff409 100644 --- a/trie/node.go +++ b/trie/node.go @@ -21,8 +21,8 @@ import ( "io" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/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 f90ecd7d88..9a36d94e87 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -20,11 +20,11 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/log" + "go-ethereum-timing/rlp" ) // Prove constructs a merkle proof for key. The result contains all encoded nodes diff --git a/trie/proof_test.go b/trie/proof_test.go index 996f874781..97a1ee560a 100644 --- a/trie/proof_test.go +++ b/trie/proof_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" ) func init() { diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 6a50cfd5a6..674940f166 100644 --- a/trie/secure_trie.go +++ b/trie/secure_trie.go @@ -19,8 +19,8 @@ package trie import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/log" ) // SecureTrie wraps a trie with key hashing. In a secure trie, all diff --git a/trie/secure_trie_test.go b/trie/secure_trie_test.go index d16d999684..6ea0058c7e 100644 --- a/trie/secure_trie_test.go +++ b/trie/secure_trie_test.go @@ -22,9 +22,9 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" ) func newEmptySecure() *SecureTrie { diff --git a/trie/sync.go b/trie/sync.go index 67dff5a8b6..d9dc476664 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common" + "go-ethereum-timing/common/prque" + "go-ethereum-timing/ethdb" ) // ErrNotRequested is returned by the trie sync when it's requested to process a diff --git a/trie/sync_test.go b/trie/sync_test.go index c76779e5c7..41f3c09ebd 100644 --- a/trie/sync_test.go +++ b/trie/sync_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "go-ethereum-timing/common" + "go-ethereum-timing/ethdb" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/trie.go b/trie/trie.go index af424d4ac6..5dbe8795e6 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -21,10 +21,10 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/metrics" ) var ( diff --git a/trie/trie_test.go b/trie/trie_test.go index 4d84aa96cf..51b21355dc 100644 --- a/trie/trie_test.go +++ b/trie/trie_test.go @@ -30,10 +30,10 @@ import ( "testing/quick" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/ethdb" + "go-ethereum-timing/rlp" ) func init() { diff --git a/whisper/mailserver/mailserver.go b/whisper/mailserver/mailserver.go index d7af4baae3..e080a87774 100644 --- a/whisper/mailserver/mailserver.go +++ b/whisper/mailserver/mailserver.go @@ -21,14 +21,14 @@ import ( "encoding/binary" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/util" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/rlp" + whisper "go-ethereum-timing/whisper/whisperv6" ) // WMailServer represents the state data of the mailserver. diff --git a/whisper/mailserver/server_test.go b/whisper/mailserver/server_test.go index edb817cc75..5278166ab6 100644 --- a/whisper/mailserver/server_test.go +++ b/whisper/mailserver/server_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + whisper "go-ethereum-timing/whisper/whisperv6" ) const powRequirement = 0.00001 diff --git a/whisper/shhclient/client.go b/whisper/shhclient/client.go index a814154e47..666eee6cd0 100644 --- a/whisper/shhclient/client.go +++ b/whisper/shhclient/client.go @@ -19,10 +19,10 @@ package shhclient import ( "context" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "go-ethereum-timing" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/rpc" + whisper "go-ethereum-timing/whisper/whisperv6" ) // Client defines typed wrappers for the Whisper v6 RPC API. diff --git a/whisper/whisperv5/api.go b/whisper/whisperv5/api.go index 7d963df8d5..dbc95ba484 100644 --- a/whisper/whisperv5/api.go +++ b/whisper/whisperv5/api.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/rpc" ) var ( diff --git a/whisper/whisperv5/benchmarks_test.go b/whisper/whisperv5/benchmarks_test.go index dcfbcb56d8..dfaa54b80f 100644 --- a/whisper/whisperv5/benchmarks_test.go +++ b/whisper/whisperv5/benchmarks_test.go @@ -19,7 +19,7 @@ package whisperv5 import ( "testing" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/crypto" ) func BenchmarkDeriveKeyMaterial(b *testing.B) { diff --git a/whisper/whisperv5/envelope.go b/whisper/whisperv5/envelope.go index 169cbba9dd..faebd1415c 100644 --- a/whisper/whisperv5/envelope.go +++ b/whisper/whisperv5/envelope.go @@ -26,11 +26,11 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/crypto" + "go-ethereum-timing/crypto/ecies" + "go-ethereum-timing/rlp" ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv5/filter.go b/whisper/whisperv5/filter.go index 9550a7e389..8f6769034f 100644 --- a/whisper/whisperv5/filter.go +++ b/whisper/whisperv5/filter.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" ) type Filter struct { diff --git a/whisper/whisperv5/filter_test.go b/whisper/whisperv5/filter_test.go index 33138fb1a4..0532fa527b 100644 --- a/whisper/whisperv5/filter_test.go +++ b/whisper/whisperv5/filter_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" ) var seed int64 diff --git a/whisper/whisperv5/gen_criteria_json.go b/whisper/whisperv5/gen_criteria_json.go index 1c0e389ad9..d369d183d3 100644 --- a/whisper/whisperv5/gen_criteria_json.go +++ b/whisper/whisperv5/gen_criteria_json.go @@ -5,7 +5,7 @@ package whisperv5 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv5/gen_message_json.go b/whisper/whisperv5/gen_message_json.go index b4c4274d07..ce5d49eb8e 100644 --- a/whisper/whisperv5/gen_message_json.go +++ b/whisper/whisperv5/gen_message_json.go @@ -5,7 +5,7 @@ package whisperv5 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv5/gen_newmessage_json.go b/whisper/whisperv5/gen_newmessage_json.go index 97ffb64ad3..662e9c7012 100644 --- a/whisper/whisperv5/gen_newmessage_json.go +++ b/whisper/whisperv5/gen_newmessage_json.go @@ -5,7 +5,7 @@ package whisperv5 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv5/message.go b/whisper/whisperv5/message.go index 35711d724b..7a9cbb0921 100644 --- a/whisper/whisperv5/message.go +++ b/whisper/whisperv5/message.go @@ -27,10 +27,10 @@ import ( "errors" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/crypto/ecies" + "go-ethereum-timing/log" ) // MessageParams specifies the exact way a message should be wrapped into an Envelope. diff --git a/whisper/whisperv5/message_test.go b/whisper/whisperv5/message_test.go index 2edf945df0..e2d8f5b1d6 100644 --- a/whisper/whisperv5/message_test.go +++ b/whisper/whisperv5/message_test.go @@ -21,8 +21,8 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/crypto" + "go-ethereum-timing/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv5/peer.go b/whisper/whisperv5/peer.go index 2bb5677c7c..77c1c91a2a 100644 --- a/whisper/whisperv5/peer.go +++ b/whisper/whisperv5/peer.go @@ -21,10 +21,10 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rlp" ) // Peer represents a whisper protocol peer connection. diff --git a/whisper/whisperv5/peer_test.go b/whisper/whisperv5/peer_test.go index 2449532070..c3b1803bd2 100644 --- a/whisper/whisperv5/peer_test.go +++ b/whisper/whisperv5/peer_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/nat" ) var keys = []string{ diff --git a/whisper/whisperv5/topic.go b/whisper/whisperv5/topic.go index c4eda1db42..05cd330312 100644 --- a/whisper/whisperv5/topic.go +++ b/whisper/whisperv5/topic.go @@ -19,8 +19,8 @@ package whisperv5 import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" ) // TopicType represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv5/whisper.go b/whisper/whisperv5/whisper.go index 4655458214..e98c8cb047 100644 --- a/whisper/whisperv5/whisper.go +++ b/whisper/whisperv5/whisper.go @@ -27,12 +27,12 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" "github.com/syndtr/goleveldb/leveldb/errors" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rpc" "golang.org/x/crypto/pbkdf2" "golang.org/x/sync/syncmap" ) diff --git a/whisper/whisperv5/whisper_test.go b/whisper/whisperv5/whisper_test.go index a7bd17e4d8..c0988f659e 100644 --- a/whisper/whisperv5/whisper_test.go +++ b/whisper/whisperv5/whisper_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" ) func TestWhisperBasic(t *testing.T) { diff --git a/whisper/whisperv6/api.go b/whisper/whisperv6/api.go index 7609a03c28..e124524764 100644 --- a/whisper/whisperv6/api.go +++ b/whisper/whisperv6/api.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/rpc" ) // List of errors diff --git a/whisper/whisperv6/benchmarks_test.go b/whisper/whisperv6/benchmarks_test.go index 0473179da5..5ddccc2f36 100644 --- a/whisper/whisperv6/benchmarks_test.go +++ b/whisper/whisperv6/benchmarks_test.go @@ -20,7 +20,7 @@ import ( "crypto/sha256" "testing" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/crypto" "golang.org/x/crypto/pbkdf2" ) diff --git a/whisper/whisperv6/envelope.go b/whisper/whisperv6/envelope.go index c42d1fa8ac..bf16016bfe 100644 --- a/whisper/whisperv6/envelope.go +++ b/whisper/whisperv6/envelope.go @@ -26,11 +26,11 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/math" + "go-ethereum-timing/crypto" + "go-ethereum-timing/crypto/ecies" + "go-ethereum-timing/rlp" ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv6/envelope_test.go b/whisper/whisperv6/envelope_test.go index 410b250a3f..9bffd9a009 100644 --- a/whisper/whisperv6/envelope_test.go +++ b/whisper/whisperv6/envelope_test.go @@ -22,7 +22,7 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/crypto" ) func TestEnvelopeOpenAcceptsOnlyOneKeyTypeInFilter(t *testing.T) { diff --git a/whisper/whisperv6/filter.go b/whisper/whisperv6/filter.go index 6a5b79674b..e5dd337a1a 100644 --- a/whisper/whisperv6/filter.go +++ b/whisper/whisperv6/filter.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" ) // Filter represents a Whisper message filter diff --git a/whisper/whisperv6/filter_test.go b/whisper/whisperv6/filter_test.go index 5ce99d9f6c..9d8dbfadfc 100644 --- a/whisper/whisperv6/filter_test.go +++ b/whisper/whisperv6/filter_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" ) var seed int64 diff --git a/whisper/whisperv6/gen_criteria_json.go b/whisper/whisperv6/gen_criteria_json.go index 1a428d6df7..067256a055 100644 --- a/whisper/whisperv6/gen_criteria_json.go +++ b/whisper/whisperv6/gen_criteria_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv6/gen_message_json.go b/whisper/whisperv6/gen_message_json.go index 6218f5df6e..68ebb7f3ca 100644 --- a/whisper/whisperv6/gen_message_json.go +++ b/whisper/whisperv6/gen_message_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv6/gen_newmessage_json.go b/whisper/whisperv6/gen_newmessage_json.go index 75a1279ae3..c083544f88 100644 --- a/whisper/whisperv6/gen_newmessage_json.go +++ b/whisper/whisperv6/gen_newmessage_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv6/message.go b/whisper/whisperv6/message.go index 2d4e862441..e9148ab691 100644 --- a/whisper/whisperv6/message.go +++ b/whisper/whisperv6/message.go @@ -28,10 +28,10 @@ import ( mrand "math/rand" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/log" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/crypto/ecies" + "go-ethereum-timing/log" ) // MessageParams specifies the exact way a message should be wrapped diff --git a/whisper/whisperv6/message_test.go b/whisper/whisperv6/message_test.go index 0a5c1c8533..bb05052c59 100644 --- a/whisper/whisperv6/message_test.go +++ b/whisper/whisperv6/message_test.go @@ -23,9 +23,9 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv6/peer.go b/whisper/whisperv6/peer.go index 621d512081..aeae78ead8 100644 --- a/whisper/whisperv6/peer.go +++ b/whisper/whisperv6/peer.go @@ -23,10 +23,10 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rlp" ) // Peer represents a whisper protocol peer connection. diff --git a/whisper/whisperv6/peer_test.go b/whisper/whisperv6/peer_test.go index c5b044e1a6..c2cdd33a97 100644 --- a/whisper/whisperv6/peer_test.go +++ b/whisper/whisperv6/peer_test.go @@ -28,13 +28,13 @@ import ( "net" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/rlp" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" + "go-ethereum-timing/crypto" + "go-ethereum-timing/p2p" + "go-ethereum-timing/p2p/enode" + "go-ethereum-timing/p2p/nat" + "go-ethereum-timing/rlp" ) var keys = []string{ diff --git a/whisper/whisperv6/topic.go b/whisper/whisperv6/topic.go index 4dd8f283c3..689e41dfc2 100644 --- a/whisper/whisperv6/topic.go +++ b/whisper/whisperv6/topic.go @@ -19,8 +19,8 @@ package whisperv6 import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "go-ethereum-timing/common" + "go-ethereum-timing/common/hexutil" ) // TopicType represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go index eb713f84ee..1fab1b6f6e 100644 --- a/whisper/whisperv6/whisper.go +++ b/whisper/whisperv6/whisper.go @@ -27,13 +27,13 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" "github.com/syndtr/goleveldb/leveldb/errors" + "go-ethereum-timing/common" + "go-ethereum-timing/crypto" + "go-ethereum-timing/log" + "go-ethereum-timing/p2p" + "go-ethereum-timing/rlp" + "go-ethereum-timing/rpc" "golang.org/x/crypto/pbkdf2" "golang.org/x/sync/syncmap" ) diff --git a/whisper/whisperv6/whisper_test.go b/whisper/whisperv6/whisper_test.go index 895bb2b969..1d2785d947 100644 --- a/whisper/whisperv6/whisper_test.go +++ b/whisper/whisperv6/whisper_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "go-ethereum-timing/common" "golang.org/x/crypto/pbkdf2" )