LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Packages Projects Releases 28 Wiki Activity

wire: Minor code clean up.

Browse source
This commit is contained in:
Jonathan Gillham 2016-01-25 00:56:47 +00:00
parent e03fa30e89
commit 95361a2afc
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wire/message.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2013-2015 The btcsuite developers // Copyright (c) 2013-2016 The btcsuite developers
// Use of this source code is governed by an ISC // Use of this source code is governed by an ISC
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
@ -243,19 +243,17 @@ func WriteMessageN(w io.Writer, msg Message, pver uint32, btcnet BitcoinNet) (in
// Write header. // Write header.
n, err := w.Write(hw.Bytes()) n, err := w.Write(hw.Bytes())
totalBytes += n
if err != nil { if err != nil {
totalBytes += n
return totalBytes, err return totalBytes, err
} }
totalBytes += n
// Write payload. // Write payload.
n, err = w.Write(payload) n, err = w.Write(payload)
totalBytes += n
if err != nil { if err != nil {
totalBytes += n
return totalBytes, err return totalBytes, err
} }
totalBytes += n
return totalBytes, nil return totalBytes, nil
} }
@ -278,11 +276,10 @@ func WriteMessage(w io.Writer, msg Message, pver uint32, btcnet BitcoinNet) erro
func ReadMessageN(r io.Reader, pver uint32, btcnet BitcoinNet) (int, Message, []byte, error) { func ReadMessageN(r io.Reader, pver uint32, btcnet BitcoinNet) (int, Message, []byte, error) {
totalBytes := 0 totalBytes := 0
n, hdr, err := readMessageHeader(r) n, hdr, err := readMessageHeader(r)
totalBytes += n
if err != nil { if err != nil {
totalBytes += n
return totalBytes, nil, nil, err return totalBytes, nil, nil, err
} }
totalBytes += n
// Enforce maximum message payload. // Enforce maximum message payload.
if hdr.length > MaxMessagePayload { if hdr.length > MaxMessagePayload {
@ -331,11 +328,10 @@ func ReadMessageN(r io.Reader, pver uint32, btcnet BitcoinNet) (int, Message, []
// Read payload. // Read payload.
payload := make([]byte, hdr.length) payload := make([]byte, hdr.length)
n, err = io.ReadFull(r, payload) n, err = io.ReadFull(r, payload)
totalBytes += n
if err != nil { if err != nil {
totalBytes += n
return totalBytes, nil, nil, err return totalBytes, nil, nil, err
} }
totalBytes += n
// Test checksum. // Test checksum.
checksum := DoubleSha256(payload)[0:4] checksum := DoubleSha256(payload)[0:4]

7
wire/msgversion.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2013-2015 The btcsuite developers // Copyright (c) 2013-2016 The btcsuite developers
// Use of this source code is governed by an ISC // Use of this source code is governed by an ISC
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
@ -61,10 +61,7 @@ type MsgVersion struct {
// HasService returns whether the specified service is supported by the peer // HasService returns whether the specified service is supported by the peer
// that generated the message. // that generated the message.
func (msg *MsgVersion) HasService(service ServiceFlag) bool { func (msg *MsgVersion) HasService(service ServiceFlag) bool {
if msg.Services&service == service { return msg.Services&service == service
return true
}
return false
} }
// AddService adds service as a supported service by the peer generating the // AddService adds service as a supported service by the peer generating the