world/block.go: Merge Hash() and BaseHash() methods

df-mc · Sep 6, 2024 · 4a45f8b · 4a45f8b
1 parent 6e71a3e
commit 4a45f8b
Show file tree

Hide file tree

Showing 5 changed files with 354 additions and 1,045 deletions.
diff --git a/cmd/blockhash/main.go b/cmd/blockhash/main.go
@@ -60,8 +60,7 @@ func procPackage(pkg *packages.Package, w io.Writer) {
 
 var (
 	packageFormat    = "// Code generated by cmd/blockhash; DO NOT EDIT.\n\npackage %v\n\n"
-	baseMethodFormat = "\nfunc (%v) BaseHash() uint64 {\n\treturn %v\n}\n"
-	hashMethodFormat = "\nfunc (%v%v) Hash() uint64 {\n\treturn %v\n}\n"
+	hashMethodFormat = "\nfunc (%v%v) Hash() (uint64, uint64) {\n\treturn %v, %v\n}\n"
 	constFormat      = "\thash%v"
 )
 
@@ -134,11 +133,6 @@ func (b *hashBuilder) writeNextHash(w io.Writer) {
 }
 
 func (b *hashBuilder) writeMethods(w io.Writer) {
-	for _, name := range b.names {
-		if _, err := fmt.Fprintf(w, baseMethodFormat, name, "hash"+name); err != nil {
-			log.Fatalln(err)
-		}
-	}
 	for _, name := range b.names {
 		fields := b.blockFields[name]
 
@@ -215,7 +209,7 @@ func (b *hashBuilder) writeMethods(w io.Writer) {
 			h = "0"
 		}
 
-		if _, err := fmt.Fprintf(w, hashMethodFormat, recvName, name, h); err != nil {
+		if _, err := fmt.Fprintf(w, hashMethodFormat, recvName, name, "hash"+name, h); err != nil {
 			log.Fatalln(err)
 		}
 	}