diff --git a/cborrpc/rpc.go b/cborrpc/rpc.go index acb08b4ad..9aa8cd2f1 100644 --- a/cborrpc/rpc.go +++ b/cborrpc/rpc.go @@ -19,12 +19,7 @@ func WriteCborRPC(w io.Writer, obj interface{}) error { return err } -type ByteReader interface { - io.Reader - io.ByteReader -} - -func ReadCborRPC(r ByteReader, out interface{}) error { +func ReadCborRPC(r io.Reader, out interface{}) error { b, err := ioutil.ReadAll(r) if err != nil { return err diff --git a/go.sum b/go.sum index 5c4b33e19..87ab1709b 100644 --- a/go.sum +++ b/go.sum @@ -82,6 +82,7 @@ github.com/ipfs/go-ipfs-routing v0.1.0 h1:gAJTT1cEeeLj6/DlLX6t+NxD9fQe2ymTO6qWRD github.com/ipfs/go-ipfs-routing v0.1.0/go.mod h1:hYoUkJLyAUKhF58tysKpids8RNDPO42BVMgK5dNsoqY= github.com/ipfs/go-ipfs-util v0.0.1 h1:Wz9bL2wB2YBJqggkA4dD7oSmqB4cAnpNbGrlHJulv50= github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc= +github.com/ipfs/go-ipld-cbor v0.0.2 h1:amzFztBQQQ69UA5+f7JRfoXF/z2l//MGfEDHVkS20+s= github.com/ipfs/go-ipld-cbor v0.0.2/go.mod h1:wTBtrQZA3SoFKMVkp6cn6HMRteIB1VsmHA0AQFOn7Nc= github.com/ipfs/go-ipld-format v0.0.1 h1:HCu4eB/Gh+KD/Q0M8u888RFkorTWNIL3da4oc5dwc80= github.com/ipfs/go-ipld-format v0.0.1/go.mod h1:kyJtbkDALmFHv3QR6et67i35QzO3S0dCDnkOJhcZkms= diff --git a/node/hello/hello.go b/node/hello/hello.go index e35b0d6d5..865d2c316 100644 --- a/node/hello/hello.go +++ b/node/hello/hello.go @@ -1,8 +1,8 @@ package hello import ( - "bufio" "context" + "github.com/filecoin-project/go-lotus/cborrpc" "github.com/libp2p/go-libp2p-core/host" @@ -46,15 +46,15 @@ func NewHelloService(h host.Host) *Service { func (hs *Service) HandleStream(s inet.Stream) { defer s.Close() - log.Debugw("Handling hello") - var hmsg Message - if err := cborrpc.ReadCborRPC(bufio.NewReader(s), &hmsg); err != nil { - log.Error("failed to read hello message: ", err) + if err := cborrpc.ReadCborRPC(s, &hmsg); err != nil { + log.Infow("failed to read hello message", "error", err) return } - log.Debugw("heaviest tipset", "tipset", hmsg.HeaviestTipSet) - log.Debugw("got genesis from hello", "hash", hmsg.GenesisHash) + log.Debugw("genesis from hello", + "tipset", hmsg.HeaviestTipSet, + "peer", s.Conn().RemotePeer(), + "hash", hmsg.GenesisHash) /*if hmsg.GenesisHash != hs.syncer.genesis.Cids()[0] { log.Error("other peer has different genesis!")