fix test and bug

onflow · Nov 13, 2024 · 2e65322 · 2e65322
1 parent cb45e91
commit 2e65322
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/services/ingestion/event_subscriber.go b/services/ingestion/event_subscriber.go
@@ -215,7 +215,8 @@ func (r *RPCEventSubscriber) backfill(ctx context.Context, currentHeight uint64)
 				return
 			}
 
-			currentHeight, err := r.backfillSpork(ctx, currentHeight, eventsChan)
+			var err error
+			currentHeight, err = r.backfillSpork(ctx, currentHeight, eventsChan)
 			if err != nil {
 				r.logger.Error().Err(err).Msg("error backfilling spork")
 				eventsChan <- models.NewBlockEventsError(err)

diff --git a/services/testutils/mock_client.go b/services/testutils/mock_client.go
@@ -95,9 +95,23 @@ func SetupClient(startHeight uint64, endHeight uint64) (*MockClient, chan flow.B
 			return events, make(chan error), nil
 		},
 		GetEventsForHeightRangeFunc: func(
-			ctx context.Context, eventType string, startHeight uint64, endHeight uint64,
+			ctx context.Context, eventType string, sh uint64, eh uint64,
 		) ([]flow.BlockEvents, error) {
-			return []flow.BlockEvents{}, nil
+			if sh < startHeight || sh > endHeight {
+				return nil, storage.ErrNotFound
+			}
+			if eh < startHeight || eh > endHeight {
+				return nil, storage.ErrNotFound
+			}
+
+			evts := make([]flow.BlockEvents, 0, eh-sh+1)
+			for i := uint64(0); i <= eh-sh; i++ {
+				evts = append(evts, flow.BlockEvents{
+					Height: sh + i,
+				})
+			}
+
+			return evts, nil
 		},
 	}, events
 }