From e35b57dc4eb870a1f9841eef7b38d0a912f998bb Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Fri, 23 Sep 2022 14:17:22 +0200 Subject: [PATCH] fix consensus errors --- consensus/byzantine_test.go | 7 ++----- consensus/common_test.go | 4 ++-- consensus/reactor_test.go | 4 ++-- state/execution.go | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/consensus/byzantine_test.go b/consensus/byzantine_test.go index 7938f569f..f90ba13fc 100644 --- a/consensus/byzantine_test.go +++ b/consensus/byzantine_test.go @@ -68,8 +68,8 @@ func TestByzantinePrevoteEquivocation(t *testing.T) { mtx := new(tmsync.Mutex) // one for mempool, one for consensus - proxyAppConnCon := proxy.NewAppConnConsensus(abcicli.NewLocalClient(mtx, app), nil) - proxyAppConnMem := proxy.NewAppConnMempool(abcicli.NewLocalClient(mtx, app), nil) + proxyAppConnCon := proxy.NewAppConnConsensus(abcicli.NewLocalClient(mtx, app), proxy.NopMetrics()) + proxyAppConnMem := proxy.NewAppConnMempool(abcicli.NewLocalClient(mtx, app), proxy.NopMetrics()) // Make Mempool var mempool mempl.Mempool @@ -293,9 +293,6 @@ func TestByzantinePrevoteEquivocation(t *testing.T) { } } case <-time.After(20 * time.Second): - for i, reactor := range reactors { - t.Logf("Consensus Reactor %d\n%v", i, reactor) - } t.Fatalf("Timed out waiting for validators to commit evidence") } } diff --git a/consensus/common_test.go b/consensus/common_test.go index 00e25126a..ab2cc98cb 100644 --- a/consensus/common_test.go +++ b/consensus/common_test.go @@ -397,8 +397,8 @@ func newStateWithConfigAndBlockStore( // one for mempool, one for consensus mtx := new(tmsync.Mutex) - proxyAppConnCon := proxy.NewAppConnConsensus(abcicli.NewLocalClient(mtx, app), nil) - proxyAppConnMem := proxy.NewAppConnMempool(abcicli.NewLocalClient(mtx, app), nil) + proxyAppConnCon := proxy.NewAppConnConsensus(abcicli.NewLocalClient(mtx, app), proxy.NopMetrics()) + proxyAppConnMem := proxy.NewAppConnMempool(abcicli.NewLocalClient(mtx, app), proxy.NopMetrics()) // Make Mempool memplMetrics := mempl.NopMetrics() diff --git a/consensus/reactor_test.go b/consensus/reactor_test.go index caeccbe82..395c9248c 100644 --- a/consensus/reactor_test.go +++ b/consensus/reactor_test.go @@ -161,8 +161,8 @@ func TestReactorWithEvidence(t *testing.T) { mtx := new(tmsync.Mutex) memplMetrics := mempl.NopMetrics() // one for mempool, one for consensus - proxyAppConnCon := proxy.NewAppConnConsensus(abcicli.NewLocalClient(mtx, app), nil) - proxyAppConnMem := proxy.NewAppConnMempool(abcicli.NewLocalClient(mtx, app), nil) + proxyAppConnCon := proxy.NewAppConnConsensus(abcicli.NewLocalClient(mtx, app), proxy.NopMetrics()) + proxyAppConnMem := proxy.NewAppConnMempool(abcicli.NewLocalClient(mtx, app), proxy.NopMetrics()) // Make Mempool var mempool mempl.Mempool diff --git a/state/execution.go b/state/execution.go index 165869d82..0b04359dc 100644 --- a/state/execution.go +++ b/state/execution.go @@ -342,7 +342,7 @@ func execBlockOnProxyApp( return nil, fmt.Errorf("expected tx results length to match size of transactions in block. Expected %d, got %d", len(block.Data.Txs), len(resp.TxResults)) } - logger.Info("executed block", "height", block.Height, "agreed__app_data", resp.AgreedAppData) + logger.Info("executed block", "height", block.Height, "agreed_app_data", resp.AgreedAppData) return resp, nil }