Move the default hasher one directory up (google#2580)

The intermediate directory/package is empty, so move rfc6962/hasher to rfc6962. It also used to be there previously, so this change brings backward compatibility for this specific package back.
ermul · Jul 19, 2021 · 1486ed5 · 1486ed5
1 parent 65021e5
commit 1486ed5
Show file tree

Hide file tree

Showing 25 changed files with 29 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6  20,7 @@
    - `TrillianLog.QueueLeaves`
  * Removed the incomplete Postgres storage backend (#1298).
  * Deprecated `LogRootV1.Revision` field.
  * Moved `rfc6962` hasher one directory up to eliminate empty leftover package.
 
 ### Storage refactoring
  * `NodeReader.GetMerkleNodes` does not accept revisions anymore. The

diff --git a/client/log_client_test.go b/client/log_client_test.go
@@ -22,7  22,7 @@ import (
 	"time"
 
 	"github.com/google/trillian"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/testonly/integration"
 	"github.com/google/trillian/types"
 	"google.golang.org/protobuf/proto"

diff --git a/client/log_verifier.go b/client/log_verifier.go
@@ -21,7  21,7 @@ import (
 	"github.com/google/trillian"
 	"github.com/google/trillian/merkle/hashers"
 	"github.com/google/trillian/merkle/logverifier"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/types"
 )
 

diff --git a/client/log_verifier_test.go b/client/log_verifier_test.go
@@ -18,7  18,7 @@ import (
 	"testing"
 
 	"github.com/google/trillian"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/types"
 )
 

diff --git a/integration/log.go b/integration/log.go
@@ -30,7  30,7 @@ import (
 	"github.com/google/trillian/internal/merkle/inmemory"
 	"github.com/google/trillian/merkle/compact"
 	"github.com/google/trillian/merkle/logverifier"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/types"
 )
 

diff --git a/internal/merkle/inmemory/merkle_tree_test.go b/internal/merkle/inmemory/merkle_tree_test.go
@@ -24,7  24,7 @@ import (
 
 	_ "github.com/golang/glog"
 	"github.com/google/trillian/merkle/hashers"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 )
 
 // Note test inputs came from the values used by the C   code. The original

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/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/monitoring"
 	"github.com/google/trillian/quota"
 	"github.com/google/trillian/storage"
@@ -100,7  100,7 @@ func InitMetrics(mf monitoring.MetricFactory) {
 // initCompactRangeFromStorage builds a compact range that matches the latest
 // data in the database. Ensures that the root hash matches the passed in root.
 func initCompactRangeFromStorage(ctx context.Context, root *types.LogRootV1, tx storage.TreeTX) (*compact.Range, error) {
-	fact := compact.RangeFactory{Hash: hasher.DefaultHasher.HashChildren}
 	fact := compact.RangeFactory{Hash: rfc6962.DefaultHasher.HashChildren}
 	if root.TreeSize == 0 {
 		return fact.NewEmptyRange(0), nil
 	}
@@ -378,7  378,7 @@ func IntegrateBatch(ctx context.Context, tree *trillian.Tree, limit int, guardWi
 		// Create the log root ready for signing.
 		if cr.End() == 0 {
 			// Override the nil root hash returned by the compact range.
-			newRoot = hasher.DefaultHasher.EmptyRoot()
 			newRoot = rfc6962.DefaultHasher.EmptyRoot()
 		}
 		newLogRoot = &types.LogRootV1{
 			RootHash:       newRoot,

diff --git a/log/sequencer_manager_test.go b/log/sequencer_manager_test.go
@@ -25,7  25,7 @@ import (
 	"github.com/google/trillian"
 	"github.com/google/trillian/extension"
 	"github.com/google/trillian/merkle/compact"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/quota"
 	"github.com/google/trillian/storage"
 	stestonly "github.com/google/trillian/storage/testonly"

diff --git a/log/sequencer_test.go b/log/sequencer_test.go
@@ -25,7  25,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/google/trillian"
 	"github.com/google/trillian/merkle/compact"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/quota"
 	"github.com/google/trillian/storage"
 	"github.com/google/trillian/testonly"

diff --git a/merkle/compact/range_test.go b/merkle/compact/range_test.go
@@ -26,7  26,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/merkle/testonly"
 
 	_ "github.com/golang/glog" // Required for flag handling

diff --git a/merkle/log_proofs_test.go b/merkle/log_proofs_test.go
@@ -21,7  21,7 @@ import (
 	_ "github.com/golang/glog" // Logging flags for overarching "go test" runs.
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/trillian/merkle/compact"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 )
 
 // TestCalcInclusionProofNodeAddresses contains inclusion proof tests. For

diff --git a/merkle/logverifier/log_verifier_test.go b/merkle/logverifier/log_verifier_test.go
@@ -23,7  23,7 @@ import (
 
 	_ "github.com/golang/glog"
 	"github.com/google/trillian/internal/merkle/inmemory"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 )
 
 type inclusionProofTestVector struct {

diff --git a/merkle/rfc6962/hasher/rfc6962.go → merkle/rfc6962/rfc6962.go b/merkle/rfc6962/hasher/rfc6962.go → merkle/rfc6962/rfc6962.go
@@ -12,8  12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package hasher provides hashing functionality according to RFC6962.
-package hasher
 // Package rfc6962 provides hashing functionality according to RFC6962.
 package rfc6962
 
 import (
 	"crypto"

diff --git a/merkle/rfc6962/hasher/rfc6962_test.go → merkle/rfc6962/rfc6962_test.go b/merkle/rfc6962/hasher/rfc6962_test.go → merkle/rfc6962/rfc6962_test.go
@@ -11,7  11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package hasher
 
 package rfc6962
 
 import (
 	"bytes"

diff --git a/server/log_rpc_server.go b/server/log_rpc_server.go
@@ -24,7  24,7 @@ import (
 	"github.com/google/trillian/extension"
 	"github.com/google/trillian/merkle"
 	"github.com/google/trillian/merkle/hashers"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/monitoring"
 	"github.com/google/trillian/storage"
 	"github.com/google/trillian/trees"

diff --git a/server/log_rpc_server_test.go b/server/log_rpc_server_test.go
@@ -27,7  27,7 @@ import (
 	"github.com/google/trillian"
 	"github.com/google/trillian/extension"
 	"github.com/google/trillian/merkle/compact"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/storage"
 	stestonly "github.com/google/trillian/storage/testonly"
 	"github.com/google/trillian/storage/tree"

diff --git a/server/proof_fetcher_test.go b/server/proof_fetcher_test.go
@@ -22,7  22,7 @@ import (
 
 	"github.com/google/trillian/internal/merkle/inmemory"
 	"github.com/google/trillian/merkle"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/storage/testonly"
 )
 

diff --git a/storage/cache/subtree_cache_test.go b/storage/cache/subtree_cache_test.go
@@ -23,7  23,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/trillian/merkle/compact"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/storage/storagepb"
 	"github.com/google/trillian/storage/tree"
 

diff --git a/storage/cloudspanner/log_storage.go b/storage/cloudspanner/log_storage.go
@@ -28,7  28,7 @@ import (
 	"cloud.google.com/go/spanner"
 	"github.com/golang/glog"
 	"github.com/google/trillian"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/storage"
 	"github.com/google/trillian/storage/cache"
 	"github.com/google/trillian/storage/cloudspanner/spannerpb"

diff --git a/storage/memory/log_storage.go b/storage/memory/log_storage.go
@@ -25,7  25,7 @@ import (
 	"github.com/google/btree"
 	"github.com/google/trillian"
 	"github.com/google/trillian/merkle/compact"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/monitoring"
 	"github.com/google/trillian/storage"
 	"github.com/google/trillian/storage/cache"

diff --git a/storage/mysql/log_storage.go b/storage/mysql/log_storage.go
@@ -28,7  28,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/google/trillian"
 	"github.com/google/trillian/merkle/compact"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/monitoring"
 	"github.com/google/trillian/storage"
 	"github.com/google/trillian/storage/cache"

diff --git a/storage/mysql/storage_test.go b/storage/mysql/storage_test.go
@@ -29,7  29,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/google/trillian"
 	"github.com/google/trillian/merkle/compact"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/storage"
 	"github.com/google/trillian/storage/testdb"
 	storageto "github.com/google/trillian/storage/testonly"

diff --git a/storage/testonly/fake_node_reader.go b/storage/testonly/fake_node_reader.go
@@ -21,7  21,7 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/google/trillian/merkle/compact"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/storage/tree"
 )
 

diff --git a/storage/tools/dump_tree/dumplib.go b/storage/tools/dump_tree/dumplib.go
@@ -32,7  32,7 @@ import (
 	"github.com/google/trillian/log"
 	"github.com/google/trillian/merkle/compact"
 	"github.com/google/trillian/merkle/hashers"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/google/trillian/monitoring"
 	"github.com/google/trillian/quota"
 	"github.com/google/trillian/storage"

diff --git a/storage/tools/hasher/main.go b/storage/tools/hasher/main.go
@@ -23,7  23,7 @@ import (
 	"fmt"
 
 	"github.com/golang/glog"
-	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 	"github.com/google/trillian/merkle/rfc6962"
 )
 
 var base64Flag = flag.Bool("base64", false, "If true output in base64 instead of hex")