diff options
| author | obscuren <geffobscura@gmail.com> | 2014-10-31 21:53:42 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-10-31 21:53:42 +0800 |
| commit | 4914a78c8c650d7fc74570f25a682598aaeb6973 (patch) | |
| tree | eca4eef360d5202d51d5d8766072848ebcb185e3 /cmd | |
| parent | af34749a6b47ff8f9b4cb55d9ea65e1235d63b68 (diff) | |
| download | dexon-4914a78c8c650d7fc74570f25a682598aaeb6973.tar dexon-4914a78c8c650d7fc74570f25a682598aaeb6973.tar.gz dexon-4914a78c8c650d7fc74570f25a682598aaeb6973.tar.bz2 dexon-4914a78c8c650d7fc74570f25a682598aaeb6973.tar.lz dexon-4914a78c8c650d7fc74570f25a682598aaeb6973.tar.xz dexon-4914a78c8c650d7fc74570f25a682598aaeb6973.tar.zst dexon-4914a78c8c650d7fc74570f25a682598aaeb6973.zip | |
ethwire => wire
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mist/gui.go | 6 | ||||
| -rw-r--r-- | cmd/utils/cmd.go | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index 2dfdd104f..d309e0a9b 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -35,8 +35,8 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethminer" "github.com/ethereum/go-ethereum/ethutil" - "github.com/ethereum/go-ethereum/ethwire" "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/wire" "github.com/ethereum/go-ethereum/xeth" "gopkg.in/qml.v1" ) @@ -87,7 +87,7 @@ type Gui struct { pipe *xeth.JSXEth Session string - clientIdentity *ethwire.SimpleClientIdentity + clientIdentity *wire.SimpleClientIdentity config *ethutil.ConfigManager plugins map[string]plugin @@ -97,7 +97,7 @@ type Gui struct { } // Create GUI, but doesn't start it -func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, clientIdentity *ethwire.SimpleClientIdentity, session string, logLevel int) *Gui { +func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, clientIdentity *wire.SimpleClientIdentity, session string, logLevel int) *Gui { db, err := ethdb.NewLDBDatabase("tx_database") if err != nil { panic(err) diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index d9914a6f4..5313b8fad 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -18,9 +18,9 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethminer" "github.com/ethereum/go-ethereum/ethutil" - "github.com/ethereum/go-ethereum/ethwire" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/rpc" + "github.com/ethereum/go-ethereum/wire" "github.com/ethereum/go-ethereum/xeth" ) @@ -144,12 +144,12 @@ func NewDatabase() ethutil.Database { return db } -func NewClientIdentity(clientIdentifier, version, customIdentifier string) *ethwire.SimpleClientIdentity { +func NewClientIdentity(clientIdentifier, version, customIdentifier string) *wire.SimpleClientIdentity { clilogger.Infoln("identity created") - return ethwire.NewSimpleClientIdentity(clientIdentifier, version, customIdentifier) + return wire.NewSimpleClientIdentity(clientIdentifier, version, customIdentifier) } -func NewEthereum(db ethutil.Database, clientIdentity ethwire.ClientIdentity, keyManager *crypto.KeyManager, usePnp bool, OutboundPort string, MaxPeer int) *eth.Ethereum { +func NewEthereum(db ethutil.Database, clientIdentity wire.ClientIdentity, keyManager *crypto.KeyManager, usePnp bool, OutboundPort string, MaxPeer int) *eth.Ethereum { ethereum, err := eth.New(db, clientIdentity, keyManager, eth.CapDefault, usePnp) if err != nil { clilogger.Fatalln("eth start err:", err) |