fix close

This commit is contained in:
Evgeny Danienko 2022-06-03 14:30:58 +03:00
parent 208133b6da
commit f8a56b8188

View file

@ -44,6 +44,7 @@ func TestInsertingSpanSizeBlocks(t *testing.T) {
_, span := loadSpanFromFile(t) _, span := loadSpanFromFile(t)
h.EXPECT().Close().AnyTimes()
h.EXPECT().FetchLatestCheckpoint().Return(&bor.Checkpoint{ h.EXPECT().FetchLatestCheckpoint().Return(&bor.Checkpoint{
Proposer: span.SelectedProducers[0].Address, Proposer: span.SelectedProducers[0].Address,
StartBlock: big.NewInt(0), StartBlock: big.NewInt(0),
@ -80,6 +81,8 @@ func TestFetchStateSyncEvents(t *testing.T) {
engine := init.ethereum.Engine() engine := init.ethereum.Engine()
_bor := engine.(*bor.Bor) _bor := engine.(*bor.Bor)
defer engine.Close()
// A. Insert blocks for 0th sprint // A. Insert blocks for 0th sprint
db := init.ethereum.ChainDb() db := init.ethereum.ChainDb()
block := init.genesis.ToBlock(db) block := init.genesis.ToBlock(db)
@ -97,6 +100,7 @@ func TestFetchStateSyncEvents(t *testing.T) {
defer ctrl.Finish() defer ctrl.Finish()
h := mocks.NewMockIHeimdallClient(ctrl) h := mocks.NewMockIHeimdallClient(ctrl)
h.EXPECT().Close().AnyTimes()
// B.2 Mock State Sync events // B.2 Mock State Sync events
fromID := uint64(1) fromID := uint64(1)
@ -123,6 +127,8 @@ func TestFetchStateSyncEvents_2(t *testing.T) {
engine := init.ethereum.Engine() engine := init.ethereum.Engine()
_bor := engine.(*bor.Bor) _bor := engine.(*bor.Bor)
defer _bor.Close()
// Mock /bor/span/1 // Mock /bor/span/1
res, _ := loadSpanFromFile(t) res, _ := loadSpanFromFile(t)
@ -130,6 +136,7 @@ func TestFetchStateSyncEvents_2(t *testing.T) {
defer ctrl.Finish() defer ctrl.Finish()
h := mocks.NewMockIHeimdallClient(ctrl) h := mocks.NewMockIHeimdallClient(ctrl)
h.EXPECT().Close().AnyTimes()
h.EXPECT().FetchWithRetry(spanPath, "").Return(res, nil).AnyTimes() h.EXPECT().FetchWithRetry(spanPath, "").Return(res, nil).AnyTimes()
// Mock State Sync events // Mock State Sync events
@ -190,9 +197,12 @@ func TestOutOfTurnSigning(t *testing.T) {
engine := init.ethereum.Engine() engine := init.ethereum.Engine()
_bor := engine.(*bor.Bor) _bor := engine.(*bor.Bor)
defer _bor.Close()
h, _, ctrl := getMockedHeimdallClient(t) h, _, ctrl := getMockedHeimdallClient(t)
defer ctrl.Finish() defer ctrl.Finish()
h.EXPECT().Close().AnyTimes()
_bor.SetHeimdallClient(h) _bor.SetHeimdallClient(h)
db := init.ethereum.ChainDb() db := init.ethereum.ChainDb()
@ -243,9 +253,13 @@ func TestSignerNotFound(t *testing.T) {
engine := init.ethereum.Engine() engine := init.ethereum.Engine()
_bor := engine.(*bor.Bor) _bor := engine.(*bor.Bor)
defer _bor.Close()
h, _, ctrl := getMockedHeimdallClient(t) h, _, ctrl := getMockedHeimdallClient(t)
defer ctrl.Finish() defer ctrl.Finish()
h.EXPECT().Close().AnyTimes()
_bor.SetHeimdallClient(h) _bor.SetHeimdallClient(h)
db := init.ethereum.ChainDb() db := init.ethereum.ChainDb()