More wip

node/impl/full.go

@@ -5,11 +5,11 @@ import (
 	"time"
 
 	logging "github.com/ipfs/go-log/v2"
-	consensus "github.com/libp2p/go-libp2p-consensus"
 	"github.com/libp2p/go-libp2p/core/peer"
 
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/build"
+	consensus2 "github.com/filecoin-project/lotus/lib/consensus/raft"
 	"github.com/filecoin-project/lotus/node/impl/client"
 	"github.com/filecoin-project/lotus/node/impl/common"
 	"github.com/filecoin-project/lotus/node/impl/full"
@@ -35,6 +35,7 @@ type FullNodeAPI struct {
 	full.MsigAPI
 	full.WalletAPI
 	full.SyncAPI
+	full.RaftAPI
 
 	DS          dtypes.MetadataDS
 	NetworkName dtypes.NetworkName
@@ -118,8 +119,12 @@ func (n *FullNodeAPI) NodeStatus(ctx context.Context, inclChainStatus bool) (sta
 	return status, nil
 }
 
-func (n *FullNodeAPI) RaftState(ctx context.Context) (consensus.State, error) {
-	return n.MpoolAPI.GetRaftState(ctx)
+func (n *FullNodeAPI) RaftState(ctx context.Context) (*consensus2.RaftState, error) {
+	return n.RaftAPI.GetRaftState(ctx)
+}
+
+func (n *FullNodeAPI) RaftLeader(ctx context.Context) (peer.ID, error) {
+	return n.RaftAPI.Leader(ctx)
 }
 
 var _ api.FullNode = &FullNodeAPI{}

node/impl/full/mpool.go

@@ -5,8 +5,6 @@ import (
 	"encoding/json"
 
 	"github.com/ipfs/go-cid"
-	consensus "github.com/libp2p/go-libp2p-consensus"
-	"github.com/libp2p/go-libp2p/core/peer"
 	"go.uber.org/fx"
 	"golang.org/x/xerrors"
 
@@ -46,6 +44,8 @@ type MpoolAPI struct {
 
 	GasAPI
 
+	RaftAPI
+
 	MessageSigner messagesigner.MsgSigner
 	//	MessageSigner *messagesigner.MessageSigner
 
@@ -147,9 +147,9 @@ func (a *MpoolAPI) MpoolPushMessage(ctx context.Context, msg *types.Message, spe
 	inMsg := *msg
 
 	// Redirect to leader if current node is not leader. A single non raft based node is always the leader
-	if !a.MessageSigner.IsLeader(ctx) {
+	if !a.RaftAPI.IsLeader(ctx) {
 		var signedMsg types.SignedMessage
-		redirected, err := a.MessageSigner.RedirectToLeader(ctx, "MpoolPushMessage", api.MpoolMessageWhole{Msg: msg, Spec: spec}, &signedMsg)
+		redirected, err := a.RaftAPI.RedirectToLeader(ctx, "MpoolPushMessage", api.MpoolMessageWhole{Msg: msg, Spec: spec}, &signedMsg)
 		if err != nil {
 			return nil, err
 		}
@@ -290,10 +290,11 @@ func (a *MpoolAPI) MpoolSub(ctx context.Context) (<-chan api.MpoolUpdate, error)
 	return a.Mpool.Updates(ctx)
 }
 
-func (a *MpoolAPI) GetRaftState(ctx context.Context) (consensus.State, error) {
-	return a.MessageSigner.GetRaftState(ctx)
-}
-
-func (a *MpoolAPI) RaftLeader(ctx context.Context) (peer.ID, error) {
-	return a.MessageSigner.Leader(ctx)
-}
+//func (a *MpoolAPI) GetRaftState(ctx context.Context) (consensus.RaftState, error) {
+//	state, err := a.MessageSigner.GetRaftState(ctx)
+//	raftState := state.()
+//}
+//
+//func (a *MpoolAPI) RaftLeader(ctx context.Context) (peer.ID, error) {
+//	return a.MessageSigner.Leader(ctx)
+//}

node/impl/full/raft.go

@@ -0,0 +1,46 @@
+package full
+
+import (
+	"context"
+
+	"github.com/libp2p/go-libp2p/core/peer"
+	"go.uber.org/fx"
+	"golang.org/x/xerrors"
+
+	"github.com/filecoin-project/lotus/chain/messagesigner"
+	consensus "github.com/filecoin-project/lotus/lib/consensus/raft"
+)
+
+type RaftAPI struct {
+	fx.In
+
+	MessageSigner *messagesigner.MessageSignerConsensus `optional:"true"`
+}
+
+func (r *RaftAPI) GetRaftState(ctx context.Context) (*consensus.RaftState, error) {
+	if r.MessageSigner == nil {
+		return nil, xerrors.Errorf("Raft consensus not enabled. Please check your configuration")
+	}
+	return r.MessageSigner.GetRaftState(ctx)
+}
+
+func (r *RaftAPI) Leader(ctx context.Context) (peer.ID, error) {
+	if r.MessageSigner == nil {
+		return "", xerrors.Errorf("Raft consensus not enabled. Please check your configuration")
+	}
+	return r.MessageSigner.Leader(ctx)
+}
+
+func (r *RaftAPI) IsLeader(ctx context.Context) bool {
+	if r.MessageSigner == nil {
+		return true
+	}
+	return r.MessageSigner.IsLeader(ctx)
+}
+
+func (r *RaftAPI) RedirectToLeader(ctx context.Context, method string, arg interface{}, ret interface{}) (bool, error) {
+	if r.MessageSigner == nil {
+		return false, xerrors.Errorf("Raft consensus not enabled. Please check your configuration")
+	}
+	return r.MessageSigner.RedirectToLeader(ctx, method, arg, ret)
+}