Skip to content

Commit

Permalink
newTestGenesisWithTrieAndHeader returns values
Browse files Browse the repository at this point in the history
  • Loading branch information
@qdm12
qdm12 committed Sep 7, 2022
1 parent 68bb71a commit bcb4229
Show file tree
Hide file tree
Showing 27 changed files with 139 additions and 111 deletions.
20 changes: 11 additions & 9 deletions dot/core/helpers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func NewTestService(t *testing.T, cfg *Config) *Service {
var stateSrvc *state.Service
testDatadirPath := t.TempDir()

gen, genTrie, genHeader := newTestGenesisWithTrieAndHeader(t)
gen, genesisTrie, genesisHeader := newTestGenesisWithTrieAndHeader(t)

if cfg.BlockState == nil || cfg.StorageState == nil ||
cfg.TransactionState == nil || cfg.EpochState == nil ||
Expand All @@ -64,7 +64,7 @@ func NewTestService(t *testing.T, cfg *Config) *Service {
stateSrvc = state.NewService(config)
stateSrvc.UseMemDB()

err := stateSrvc.Initialise(gen, genHeader, genTrie)
err := stateSrvc.Initialise(&gen, &genesisHeader, &genesisTrie)
require.NoError(t, err)

err = stateSrvc.Start()
Expand Down Expand Up @@ -94,7 +94,7 @@ func NewTestService(t *testing.T, cfg *Config) *Service {
if cfg.Runtime == nil {
var rtCfg wasmer.Config

rtCfg.Storage = rtstorage.NewTrieState(genTrie)
rtCfg.Storage = rtstorage.NewTrieState(&genesisTrie)

var err error
rtCfg.CodeHash, err = cfg.StorageState.LoadCodeHash(nil)
Expand Down Expand Up @@ -138,22 +138,24 @@ func NewTestService(t *testing.T, cfg *Config) *Service {
}

func newTestGenesisWithTrieAndHeader(t *testing.T) (
gen *genesis.Genesis, genesisTrie *trie.Trie, genesisHeader *types.Header) {
gen genesis.Genesis, genesisTrie trie.Trie, genesisHeader types.Header) {
genesisPath := utils.GetGssmrV3SubstrateGenesisRawPathTest(t)
gen, err := genesis.NewGenesisFromJSONRaw(genesisPath)
genPtr, err := genesis.NewGenesisFromJSONRaw(genesisPath)
require.NoError(t, err)
gen = *genPtr

genesisTrie, err = wasmer.NewTrieFromGenesis(*gen)
genesisTrie, err = wasmer.NewTrieFromGenesis(gen)
require.NoError(t, err)

parentHash := common.NewHash([]byte{0})
stateRoot := genesisTrie.MustHash()
extrinsicRoot := trie.EmptyHash
const number = 0
digest := types.NewDigest()
genesisHeader, err = types.NewHeader(parentHash,
genesisHeaderPtr, err := types.NewHeader(parentHash,
stateRoot, extrinsicRoot, number, digest)
require.NoError(t, err)
genesisHeader = *genesisHeaderPtr

return gen, genesisTrie, genesisHeader
}
Expand All @@ -167,10 +169,10 @@ func getGssmrRuntimeCode(t *testing.T) (code []byte) {
gssmrGenesis, err := genesis.NewGenesisFromJSONRaw(path)
require.NoError(t, err)

trie, err := wasmer.NewTrieFromGenesis(*gssmrGenesis)
genesisTrie, err := wasmer.NewTrieFromGenesis(*gssmrGenesis)
require.NoError(t, err)

trieState := rtstorage.NewTrieState(trie)
trieState := rtstorage.NewTrieState(&genesisTrie)

return trieState.LoadCode()
}
Expand Down
6 changes: 3 additions & 3 deletions dot/core/service_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ func generateTestValidRemarkTxns(t *testing.T, pubKey []byte, accInfo types.Acco
gen, err := genesis.NewGenesisFromJSONRaw(projectRootPath)
require.NoError(t, err)

genTrie, err := wasmer.NewTrieFromGenesis(*gen)
genesisTrie, err := wasmer.NewTrieFromGenesis(*gen)
require.NoError(t, err)

genState := rtstorage.NewTrieState(genTrie)
genState := rtstorage.NewTrieState(&genesisTrie)

nodeStorage := runtime.NodeStorage{
BaseDB: runtime.NewInMemoryDB(t),
Expand All @@ -82,7 +82,7 @@ func generateTestValidRemarkTxns(t *testing.T, pubKey []byte, accInfo types.Acco

genesisHeader := &types.Header{
Number: 0,
StateRoot: genTrie.MustHash(),
StateRoot: genesisTrie.MustHash(),
}

// Hash of encrypted centrifuge extrinsic
Expand Down
4 changes: 2 additions & 2 deletions dot/digest/digest_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ func newTestHandler(t *testing.T) (*Handler, *state.Service) {
stateSrvc := state.NewService(config)
stateSrvc.UseMemDB()

gen, genTrie, genHeader := newTestGenesisWithTrieAndHeader(t)
err := stateSrvc.Initialise(gen, genHeader, genTrie)
gen, genesisTrie, genesisHeader := newTestGenesisWithTrieAndHeader(t)
err := stateSrvc.Initialise(&gen, &genesisHeader, &genesisTrie)
require.NoError(t, err)

err = stateSrvc.SetupBase()
Expand Down
10 changes: 6 additions & 4 deletions dot/digest/helpers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,24 @@ import (
)

func newTestGenesisWithTrieAndHeader(t *testing.T) (
gen *genesis.Genesis, genesisTrie *trie.Trie, genesisHeader *types.Header) {
gen genesis.Genesis, genesisTrie trie.Trie, genesisHeader types.Header) {
genesisPath := utils.GetGssmrV3SubstrateGenesisRawPathTest(t)
gen, err := genesis.NewGenesisFromJSONRaw(genesisPath)
genesisPtr, err := genesis.NewGenesisFromJSONRaw(genesisPath)
require.NoError(t, err)
gen = *genesisPtr

genesisTrie, err = wasmer.NewTrieFromGenesis(*gen)
genesisTrie, err = wasmer.NewTrieFromGenesis(gen)
require.NoError(t, err)

parentHash := common.NewHash([]byte{0})
stateRoot := genesisTrie.MustHash()
extrinsicRoot := trie.EmptyHash
const number = 0
digest := types.NewDigest()
genesisHeader, err = types.NewHeader(parentHash,
genesisHeaderPtr, err := types.NewHeader(parentHash,
stateRoot, extrinsicRoot, number, digest)
require.NoError(t, err)
genesisHeader = *genesisHeaderPtr

return gen, genesisTrie, genesisHeader
}
10 changes: 6 additions & 4 deletions dot/helpers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,24 @@ func writeGenesisToTestJSON(t *testing.T, genesis genesis.Genesis) (filename str
}

func newTestGenesisWithTrieAndHeader(t *testing.T) (
gen *genesis.Genesis, genesisTrie *trie.Trie, genesisHeader *types.Header) {
gen genesis.Genesis, genesisTrie trie.Trie, genesisHeader types.Header) {
genesisPath := utils.GetGssmrV3SubstrateGenesisRawPathTest(t)
gen, err := genesis.NewGenesisFromJSONRaw(genesisPath)
genPtr, err := genesis.NewGenesisFromJSONRaw(genesisPath)
require.NoError(t, err)
gen = *genPtr

genesisTrie, err = wasmer.NewTrieFromGenesis(*gen)
genesisTrie, err = wasmer.NewTrieFromGenesis(gen)
require.NoError(t, err)

parentHash := common.NewHash([]byte{0})
stateRoot := genesisTrie.MustHash()
extrinsicRoot := trie.EmptyHash
const number = 0
digest := types.NewDigest()
genesisHeader, err = types.NewHeader(parentHash,
genesisHeaderPtr, err := types.NewHeader(parentHash,
stateRoot, extrinsicRoot, number, digest)
require.NoError(t, err)
genesisHeader = *genesisHeaderPtr

return gen, genesisTrie, genesisHeader
}
2 changes: 1 addition & 1 deletion dot/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func (*nodeBuilder) initNode(cfg *Config) error {
stateSrvc := state.NewService(config)

// initialise state service with genesis data, block, and trie
err = stateSrvc.Initialise(gen, &header, t)
err = stateSrvc.Initialise(gen, &header, &t)
if err != nil {
return fmt.Errorf("failed to initialise state service: %s", err)
}
Expand Down
2 changes: 1 addition & 1 deletion dot/node_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func TestNewNode(t *testing.T) {
return nil, fmt.Errorf("failed to create genesis block from trie: %w", err)
}
stateSrvc.Telemetry = mockTelemetryClient
err = stateSrvc.Initialise(gen, &header, trie)
err = stateSrvc.Initialise(gen, &header, &trie)
if err != nil {
return nil, fmt.Errorf("failed to initialise state service: %s", err)
}
Expand Down
10 changes: 6 additions & 4 deletions dot/rpc/helpers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,24 @@ import (
)

func newTestGenesisWithTrieAndHeader(t *testing.T) (
gen *genesis.Genesis, genesisTrie *trie.Trie, genesisHeader *types.Header) {
gen genesis.Genesis, genesisTrie trie.Trie, genesisHeader types.Header) {
genesisPath := utils.GetGssmrV3SubstrateGenesisRawPathTest(t)
gen, err := genesis.NewGenesisFromJSONRaw(genesisPath)
genesisPtr, err := genesis.NewGenesisFromJSONRaw(genesisPath)
require.NoError(t, err)
gen = *genesisPtr

genesisTrie, err = wasmer.NewTrieFromGenesis(*gen)
genesisTrie, err = wasmer.NewTrieFromGenesis(gen)
require.NoError(t, err)

parentHash := common.NewHash([]byte{0})
stateRoot := genesisTrie.MustHash()
extrinsicRoot := trie.EmptyHash
const number = 0
digest := types.NewDigest()
genesisHeader, err = types.NewHeader(parentHash,
genesisHeaderPtr, err := types.NewHeader(parentHash,
stateRoot, extrinsicRoot, number, digest)
require.NoError(t, err)
genesisHeader = *genesisHeaderPtr

return gen, genesisTrie, genesisHeader
}
6 changes: 3 additions & 3 deletions dot/rpc/http_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ func newCoreServiceTest(t *testing.T) *core.Service {

testDatadirPath := t.TempDir()

gen, genTrie, genHeader := newTestGenesisWithTrieAndHeader(t)
gen, genesisTrie, genesisHeader := newTestGenesisWithTrieAndHeader(t)

ctrl := gomock.NewController(t)
telemetryMock := NewMockClient(ctrl)
Expand All @@ -379,7 +379,7 @@ func newCoreServiceTest(t *testing.T) *core.Service {
stateSrvc := state.NewService(config)
stateSrvc.UseMemDB()

err := stateSrvc.Initialise(gen, genHeader, genTrie)
err := stateSrvc.Initialise(&gen, &genesisHeader, &genesisTrie)
require.NoError(t, err)

err = stateSrvc.SetupBase()
Expand All @@ -406,7 +406,7 @@ func newCoreServiceTest(t *testing.T) *core.Service {

var rtCfg wasmer.Config

rtCfg.Storage = rtstorage.NewTrieState(genTrie)
rtCfg.Storage = rtstorage.NewTrieState(&genesisTrie)

rtCfg.CodeHash, err = cfg.StorageState.LoadCodeHash(nil)
require.NoError(t, err)
Expand Down
20 changes: 10 additions & 10 deletions dot/rpc/modules/author_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ type integrationTestController struct {
func setupStateAndRuntime(t *testing.T, basepath string, useInstance useRuntimeInstace) *integrationTestController {
t.Helper()

gen, genTrie, genesisHeader := newTestGenesisWithTrieAndHeader(t)
gen, genesisTrie, genesisHeader := newTestGenesisWithTrieAndHeader(t)

ctrl := gomock.NewController(t)
telemetryMock := NewMockClient(ctrl)
Expand All @@ -591,7 +591,7 @@ func setupStateAndRuntime(t *testing.T, basepath string, useInstance useRuntimeI
state2test.UseMemDB()

state2test.Transaction = state.NewTransactionState(telemetryMock)
err := state2test.Initialise(gen, genesisHeader, genTrie)
err := state2test.Initialise(&gen, &genesisHeader, &genesisTrie)
require.NoError(t, err)

err = state2test.Start()
Expand All @@ -604,9 +604,9 @@ func setupStateAndRuntime(t *testing.T, basepath string, useInstance useRuntimeI
ks := keystore.NewGlobalKeystore()
net2test := NewMockNetwork(nil)
integrationTestController := &integrationTestController{
genesis: gen,
genesisTrie: genTrie,
genesisHeader: genesisHeader,
genesis: &gen,
genesisTrie: &genesisTrie,
genesisHeader: &genesisHeader,
stateSrv: state2test,
storageState: state2test.Storage,
keystore: ks,
Expand All @@ -631,7 +631,7 @@ func setupStateAndPopulateTrieState(t *testing.T, basepath string,
useInstance useRuntimeInstace) *integrationTestController {
t.Helper()

gen, genTrie, genesisHeader := newTestGenesisWithTrieAndHeader(t)
gen, genesisTrie, genesisHeader := newTestGenesisWithTrieAndHeader(t)

ctrl := gomock.NewController(t)
telemetryMock := NewMockClient(ctrl)
Expand All @@ -652,7 +652,7 @@ func setupStateAndPopulateTrieState(t *testing.T, basepath string,

state2test.Transaction = state.NewTransactionState(telemetryMock)

err := state2test.Initialise(gen, genesisHeader, genTrie)
err := state2test.Initialise(&gen, &genesisHeader, &genesisTrie)
require.NoError(t, err)

err = state2test.Start()
Expand All @@ -665,9 +665,9 @@ func setupStateAndPopulateTrieState(t *testing.T, basepath string,
net2test := NewMockNetwork(nil)
ks := keystore.NewGlobalKeystore()
integrationTestController := &integrationTestController{
genesis: gen,
genesisTrie: genTrie,
genesisHeader: genesisHeader,
genesis: &gen,
genesisTrie: &genesisTrie,
genesisHeader: &genesisHeader,
stateSrv: state2test,
storageState: state2test.Storage,
keystore: ks,
Expand Down
6 changes: 3 additions & 3 deletions dot/rpc/modules/chain_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,17 +352,17 @@ func newTestStateService(t *testing.T) *state.Service {
stateSrvc := state.NewService(config)
stateSrvc.UseMemDB()

gen, genTrie, genesisHeader := newTestGenesisWithTrieAndHeader(t)
gen, genesisTrie, genesisHeader := newTestGenesisWithTrieAndHeader(t)

err := stateSrvc.Initialise(gen, genesisHeader, genTrie)
err := stateSrvc.Initialise(&gen, &genesisHeader, &genesisTrie)
require.NoError(t, err)

err = stateSrvc.Start()
require.NoError(t, err)

var rtCfg wasmer.Config

rtCfg.Storage = rtstorage.NewTrieState(genTrie)
rtCfg.Storage = rtstorage.NewTrieState(&genesisTrie)

if stateSrvc != nil {
rtCfg.NodeStorage.BaseDB = stateSrvc.Base
Expand Down
4 changes: 2 additions & 2 deletions dot/rpc/modules/childstate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
func createTestTrieState(t *testing.T) (*trie.Trie, common.Hash) {
t.Helper()

_, genTrie, _ := newTestGenesisWithTrieAndHeader(t)
tr := rtstorage.NewTrieState(genTrie)
_, genesisTrie, _ := newTestGenesisWithTrieAndHeader(t)
tr := rtstorage.NewTrieState(&genesisTrie)

tr.Set([]byte(":first_key"), []byte(":value1"))
tr.Set([]byte(":second_key"), []byte(":second_value"))
Expand Down
4 changes: 2 additions & 2 deletions dot/rpc/modules/dev_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ func newState(t *testing.T) (*state.BlockState, *state.EpochState) {

_, genesisTrie, genesisHeader := newTestGenesisWithTrieAndHeader(t)
tries := state.NewTries()
tries.SetTrie(genesisTrie)
bs, err := state.NewBlockStateFromGenesis(db, tries, genesisHeader, telemetryMock)
tries.SetTrie(&genesisTrie)
bs, err := state.NewBlockStateFromGenesis(db, tries, &genesisHeader, telemetryMock)
require.NoError(t, err)
es, err := state.NewEpochStateFromGenesis(db, bs, genesisBABEConfig)
require.NoError(t, err)
Expand Down
10 changes: 6 additions & 4 deletions dot/rpc/modules/helpers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,24 @@ func makeChange(keyHex, valueHex string) [2]*string {
}

func newTestGenesisWithTrieAndHeader(t *testing.T) (
gen *genesis.Genesis, genesisTrie *trie.Trie, genesisHeader *types.Header) {
gen genesis.Genesis, genesisTrie trie.Trie, genesisHeader types.Header) {
genesisPath := utils.GetGssmrV3SubstrateGenesisRawPathTest(t)
gen, err := genesis.NewGenesisFromJSONRaw(genesisPath)
genesisPtr, err := genesis.NewGenesisFromJSONRaw(genesisPath)
require.NoError(t, err)
gen = *genesisPtr

genesisTrie, err = wasmer.NewTrieFromGenesis(*gen)
genesisTrie, err = wasmer.NewTrieFromGenesis(gen)
require.NoError(t, err)

parentHash := common.NewHash([]byte{0})
stateRoot := genesisTrie.MustHash()
extrinsicRoot := trie.EmptyHash
const number = 0
digest := types.NewDigest()
genesisHeader, err = types.NewHeader(parentHash,
genesisHeaderPtr, err := types.NewHeader(parentHash,
stateRoot, extrinsicRoot, number, digest)
require.NoError(t, err)
genesisHeader = *genesisHeaderPtr

return gen, genesisTrie, genesisHeader
}
4 changes: 2 additions & 2 deletions dot/services_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func newStateServiceWithoutMock(t *testing.T) *state.Service {
stateSrvc := state.NewService(stateConfig)
stateSrvc.UseMemDB()
genData, genTrie, genesisHeader := newTestGenesisWithTrieAndHeader(t)
err := stateSrvc.Initialise(genData, genesisHeader, genTrie)
err := stateSrvc.Initialise(&genData, &genesisHeader, &genTrie)
require.NoError(t, err)

err = stateSrvc.SetupBase()
Expand All @@ -76,7 +76,7 @@ func newStateServiceWithoutMock(t *testing.T) *state.Service {

var rtCfg wasmer.Config

rtCfg.Storage = rtstorage.NewTrieState(genTrie)
rtCfg.Storage = rtstorage.NewTrieState(&genTrie)

rtCfg.CodeHash, err = stateSrvc.Storage.LoadCodeHash(nil)
require.NoError(t, err)
Expand Down
Loading

0 comments on commit bcb4229

Please sign in to comment.