aboutsummaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2014-10-23 21:01:27 +0800
committerFelix Lange <fjl@twurst.com>2014-10-23 21:01:27 +0800
commit69baa465ea69ae60eed802445cf0132b9eb69934 (patch)
treeb09da7582b5c4850d4db13aee808f2fef2f97de0 /utils
parent50fd46924900869e7210217c6a07979b544991c8 (diff)
parentfeef194829b07570e91873ed5d1e8cc51e8fa430 (diff)
downloaddexon-69baa465ea69ae60eed802445cf0132b9eb69934.tar.gz
dexon-69baa465ea69ae60eed802445cf0132b9eb69934.tar.zst
dexon-69baa465ea69ae60eed802445cf0132b9eb69934.zip
Merge eth-go repository into go-ethereum
mist, etheruem have been moved to cmd/
Diffstat (limited to 'utils')
-rw-r--r--utils/cmd.go18
-rw-r--r--utils/vm_env.go6
-rw-r--r--utils/websockets.go8
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{} {