From 3cdac70a0de21957ed537c3d03ccb63d99383d29 Mon Sep 17 00:00:00 2001 From: Felipe Andrade Date: Fri, 26 May 2023 19:07:35 -0700 Subject: [PATCH] reset listeners, doc typos --- proxyd/proxyd/consensus_poller.go | 12 ++++++++---- proxyd/proxyd/integration_tests/consensus_test.go | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/proxyd/proxyd/consensus_poller.go b/proxyd/proxyd/consensus_poller.go index d019951..5aff27e 100644 --- a/proxyd/proxyd/consensus_poller.go +++ b/proxyd/proxyd/consensus_poller.go @@ -177,6 +177,10 @@ func (cp *ConsensusPoller) AddListener(listener OnConsensusBroken) { cp.listeners = append(cp.listeners, listener) } +func (cp *ConsensusPoller) ClearListeners() { + cp.listeners = []OnConsensusBroken{} +} + func WithBanPeriod(banPeriod time.Duration) ConsensusOpt { return func(cp *ConsensusPoller) { cp.banPeriod = banPeriod @@ -524,7 +528,7 @@ func (cp *ConsensusPoller) Ban(be *Backend) { bs.finalizedBlockNumber = 0 } -// Unban remove any bans from the backends +// Unban removes any bans from the backends func (cp *ConsensusPoller) Unban(be *Backend) { bs := cp.backendState[be] defer bs.backendStateMux.Unlock() @@ -532,14 +536,14 @@ func (cp *ConsensusPoller) Unban(be *Backend) { bs.bannedUntil = time.Now().Add(-10 * time.Hour) } -// Reset remove any bans from the backends and reset their states +// Reset reset all backend states func (cp *ConsensusPoller) Reset() { for _, be := range cp.backendGroup.Backends { cp.backendState[be] = &backendState{} } } -// fetchBlock Convenient wrapper to make a request to get a block directly from the backend +// fetchBlock is a convenient wrapper to make a request to get a block directly from the backend func (cp *ConsensusPoller) fetchBlock(ctx context.Context, be *Backend, block string) (blockNumber hexutil.Uint64, blockHash string, err error) { var rpcRes RPCRes err = be.ForwardRPC(ctx, &rpcRes, "67", "eth_getBlockByNumber", block, false) @@ -557,7 +561,7 @@ func (cp *ConsensusPoller) fetchBlock(ctx context.Context, be *Backend, block st return } -// getPeerCount Convenient wrapper to retrieve the current peer count from the backend +// getPeerCount is a convenient wrapper to retrieve the current peer count from the backend func (cp *ConsensusPoller) getPeerCount(ctx context.Context, be *Backend) (count uint64, err error) { var rpcRes RPCRes err = be.ForwardRPC(ctx, &rpcRes, "67", "net_peerCount") diff --git a/proxyd/proxyd/integration_tests/consensus_test.go b/proxyd/proxyd/integration_tests/consensus_test.go index 320139a..7d98732 100644 --- a/proxyd/proxyd/integration_tests/consensus_test.go +++ b/proxyd/proxyd/integration_tests/consensus_test.go @@ -80,6 +80,7 @@ func TestConsensus(t *testing.T) { node.handler.ResetOverrides() node.mockBackend.Reset() } + bg.Consensus.ClearListeners() bg.Consensus.Reset() }