Move a constant down the call stack.

Part of #2378 and #2245.
google · May 19, 2021 · 21acd35 · 21acd35
1 parent 342b260
commit 21acd35
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/log/sequencer.go b/log/sequencer.go
@@ -25,7 +25,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/google/trillian"
 	"github.com/google/trillian/merkle/compact"
-	"github.com/google/trillian/merkle/hashers"
+	"github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/monitoring"
 	"github.com/google/trillian/quota"
 	"github.com/google/trillian/storage"
@@ -102,20 +102,17 @@ func InitMetrics(mf monitoring.MetricFactory) {
 // There is no strong ordering guarantee but in general entries will be processed
 // in order of submission to the log.
 type Sequencer struct {
-	hasher     hashers.LogHasher
 	timeSource clock.TimeSource
 	logStorage storage.LogStorage
 	qm         quota.Manager
 }
 
 // NewSequencer creates a new Sequencer instance for the specified inputs.
 func NewSequencer(
-	hasher hashers.LogHasher,
 	timeSource clock.TimeSource,
 	logStorage storage.LogStorage,
 	qm quota.Manager) *Sequencer {
 	return &Sequencer{
-		hasher:     hasher,
 		timeSource: timeSource,
 		logStorage: logStorage,
 		qm:         qm,
@@ -125,7 +122,7 @@ func NewSequencer(
 // initCompactRangeFromStorage builds a compact range that matches the latest
 // data in the database. Ensures that the root hash matches the passed in root.
 func (s Sequencer) initCompactRangeFromStorage(ctx context.Context, root *types.LogRootV1, tx storage.TreeTX) (*compact.Range, error) {
-	fact := compact.RangeFactory{Hash: s.hasher.HashChildren}
+	fact := compact.RangeFactory{Hash: hasher.DefaultHasher.HashChildren}
 	if root.TreeSize == 0 {
 		return fact.NewEmptyRange(0), nil
 	}
@@ -414,7 +411,7 @@ func (s Sequencer) IntegrateBatch(ctx context.Context, tree *trillian.Tree, limi
 		// Create the log root ready for signing.
 		if cr.End() == 0 {
 			// Override the nil root hash returned by the compact range.
-			newRoot = s.hasher.EmptyRoot()
+			newRoot = hasher.DefaultHasher.EmptyRoot()
 		}
 		newLogRoot = &types.LogRootV1{
 			RootHash:       newRoot,

diff --git a/log/sequencer_manager.go b/log/sequencer_manager.go
@@ -22,7 +22,6 @@ import (
 	"github.com/golang/glog"
 	"github.com/google/trillian"
 	"github.com/google/trillian/extension"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/trees"
 )
 
@@ -55,7 +54,7 @@ func (s *SequencerManager) ExecutePass(ctx context.Context, logID int64, info *O
 	}
 	ctx = trees.NewContext(ctx, tree)
 
-	sequencer := NewSequencer(rfc6962.DefaultHasher, info.TimeSource, s.registry.LogStorage, s.registry.QuotaManager)
+	sequencer := NewSequencer(info.TimeSource, s.registry.LogStorage, s.registry.QuotaManager)
 
 	maxRootDuration := tree.MaxRootDuration.AsDuration()
 	if !tree.MaxRootDuration.IsValid() {

diff --git a/log/sequencer_test.go b/log/sequencer_test.go
@@ -300,7 +300,7 @@ func createTestContext(ctrl *gomock.Controller, params testParameters) (testCont
 		qm = quota.Noop()
 	}
 	InitMetrics(nil)
-	sequencer := NewSequencer(rfc6962.DefaultHasher, clock.NewFake(fakeTime), fakeStorage, qm)
+	sequencer := NewSequencer(clock.NewFake(fakeTime), fakeStorage, qm)
 	return testContext{mockTx: mockTx, fakeStorage: fakeStorage, sequencer: sequencer}, context.Background()
 }
 
@@ -623,7 +623,6 @@ func TestIntegrateBatch_PutTokens(t *testing.T) {
 	defer ctrl.Finish()
 
 	// Needed to create a signer
-	hasher := rfc6962.DefaultHasher
 	ts := clock.NewFake(fakeTime)
 
 	// Needed for IntegrateBatch calls
@@ -717,7 +716,7 @@ func TestIntegrateBatch_PutTokens(t *testing.T) {
 				qm.EXPECT().PutTokens(any, test.wantTokens, specs)
 			}
 
-			sequencer := NewSequencer(hasher, ts, logStorage, qm)
+			sequencer := NewSequencer(ts, logStorage, qm)
 			tree := &trillian.Tree{TreeId: treeID, TreeType: trillian.TreeType_LOG}
 			leaves, err := sequencer.IntegrateBatch(ctx, tree, limit, guardWindow, maxRootDuration)
 			if err != nil {

diff --git a/storage/tools/dump_tree/dumplib.go b/storage/tools/dump_tree/dumplib.go
@@ -168,10 +168,7 @@ func Main(args Options) string {
 	tree := createTree(as, ls)
 
 	log.InitMetrics(nil)
-	seq := log.NewSequencer(rfc6962.DefaultHasher,
-		clock.System,
-		ls,
-		quota.Noop())
+	seq := log.NewSequencer(clock.System, ls, quota.Noop())
 
 	// Create the initial tree head at size 0, which is required. And then sequence the leaves.
 	sequence(tree, seq, 0, args.BatchSize)