diff options
author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-16 21:43:30 +0800 |
---|---|---|
committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-16 21:43:30 +0800 |
commit | 3068e2688d88912ec33f3d80fd0fe26c4e897dcd (patch) | |
tree | ee32ccd17faf650f3e933e9a2d8b4ab52f0d7746 /xeth/xeth.go | |
parent | 1878630b591b039fadb6f88e15340d04f4af3ed1 (diff) | |
parent | 68f6ddc5aaa7ff29d09c1519ccd38d9cf16c0f75 (diff) | |
download | dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.gz dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.bz2 dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.lz dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.xz dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.tar.zst dexon-3068e2688d88912ec33f3d80fd0fe26c4e897dcd.zip |
merge conflicts
Diffstat (limited to 'xeth/xeth.go')
-rw-r--r-- | xeth/xeth.go | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/xeth/xeth.go b/xeth/xeth.go index 0e71a0ed9..75d83f80b 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -31,7 +31,6 @@ type Backend interface { IsListening() bool Peers() []*p2p.Peer KeyManager() *crypto.KeyManager - ClientIdentity() p2p.ClientIdentity Db() ethutil.Database EventMux() *event.TypeMux Whisper() *whisper.Whisper @@ -192,15 +191,6 @@ func (self *XEth) FromNumber(str string) string { return ethutil.BigD(fromHex(str)).String() } -func ToMessages(messages state.Messages) *ethutil.List { - var msgs []Message - for _, m := range messages { - msgs = append(msgs, NewMessage(m)) - } - - return ethutil.NewList(msgs) -} - func (self *XEth) PushTx(encodedTx string) (string, error) { tx := types.NewTransactionFromBytes(fromHex(encodedTx)) err := self.eth.TxPool().Add(tx) |