Revert "Add common interface between in-memory and on-disk transactio…

…n storage" This reverts commit 3196ade.
stellar · Apr 15, 2024 · 9a98d4f · 9a98d4f
1 parent 3196ade
commit 9a98d4f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 68 deletions.
diff --git a/cmd/soroban-rpc/internal/ingest/service.go b/cmd/soroban-rpc/internal/ingest/service.go
@@ -34,7 +34,7 @@ type Config struct {
 	Logger            *log.Entry
 	DB                db.ReadWriter
 	EventStore        *events.MemoryStore
-	TransactionStore  transactions.TransactionStore
+	TransactionStore  *transactions.MemoryStore
 	NetworkPassPhrase string
 	Archive           historyarchive.ArchiveInterface
 	LedgerBackend     backends.LedgerBackend
@@ -134,7 +134,7 @@ type Service struct {
 	logger            *log.Entry
 	db                db.ReadWriter
 	eventStore        *events.MemoryStore
-	transactionStore  transactions.TransactionStore
+	transactionStore  *transactions.MemoryStore
 	ledgerBackend     backends.LedgerBackend
 	timeout           time.Duration
 	networkPassPhrase string
@@ -308,8 +308,7 @@ func (s *Service) ingestLedgerCloseMeta(tx db.WriteTx, ledgerCloseMeta xdr.Ledge
 		return err
 	}
 	s.metrics.ingestionDurationMetric.
-		With(prometheus.Labels{"type": "ledger_close_meta"}).
-		Observe(time.Since(startTime).Seconds())
+		With(prometheus.Labels{"type": "ledger_close_meta"}).Observe(time.Since(startTime).Seconds())
 
 	if err := s.eventStore.IngestEvents(ledgerCloseMeta); err != nil {
 		return err

diff --git a/cmd/soroban-rpc/internal/jsonrpc.go b/cmd/soroban-rpc/internal/jsonrpc.go
@@ -47,7 +47,7 @@ func (h Handler) Close() {
 
 type HandlerParams struct {
 	EventStore        *events.MemoryStore
-	TransactionStore  transactions.TransactionStore
+	TransactionStore  *transactions.MemoryStore
 	LedgerEntryReader db.LedgerEntryReader
 	LedgerReader      db.LedgerReader
 	Logger            *log.Entry

diff --git a/cmd/soroban-rpc/internal/transactions/database.go b/cmd/soroban-rpc/internal/transactions/database.go
diff --git a/cmd/soroban-rpc/internal/transactions/interface.go b/cmd/soroban-rpc/internal/transactions/interface.go
diff --git a/...roban-rpc/internal/transactions/memory.go → ...rpc/internal/transactions/transactions.go b/...roban-rpc/internal/transactions/memory.go → ...rpc/internal/transactions/transactions.go
@@ -43,7 +43,7 @@ type MemoryStore struct {
 // will be included in the MemoryStore. If the MemoryStore
 // is full, any transactions from new ledgers will evict
 // older entries outside the retention window.
-func NewMemoryStore(daemon interfaces.Daemon, networkPassphrase string, retentionWindow uint32) TransactionStore {
+func NewMemoryStore(daemon interfaces.Daemon, networkPassphrase string, retentionWindow uint32) *MemoryStore {
 	window := ledgerbucketwindow.NewLedgerBucketWindow[[]xdr.Hash](retentionWindow)
 
 	// transactionDurationMetric is a metric for measuring latency of transaction store operations
@@ -75,7 +75,6 @@ func NewMemoryStore(daemon interfaces.Daemon, networkPassphrase string, retentio
 // removed from the store.
 func (m *MemoryStore) IngestTransactions(ledgerCloseMeta xdr.LedgerCloseMeta) error {
 	startTime := time.Now()
-
 	reader, err := ingest.NewLedgerTransactionReaderFromLedgerCloseMeta(m.networkPassphrase, ledgerCloseMeta)
 	if err != nil {
 		return err
@@ -136,7 +135,6 @@ func (m *MemoryStore) IngestTransactions(ledgerCloseMeta xdr.LedgerCloseMeta) er
 	for hash, tx := range hashMap {
 		m.transactions[hash] = tx
 	}
-
 	m.transactionDurationMetric.With(prometheus.Labels{"operation": "ingest"}).Observe(time.Since(startTime).Seconds())
 	m.transactionCountMetric.Observe(float64(txCount))
 	return nil