From 353cf19409abde69969dc8b93f5e737ca0397b10 Mon Sep 17 00:00:00 2001 From: Richard Gregory Date: Wed, 1 Feb 2023 14:17:45 +0100 Subject: [PATCH] fraud/testing: Use header/mocks.Store instead of custome mockStore This change modifies the test file in the fraud pkg to make use of mockStore in libs/header/mocks. Fixes: #1542 Signed-off-by: Richard Gregory --- fraud/testing.go | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/fraud/testing.go b/fraud/testing.go index 355d0440e4..3509f6ea16 100644 --- a/fraud/testing.go +++ b/fraud/testing.go @@ -16,6 +16,8 @@ import ( "github.com/celestiaorg/celestia-node/header" "github.com/celestiaorg/celestia-node/headertest" + libheader "github.com/celestiaorg/celestia-node/libs/header" + mockstore "github.com/celestiaorg/celestia-node/libs/header/mocks" ) type DummyService struct { @@ -33,34 +35,33 @@ func (d *DummyService) Get(context.Context, ProofType) ([]Proof, error) { return nil, nil } -type mockStore struct { - headers map[int64]*header.ExtendedHeader - headHeight int64 -} +type H libheader.Header + +type mockStore mockstore.MockStore[H] // createStore creates a mock store and adds several random // headers. func createStore(t *testing.T, numHeaders int) *mockStore { store := &mockStore{ - headers: make(map[int64]*header.ExtendedHeader), - headHeight: 0, + Headers: make(map[int64]H), + HeadHeight: 0, } suite := headertest.NewTestSuite(t, numHeaders) for i := 0; i < numHeaders; i++ { header := suite.GenExtendedHeader() - store.headers[header.Height()] = header + store.Headers[header.Height()] = header - if header.Height() > store.headHeight { - store.headHeight = header.Height() + if header.Height() > store.HeadHeight { + store.HeadHeight = header.Height() } } return store } -func (m *mockStore) GetByHeight(_ context.Context, height uint64) (*header.ExtendedHeader, error) { - return m.headers[int64(height)], nil +func (m *mockStore) GetByHeight(_ context.Context, height uint64) (H, error) { + return m.Headers[int64(height)], nil } func (m *mockStore) Close() error { return nil }