Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

p2p: fix wantTXGossip modifications #5982

Merged
merged 2 commits into from
Apr 19, 2024
Merged

p2p: fix wantTXGossip modifications #5982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c468ab
Add missing OnClose method to gossipSubPeer for ERL
algorandskiy Apr 19, 2024
1cfadb2
fix wantTXGossip changes tracking
algorandskiy Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion network/p2pNetwork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,15 @@ type gossipSubPeer struct {

func (p gossipSubPeer) GetNetwork() GossipNode { return p.net }

func (p gossipSubPeer) OnClose(f func()) {
net := p.GetNetwork().(*P2PNetwork)
net.wsPeersLock.Lock()
defer net.wsPeersLock.Unlock()
if wsp, ok := net.wsPeers[p.peerID]; ok {
wsp.OnClose(f)
}
}

// NewP2PNetwork returns an instance of GossipNode that uses the p2p.Service
func NewP2PNetwork(log logging.Logger, cfg config.Local, datadir string, phonebookAddresses []string, genesisID string, networkID protocol.NetworkID, node NodeInfo) (*P2PNetwork, error) {
const readBufferLen = 2048
Expand Down Expand Up @@ -668,7 +677,7 @@ func (n *P2PNetwork) GetHTTPClient(address string) (*http.Client, error) {
func (n *P2PNetwork) OnNetworkAdvance() {
if n.nodeInfo != nil {
old := n.wantTXGossip.Load()
new := n.nodeInfo.IsParticipating()
new := n.relayMessages || n.config.ForceFetchTransactions || n.nodeInfo.IsParticipating()
if old != new {
n.wantTXGossip.Store(new)
if new {
Expand Down
42 changes: 40 additions & 2 deletions network/p2pNetwork_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,9 +907,9 @@ func TestP2PWantTXGossip(t *testing.T) {
ctx: ctx,
nodeInfo: &nopeNodeInfo{},
}
net.wantTXGossip.Store(false)

// ensure wantTXGossip from false to false is noop
net.wantTXGossip.Store(false)
net.OnNetworkAdvance()
require.Eventually(t, func() bool { net.wg.Wait(); return true }, 1*time.Second, 50*time.Millisecond)
require.Equal(t, int64(0), mockService.count.Load())
Expand All @@ -923,14 +923,52 @@ func TestP2PWantTXGossip(t *testing.T) {
require.False(t, net.wantTXGossip.Load())

// check false to true change triggers subscription
net.wantTXGossip.Store(false)
net.nodeInfo = &participatingNodeInfo{}
net.OnNetworkAdvance()
require.Eventually(t, func() bool { return mockService.count.Load() == 1 }, 1*time.Second, 50*time.Millisecond)
require.True(t, net.wantTXGossip.Load())

// check IsParticipating changes wantTXGossip
net.wantTXGossip.Store(true)
net.nodeInfo = &nopeNodeInfo{}
net.config.ForceFetchTransactions = false
net.relayMessages = false
net.OnNetworkAdvance()
require.Eventually(t, func() bool { net.wg.Wait(); return true }, 1*time.Second, 50*time.Millisecond)
require.False(t, net.wantTXGossip.Load())

// check ForceFetchTransactions and relayMessages also take effect
net.wantTXGossip.Store(false)
net.nodeInfo = &nopeNodeInfo{}
net.config.ForceFetchTransactions = true
net.relayMessages = false
net.OnNetworkAdvance()
require.Eventually(t, func() bool { return mockService.count.Load() == 2 }, 1*time.Second, 50*time.Millisecond)
require.True(t, net.wantTXGossip.Load())

net.wantTXGossip.Store(false)
net.nodeInfo = &nopeNodeInfo{}
net.config.ForceFetchTransactions = false
net.relayMessages = true
net.OnNetworkAdvance()
require.Eventually(t, func() bool { return mockService.count.Load() == 3 }, 1*time.Second, 50*time.Millisecond)
require.True(t, net.wantTXGossip.Load())

// ensure empty nodeInfo prevents changing the value
net.wantTXGossip.Store(false)
net.nodeInfo = nil
net.config.ForceFetchTransactions = true
net.relayMessages = true
net.OnNetworkAdvance()
require.Eventually(t, func() bool { net.wg.Wait(); return true }, 1*time.Second, 50*time.Millisecond)
require.False(t, net.wantTXGossip.Load())

// check true to true change is noop
net.wantTXGossip.Store(true)
net.nodeInfo = &participatingNodeInfo{}
net.OnNetworkAdvance()
require.Eventually(t, func() bool { return mockService.count.Load() == 1 }, 1*time.Second, 50*time.Millisecond)
require.Eventually(t, func() bool { return mockService.count.Load() == 3 }, 1*time.Second, 50*time.Millisecond)
require.True(t, net.wantTXGossip.Load())
}

Expand Down
5 changes: 1 addition & 4 deletions network/wsNetwork_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import (
"time"

"github.com/algorand/go-algorand/internal/rapidgen"
"github.com/algorand/go-algorand/network/p2p"
"github.com/algorand/go-algorand/network/phonebook"
"pgregory.net/rapid"

Expand Down Expand Up @@ -3293,14 +3292,12 @@ func TestWebsocketNetworkTXMessageOfInterestNPN(t *testing.T) {
}

type participatingNodeInfo struct {
nopeNodeInfo
}

func (nnni *participatingNodeInfo) IsParticipating() bool {
return true
}
func (nnni *participatingNodeInfo) Capabilities() []p2p.Capability {
return nil
}

func TestWebsocketNetworkTXMessageOfInterestPN(t *testing.T) {
// Tests that A->B follows MOI
Expand Down
Loading