Address review feedback

stellar · Aug 28, 2023 · 1eaeb86 · 1eaeb86
1 parent c544a0e
commit 1eaeb86
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/cmd/soroban-rpc/internal/daemon/daemon.go b/cmd/soroban-rpc/internal/daemon/daemon.go
@@ -189,14 +189,14 @@ func MustNew(cfg *config.Config) *Daemon {
 	// NOTE: We could optimize this to avoid unnecessary ingestion calls
 	//       (the range of txmetads can be larger than the store retention windows)
 	//       but it's probably not worth the pain.
-	err = db.NewLedgerReader(dbConn).StreamAllLedgers(readTxMetaCtx, func(txmeta xdr.LedgerCloseMeta) (bool, error) {
+	err = db.NewLedgerReader(dbConn).StreamAllLedgers(readTxMetaCtx, func(txmeta xdr.LedgerCloseMeta) error {
 		if err := eventStore.IngestEvents(txmeta); err != nil {
 			logger.WithError(err).Fatal("could not initialize event memory store")
 		}
 		if err := transactionStore.IngestTransactions(txmeta); err != nil {
 			logger.WithError(err).Fatal("could not initialize transaction memory store")
 		}
-		return false, nil
+		return nil
 	})
 	if err != nil {
 		logger.WithError(err).Fatal("could not obtain txmeta cache from the database")

diff --git a/cmd/soroban-rpc/internal/db/ledger.go b/cmd/soroban-rpc/internal/db/ledger.go
@@ -13,7 +13,7 @@ const (
 	ledgerCloseMetaTableName = "ledger_close_meta"
 )
 
-type StreamLedgerFn func(xdr.LedgerCloseMeta) (done bool, err error)
+type StreamLedgerFn func(xdr.LedgerCloseMeta) error
 
 type LedgerReader interface {
 	GetLedger(ctx context.Context, sequence uint32) (xdr.LedgerCloseMeta, bool, error)
@@ -45,13 +45,9 @@ func (r ledgerReader) StreamAllLedgers(ctx context.Context, f StreamLedgerFn) er
 		if err = q.Scan(&closeMeta); err != nil {
 			return err
 		}
-		done, err := f(closeMeta)
-		if err != nil {
+		if err = f(closeMeta); err != nil {
 			return err
 		}
-		if done {
-			return nil
-		}
 	}
 	return nil
 }

diff --git a/cmd/soroban-rpc/internal/db/ledger_test.go b/cmd/soroban-rpc/internal/db/ledger_test.go
@@ -29,9 +29,9 @@ func createLedger(ledgerSequence uint32) xdr.LedgerCloseMeta {
 
 func assertLedgerRange(t *testing.T, reader LedgerReader, start, end uint32) {
 	var allLedgers []xdr.LedgerCloseMeta
-	err := reader.StreamAllLedgers(context.Background(), func(txmeta xdr.LedgerCloseMeta) (done bool, err error) {
+	err := reader.StreamAllLedgers(context.Background(), func(txmeta xdr.LedgerCloseMeta) error {
 		allLedgers = append(allLedgers, txmeta)
-		return false, nil
+		return nil
 	})
 	assert.NoError(t, err)
 	for i := start - 1; i <= end+1; i++ {