Remove compact ranges from the persistence layer

transparency-dev · Oct 23, 2024 · 02e4ab6 · 02e4ab6
1 parent 70d4c7a
commit 02e4ab6
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 19 deletions.
diff --git a/internal/feeder/sumdb/sumdb_feeder.go b/internal/feeder/sumdb/sumdb_feeder.go
@@ -22,8 +22,6 @@ import (
 	"time"
 
 	"github.com/transparency-dev/formats/log"
-	"github.com/transparency-dev/merkle/compact"
-	"github.com/transparency-dev/merkle/rfc6962"
 	"github.com/transparency-dev/witness/internal/client"
 	"github.com/transparency-dev/witness/internal/config"
 	"github.com/transparency-dev/witness/internal/feeder"
@@ -36,12 +34,6 @@ const (
 	leavesPerTile = 1 << tileHeight
 )
 
-var (
-	rf = &compact.RangeFactory{
-		Hash: rfc6962.DefaultHasher.HashChildren,
-	}
-)
-
 // FeedLog continually feeds checkpoints from the given log into the witness.
 // This method blocks until the context is done.
 func FeedLog(ctx context.Context, l config.Log, w feeder.Witness, c *http.Client, interval time.Duration) error {

diff --git a/internal/persistence/inmemory/inmemory.go b/internal/persistence/inmemory/inmemory.go
@@ -121,7 +121,7 @@ func (rw *readWriter) GetLatest() ([]byte, error) {
 	return rw.read.rawChkpt, nil
 }
 
-func (rw *readWriter) Set(c []byte, rng []byte) error {
+func (rw *readWriter) Set(c []byte) error {
 	rw.toStore = &checkpointState{
 		rawChkpt: c,
 	}

diff --git a/internal/persistence/inmemory/inmemory_test.go b/internal/persistence/inmemory/inmemory_test.go
@@ -59,7 +59,7 @@ func TestWriteOpsConcurrent(t *testing.T) {
 				}
 			}
 			// Ignore any error on Set because we expect some.
-			_ = w.Set([]byte(fmt.Sprintf("success %d", i)), nil)
+			_ = w.Set([]byte(fmt.Sprintf("success %d", i)))
 			return nil
 		})
 	}

diff --git a/internal/persistence/persistence.go b/internal/persistence/persistence.go
@@ -55,10 +55,9 @@ type LogStateReadOps interface {
 type LogStateWriteOps interface {
 	LogStateReadOps
 
-	// Set sets a new checkpoint and (optional) compact range
-	// for the log. This commits the state to persistence.
+	// Set sets a new checkpoint for the log, committing the state to persistence.
 	// After this call, only Close() should be called on this object.
-	Set(checkpointRaw []byte, compactRange []byte) error
+	Set(checkpointRaw []byte) error
 
 	// Terminates the write operation, freeing all resources.
 	// This method MUST be called.

diff --git a/internal/persistence/sql/sql.go b/internal/persistence/sql/sql.go
@@ -102,8 +102,8 @@ func (w *writer) GetLatest() ([]byte, error) {
 	return getLatestCheckpoint(w.tx.QueryRow, w.logID)
 }
 
-func (w *writer) Set(c []byte, rng []byte) error {
-	_, err := w.tx.Exec(`INSERT OR REPLACE INTO chkpts (logID, chkpt, range) VALUES (?, ?, ?)`, w.logID, c, rng)
+func (w *writer) Set(c []byte) error {
+	_, err := w.tx.Exec(`INSERT OR REPLACE INTO chkpts (logID, chkpt) VALUES (?, ?)`, w.logID, c)
 	if err != nil {
 		return fmt.Errorf("Exec(): %v", err)
 	}

diff --git a/internal/persistence/testonly/persistence.go b/internal/persistence/testonly/persistence.go
@@ -97,7 +97,7 @@ func writeCheckpoint(lsp persistence.LogStatePersistence, id string) error {
 		return fmt.Errorf("WriteOps(%s): %v", id, err)
 	}
 	defer writeOps.Close()
-	if err := writeOps.Set([]byte(fmt.Sprintf("%s cp", id)), nil); err != nil {
+	if err := writeOps.Set([]byte(fmt.Sprintf("%s cp", id))); err != nil {
 		return fmt.Errorf("Set(%s): %v", id, err)
 	}
 	return nil

diff --git a/internal/witness/witness.go b/internal/witness/witness.go
@@ -175,7 +175,7 @@ func (w *Witness) Update(ctx context.Context, logID string, nextRaw []byte, cPro
 				return nil, status.Errorf(codes.Internal, "couldn't sign input checkpoint: %v", err)
 			}
 
-			if err := write.Set(signed, nil); err != nil {
+			if err := write.Set(signed); err != nil {
 				return nil, status.Errorf(codes.Internal, "couldn't set TOFU checkpoint: %v", err)
 			}
 			counterUpdateSuccess.Inc(logID)
@@ -210,7 +210,7 @@ func (w *Witness) Update(ctx context.Context, logID string, nextRaw []byte, cPro
 		if err != nil {
 			return nil, status.Errorf(codes.Internal, "couldn't sign input checkpoint: %v", err)
 		}
-		if err := write.Set(signed, nil); err != nil {
+		if err := write.Set(signed); err != nil {
 			return nil, status.Errorf(codes.Internal, "couldn't set first non-zero checkpoint: %v", err)
 		}
 		counterUpdateSuccess.Inc(logID)
@@ -236,7 +236,7 @@ func (w *Witness) Update(ctx context.Context, logID string, nextRaw []byte, cPro
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "couldn't sign input checkpoint: %v", err)
 	}
-	if err := write.Set(signed, nil); err != nil {
+	if err := write.Set(signed); err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to store new checkpoint: %v", err)
 	}
 	counterUpdateSuccess.Inc(logID)