diff options
| author | zelig <viktor.tron@gmail.com> | 2015-03-16 23:50:29 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-03-16 23:50:29 +0800 |
| commit | b3e133dd159749a625c4b0245af293607ba12c8c (patch) | |
| tree | 9ba8e8c4afe9168f5bc83219d402efb00387d616 /p2p/server.go | |
| parent | 8139d444f8d8163251d1c96ef8034d186825ce32 (diff) | |
| parent | 73af0302bed5076260ac935e452064aee423934d (diff) | |
| download | go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.gz go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.bz2 go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.lz go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.xz go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.zst go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.zip | |
Merge branch 'frontier/js' into frontier/nodeadmin.js
Diffstat (limited to 'p2p/server.go')
| -rw-r--r-- | p2p/server.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/p2p/server.go b/p2p/server.go index 4d1437d80..9c148ba39 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/ethutil" + "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" @@ -46,7 +46,7 @@ type Server struct { MaxPeers int // Name sets the node name of this server. - // Use ethutil.MakeName to create a name that follows existing conventions. + // Use common.MakeName to create a name that follows existing conventions. Name string // Bootstrap nodes are used to establish connectivity @@ -132,7 +132,7 @@ func (srv *Server) SuggestPeer(n *discover.Node) { func (srv *Server) Broadcast(protocol string, code uint64, data ...interface{}) { var payload []byte if data != nil { - payload = ethutil.Encode(data) + payload = common.Encode(data) } srv.lock.RLock() defer srv.lock.RUnlock() |