diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-22 01:18:19 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-22 01:18:19 +0800 |
| commit | 7f85608f30a2e34005c8d15566849229c758c2f1 (patch) | |
| tree | 7aeb9d8bdfda7ec10ea38688a96ed245028764ad /p2p/server.go | |
| parent | 09766d1729f7530093aec7e9acd3e5339b2c2028 (diff) | |
| parent | fcacfabe1959c4aff6a63cb4e275f65328660601 (diff) | |
| download | dexon-7f85608f30a2e34005c8d15566849229c758c2f1.tar dexon-7f85608f30a2e34005c8d15566849229c758c2f1.tar.gz dexon-7f85608f30a2e34005c8d15566849229c758c2f1.tar.bz2 dexon-7f85608f30a2e34005c8d15566849229c758c2f1.tar.lz dexon-7f85608f30a2e34005c8d15566849229c758c2f1.tar.xz dexon-7f85608f30a2e34005c8d15566849229c758c2f1.tar.zst dexon-7f85608f30a2e34005c8d15566849229c758c2f1.zip | |
Merge branch 'conversion' into develop
Diffstat (limited to 'p2p/server.go')
| -rw-r--r-- | p2p/server.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/p2p/server.go b/p2p/server.go index 9c148ba39..813b0676f 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/p2p/discover" "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/ethereum/go-ethereum/rlp" ) const ( @@ -129,10 +129,14 @@ func (srv *Server) SuggestPeer(n *discover.Node) { // Broadcast sends an RLP-encoded message to all connected peers. // This method is deprecated and will be removed later. -func (srv *Server) Broadcast(protocol string, code uint64, data ...interface{}) { +func (srv *Server) Broadcast(protocol string, code uint64, data interface{}) error { var payload []byte if data != nil { - payload = common.Encode(data) + var err error + payload, err = rlp.EncodeToBytes(data) + if err != nil { + return err + } } srv.lock.RLock() defer srv.lock.RUnlock() @@ -146,6 +150,7 @@ func (srv *Server) Broadcast(protocol string, code uint64, data ...interface{}) peer.writeProtoMsg(protocol, msg) } } + return nil } // Start starts running the server. |