fix: comments from review

core/blockchain.go

@@ -597,15 +597,10 @@ func (bc *BlockChain) State() (*state.StateDB, *state.StateDB, error) {
 
 // StateAt returns a new mutable state based on a particular point in time.
 func (bc *BlockChain) StateAt(root common.Hash) (*state.StateDB, *state.StateDB, error) {
-	publicStateDb, publicStateDbErr := state.New(root, bc.stateCache, bc.snaps)
-	if publicStateDbErr != nil {
-		return nil, nil, publicStateDbErr
-	}
-	privateStateDb, privateStateDbErr := state.New(rawdb.GetPrivateStateRoot(bc.db, root), bc.privateStateCache, nil)
-	if privateStateDbErr != nil {
-		return nil, nil, privateStateDbErr
+	publicStateDb, privateStateDb, err := state.NewDual(root, bc.stateCache, bc.snaps, bc.db, bc.privateStateCache, nil)
+	if err != nil {
+		return nil, nil, err
 	}
-
 	return publicStateDb, privateStateDb, nil
 }
 

core/state/statedb.go

@@ -24,13 +24,12 @@ import (
 	"sort"
 	"time"
 
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/ethdb"
-
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/core/state/snapshot"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/rlp"
@@ -163,16 +162,16 @@ func New(root common.Hash, db Database, snaps *snapshot.Tree) (*StateDB, error)
 
 // Quorum
 // NewDual - Create a public and private state from a given public and private tree
-func NewDual(root common.Hash, db Database, snaps *snapshot.Tree, ethDb ethdb.Database, privateDb Database, privateSnaps *snapshot.Tree) (*StateDB, *StateDB, error) {
-	publicState, err := New(root, db, snaps)
+func NewDual(root common.Hash, db Database, snaps *snapshot.Tree, ethDb ethdb.Database, privateDb Database, privateSnaps *snapshot.Tree) (state, privateState *StateDB, err error) {
+	state, err = New(root, db, snaps)
 	if err != nil {
 		return nil, nil, err
 	}
-	privateState, err := New(rawdb.GetPrivateStateRoot(ethDb, root), privateDb, privateSnaps)
+	privateState, err = New(rawdb.GetPrivateStateRoot(ethDb, root), privateDb, privateSnaps)
 	if err != nil {
 		return nil, nil, err
 	}
-	return publicState, privateState, nil
+	return state, privateState, nil
 }
 
 // setError remembers the first non-nil error it is called with.

node/endpoints.go

@@ -24,9 +24,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/ethereum/go-ethereum/plugin/security"
-
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/plugin/security"
 	"github.com/ethereum/go-ethereum/rpc"
 )
 

node/node_test.go

@@ -25,12 +25,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/plugin"
-
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/p2p"
+	"github.com/ethereum/go-ethereum/plugin"
 	"github.com/ethereum/go-ethereum/rpc"
-
 	"github.com/stretchr/testify/assert"
 )