fix

maticnetwork · Jun 3, 2022 · 208133b · 208133b
1 parent 01b6d6c
commit 208133b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/eth/backend.go b/eth/backend.go
@@ -598,6 +598,13 @@ func (s *Ethereum) Start() error {
 // StartCheckpointWhitelistService starts the goroutine to fetch checkpoints and update the
 // checkpoint whitelist map.
 func (s *Ethereum) startCheckpointWhitelistService() {
+ // a shortcut helps with tests and early exit
+ select {
+ case <-s.closeCh:
+ return
+ default:
+ }
+
  // first run the checkpoint whitelist
  err := s.handleWhitelistCheckpoint()
  if err != nil {

diff --git a/tests/bor/bor_test.go b/tests/bor/bor_test.go
@@ -37,10 +37,18 @@ func TestInsertingSpanSizeBlocks(t *testing.T) {
  engine := init.ethereum.Engine()
  _bor := engine.(*bor.Bor)
 
+ defer engine.Close()
+
  h, heimdallSpan, ctrl := getMockedHeimdallClient(t)
  defer ctrl.Finish()
 
- h.EXPECT().FetchLatestCheckpoint().Return(&bor.Checkpoint{}, nil).AnyTimes()
+ _, span := loadSpanFromFile(t)
+
+ h.EXPECT().FetchLatestCheckpoint().Return(&bor.Checkpoint{
+ Proposer: span.SelectedProducers[0].Address,
+ StartBlock: big.NewInt(0),
+ EndBlock: big.NewInt(int64(spanSize)),
+ }, nil).Times(1)
 
  _bor.SetHeimdallClient(h)