fix cmd

Author: zhangchiqing

cmd/consensus/main.go

@@ -621,7 +621,7 @@ func main() {
 			notifier.AddFollowerConsumer(followerDistributor)
 
 			// initialize the persister
-			persist, err := persister.New(node.ProtocolDB, node.RootChainID)
+			persist, err := persister.New(node.ProtocolDB, node.RootChainID, node.StorageLockMgr)
 			if err != nil {
 				return nil, err
 			}

cmd/util/cmd/read-hotstuff/cmd/get_liveness.go

@@ -22,8 +22,10 @@ func init() {
 
 func runGetLivenessData(*cobra.Command, []string) {
 	err := common.WithStorage(flagDatadir, func(db storage.DB) error {
+		lockManager := storage.NewTestingLockManager()
+
 		chainID := flow.ChainID(flagChain)
-		reader, err := persister.NewReader(db, chainID)
+		reader, err := persister.NewReader(db, chainID, lockManager)
 		if err != nil {
 			log.Fatal().Err(err).Msg("could not create reader from db")
 		}

cmd/util/cmd/read-hotstuff/cmd/get_safety.go

@@ -22,9 +22,10 @@ func init() {
 
 func runGetSafetyData(*cobra.Command, []string) {
 	err := common.WithStorage(flagDatadir, func(db storage.DB) error {
+		lockManager := storage.NewTestingLockManager()
 
 		chainID := flow.ChainID(flagChain)
-		reader, err := persister.NewReader(db, chainID)
+		reader, err := persister.NewReader(db, chainID, lockManager)
 		if err != nil {
 			log.Fatal().Err(err).Msg("could not create reader from db")
 		}

consensus/hotstuff/persister/persister.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/jordanschalm/lockctx"
+
 	"github.com/onflow/flow-go/consensus/hotstuff"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/storage"

consensus/integration/nodes_test.go

@@ -563,7 +563,7 @@ func createNode(
 
 	signer := verification.NewCombinedSigner(me, beaconKeyStore)
 
-	persist, err := persister.New(db, rootHeader.ChainID)
+	persist, err := persister.New(db, rootHeader.ChainID, lockManager)
 	require.NoError(t, err)
 
 	livenessData, err := persist.GetLivenessData()

storage/operation/views.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/jordanschalm/lockctx"
+
 	"github.com/onflow/flow-go/consensus/hotstuff"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/storage"