feat(BUX-712): renaming to privated methods, refactor

bitcoin-sv · Apr 3, 2024 · 2c376ec · 2c376ec
1 parent 6259531
commit 2c376ec
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 22 deletions.
diff --git a/internal/transports/p2p/peer/consts.go b/internal/transports/p2p/peer/consts.go
@@ -14,6 +14,7 @@ const (
 	minAcceptableProtocolVersion = wire.MultipleAddressVersion
 	pingInterval                 = 2 * time.Minute
 	writeMsgChannelBufferSize    = 10
+	ourServices                  = wire.SFspv
 )
 
 var zeroHash chainhash.Hash
diff --git a/internal/transports/p2p/peer/peer.go b/internal/transports/p2p/peer/peer.go
@@ -34,7 +34,6 @@ type Peer struct {
 	protocolVersion uint32
 	nonce           uint64
 	lastBlock       int32
-	startingHeight  int32
 	timeOffset      int64
 	userAgent       string
 	verAckReceived  bool
@@ -100,6 +99,15 @@ func (p *Peer) Connect() error {
 	}
 	p.conn = conn
 	p.log.Info().Msgf("connected to peer: %s", p)
+
+	err = p.negotiateProtocol()
+	if err != nil {
+		p.log.Error().Msgf("error negotiating protocol with peer %s, reason: %v", p, err)
+		return err
+	}
+
+	go p.pingHandler()
+
 	return nil
 }
 
@@ -118,26 +126,19 @@ func (p *Peer) Disconnect() error {
 	return nil
 }
 
-func (p *Peer) Start() error {
-	err := p.negotiateProtocol()
-	if err != nil {
-		p.log.Error().Msgf("error negotiating protocol with peer %s, reason: %v", p, err)
-		return err
-	}
-
+func (p *Peer) StartHeadersSync() error {
 	go p.writeMsgHandler()
 	go p.readMsgHandler()
-	go p.pingHandler()
 
-	err = p.startSync()
+	err := p.requestHeaders()
 	if err != nil {
-		p.log.Error().Msgf("error starting sync from peer %s, reason: %v", p, err)
+		p.log.Error().Msgf("error requesting headers from peer %s, reason: %v", p, err)
 		return err
 	}
 	return nil
 }
 
-func (p *Peer) startSync() error {
+func (p *Peer) requestHeaders() error {
 	p.log.Info().Msgf("requesting headers from peer %s", p)
 
 	var err error
@@ -244,11 +245,7 @@ func (p *Peer) readMsgHandler() {
 }
 
 func (p *Peer) writeMessage(msg wire.Message) error {
-	err := wire.WriteMessage(p.conn, msg, p.protocolVersion, p.chainParams.Net)
-	if err != nil {
-		return err
-	}
-	return nil
+	return wire.WriteMessage(p.conn, msg, p.protocolVersion, p.chainParams.Net)
 }
 
 func (p *Peer) writeRejectMessage(msg wire.Message, reason string) {
@@ -300,7 +297,7 @@ func (p *Peer) writeOurVersionMsg() error {
 	p.nonce = nonce
 
 	ourNA := &wire.NetAddress{
-		Services:  wire.SFspv,
+		Services:  ourServices,
 		Timestamp: time.Now(),
 	}
 	theirNA := wire.NewNetAddress(p.addr, 0)
@@ -314,7 +311,7 @@ func (p *Peer) writeOurVersionMsg() error {
 		return err
 	}
 
-	msg.Services = p.services
+	msg.Services = ourServices
 
 	err = p.writeMessage(msg)
 	if err != nil {
@@ -377,7 +374,6 @@ func (p *Peer) handleVersionMessage(msg *wire.MsgVersion) error {
 	p.protocolVersion = min(p.protocolVersion, uint32(msg.ProtocolVersion))
 	p.services = msg.Services
 	p.lastBlock = msg.LastBlock
-	p.startingHeight = msg.LastBlock
 	p.timeOffset = msg.Timestamp.Unix() - time.Now().Unix()
 	p.userAgent = msg.UserAgent
 

diff --git a/internal/transports/p2p/seed.go b/internal/transports/p2p/seed.go
@@ -9,7 +9,7 @@ import (
 	"github.com/rs/zerolog"
 )
 
-func SeedFromDNS(seeds []chaincfg.DNSSeed, log *zerolog.Logger) []net.IP {
+func seedFromDNS(seeds []chaincfg.DNSSeed, log *zerolog.Logger) []net.IP {
 	allSeedPeers := make([]net.IP, 0)
 
 	for _, seed := range seeds {

diff --git a/internal/transports/p2p/server.go b/internal/transports/p2p/server.go
@@ -41,7 +41,7 @@ func NewServer(
 }
 
 func (s *server) Start() error {
-	seeds := SeedFromDNS(s.chainParams.DNSSeeds, s.log)
+	seeds := seedFromDNS(s.chainParams.DNSSeeds, s.log)
 	if len(seeds) == 0 {
 		return errors.New("no seeds found")
 	}