chore: resolve nil pointer

ChainSafe · Sep 30, 2021 · 12f7675 · 12f7675
1 parent 1740d97
commit 12f7675
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/dot/rpc/modules/chain_test.go b/dot/rpc/modules/chain_test.go
@@ -332,6 +332,7 @@ func newTestStateService(t *testing.T) *state.Service {
 	stateSrvc.UseMemDB()
 
 	gen, genTrie, genesisHeader := genesis.NewTestGenesisWithTrieAndHeader(t)
+
 	err = stateSrvc.Initialise(gen, genesisHeader, genTrie)
 	require.NoError(t, err)
 

diff --git a/dot/rpc/modules/childstate.go b/dot/rpc/modules/childstate.go
@@ -52,11 +52,15 @@ func NewChildStateModule(s StorageAPI, b BlockAPI) *ChildStateModule {
 
 // GetKeys returns the keys from the specified child storage. The keys can also be filtered based on a prefix.
 func (cs *ChildStateModule) GetKeys(_ *http.Request, req *GetKeysRequest, res *[]string) error {
+	var hash common.Hash
+
 	if req.Hash == nil {
-		*req.Hash = cs.blockAPI.BestBlockHash()
+		hash = cs.blockAPI.BestBlockHash()
+	} else {
+		hash = *req.Hash
 	}
 
-	stateRoot, err := cs.storageAPI.GetStateRootFromBlock(req.Hash)
+	stateRoot, err := cs.storageAPI.GetStateRootFromBlock(&hash)
 	if err != nil {
 		return err
 	}
@@ -78,11 +82,15 @@ func (cs *ChildStateModule) GetKeys(_ *http.Request, req *GetKeysRequest, res *[
 
 // GetStorageHash returns the hash of a child storage entry
 func (cs *ChildStateModule) GetStorageHash(_ *http.Request, req *GetStorageHash, res *string) error {
+	var hash common.Hash
+
 	if req.Hash == nil {
-		*req.Hash = cs.blockAPI.BestBlockHash()
+		hash = cs.blockAPI.BestBlockHash()
+	} else {
+		hash = *req.Hash
 	}
 
-	stateRoot, err := cs.storageAPI.GetStateRootFromBlock(req.Hash)
+	stateRoot, err := cs.storageAPI.GetStateRootFromBlock(&hash)
 	if err != nil {
 		return err
 	}