diff options
| author | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-10-23 22:46:18 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-10-23 22:46:18 +0800 |
| commit | 119c5b40a7ed1aea1c871c0cb56956b8ef9303d9 (patch) | |
| tree | b021423da04c9ff319a77549b473b6bad4930dd4 /utils | |
| parent | 50fd46924900869e7210217c6a07979b544991c8 (diff) | |
| parent | 184055b3e2995894ccaba364484223e488730627 (diff) | |
| download | dexon-119c5b40a7ed1aea1c871c0cb56956b8ef9303d9.tar.gz dexon-119c5b40a7ed1aea1c871c0cb56956b8ef9303d9.tar.zst dexon-119c5b40a7ed1aea1c871c0cb56956b8ef9303d9.zip | |
Merge pull request #150 from fjl/develop
Merge eth-go repo into go-ethereum
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/cmd.go | 18 | ||||
| -rw-r--r-- | utils/vm_env.go | 6 | ||||
| -rw-r--r-- | utils/websockets.go | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/utils/cmd.go b/utils/cmd.go index 32aebc91e..76faa5dac 100644 --- a/utils/cmd.go +++ b/utils/cmd.go @@ -13,15 +13,15 @@ import ( "time" "bitbucket.org/kardianos/osext" - "github.com/ethereum/eth-go" - "github.com/ethereum/eth-go/ethcrypto" - "github.com/ethereum/eth-go/ethdb" - "github.com/ethereum/eth-go/ethlog" - "github.com/ethereum/eth-go/ethminer" - "github.com/ethereum/eth-go/ethpipe" - "github.com/ethereum/eth-go/ethutil" - "github.com/ethereum/eth-go/ethwire" - "github.com/ethereum/eth-go/rpc" + "github.com/ethereum/go-ethereum" + "github.com/ethereum/go-ethereum/ethcrypto" + "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethereum/go-ethereum/ethlog" + "github.com/ethereum/go-ethereum/ethminer" + "github.com/ethereum/go-ethereum/ethpipe" + "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/ethwire" + "github.com/ethereum/go-ethereum/rpc" ) var logger = ethlog.NewLogger("CLI") diff --git a/utils/vm_env.go b/utils/vm_env.go index 21341ab04..1946b6fac 100644 --- a/utils/vm_env.go +++ b/utils/vm_env.go @@ -3,9 +3,9 @@ package utils import ( "math/big" - "github.com/ethereum/eth-go/ethchain" - "github.com/ethereum/eth-go/ethstate" - "github.com/ethereum/eth-go/vm" + "github.com/ethereum/go-ethereum/ethchain" + "github.com/ethereum/go-ethereum/ethstate" + "github.com/ethereum/go-ethereum/vm" ) type VMEnv struct { diff --git a/utils/websockets.go b/utils/websockets.go index e89331a98..7bda805ac 100644 --- a/utils/websockets.go +++ b/utils/websockets.go @@ -1,10 +1,10 @@ package utils import ( - "github.com/ethereum/eth-go" - "github.com/ethereum/eth-go/ethpipe" - "github.com/ethereum/eth-go/ethutil" - "github.com/ethereum/eth-go/websocket" + "github.com/ethereum/go-ethereum" + "github.com/ethereum/go-ethereum/ethpipe" + "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/websocket" ) func args(v ...interface{}) []interface{} { |