refactor(pkg/trie): Remove GenesisBlock method from tries (#3844)

ChainSafe · Apr 3, 2024 · a8754b8 · a8754b8
1 parent df4ac1c
commit a8754b8
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 105 deletions.
diff --git a/dot/node.go b/dot/node.go
@@ -157,7 +157,7 @@ func (nodeBuilder) initNode(config *cfg.Config) error {
 	}
 
 	// create genesis block from trie
-	header, err := t.GenesisBlock()
+	header, err := runtime.GenesisBlockFromTrie(t)
 	if err != nil {
 		return fmt.Errorf("failed to create genesis block from trie: %w", err)
 	}

diff --git a/dot/node_integration_test.go b/dot/node_integration_test.go
@@ -102,7 +102,7 @@ func TestNewNode(t *testing.T) {
 			return nil, fmt.Errorf("failed to create trie from genesis: %w", err)
 		}
 		// create genesis block from trie
-		header, err := trie.GenesisBlock()
+		header, err := runtime.GenesisBlockFromTrie(trie)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create genesis block from trie: %w", err)
 		}

diff --git a/lib/runtime/genesis.go b/lib/runtime/genesis.go
@@ -7,6 +7,8 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/ChainSafe/gossamer/dot/types"
+	"github.com/ChainSafe/gossamer/lib/common"
 	"github.com/ChainSafe/gossamer/lib/genesis"
 	"github.com/ChainSafe/gossamer/pkg/trie"
 	in_memory_trie "github.com/ChainSafe/gossamer/pkg/trie/inmemory"
@@ -33,3 +35,17 @@ func NewTrieFromGenesis(gen genesis.Genesis) (tr trie.Trie, err error) {
 
 	return tr, nil
 }
+
+func GenesisBlockFromTrie(t trie.Trie) (genesisHeader types.Header, err error) {
+	rootHash, err := t.Hash()
+	if err != nil {
+		return genesisHeader, fmt.Errorf("root hashing trie: %w", err)
+	}
+
+	parentHash := common.Hash{0}
+	extrinsicRoot := trie.EmptyHash
+	const blockNumber = 0
+	digest := types.NewDigest()
+	genesisHeader = *types.NewHeader(parentHash, rootHash, extrinsicRoot, blockNumber, digest)
+	return genesisHeader, nil
+}
diff --git a/pkg/trie/inmemory/genesis.go b/pkg/trie/inmemory/genesis.go
diff --git a/pkg/trie/inmemory/genesis_test.go b/pkg/trie/inmemory/genesis_test.go
diff --git a/pkg/trie/trie.go b/pkg/trie/trie.go
@@ -6,7 +6,6 @@ package trie
 import (
 	"fmt"
 
-	"github.com/ChainSafe/gossamer/dot/types"
 	"github.com/ChainSafe/gossamer/lib/common"
 	"github.com/ChainSafe/gossamer/pkg/trie/tracking"
 )
@@ -53,7 +52,6 @@ type Versioned interface {
 type Hashable interface {
 	MustHash() common.Hash
 	Hash() (common.Hash, error)
-	GenesisBlock() (genesisHeader types.Header, err error)
 }
 
 type Trie interface {