status-im
/
nim-raft
mirror of https://github.com/status-im/nim-raft.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix names etc.

This commit is contained in:
Raycho Mukelov 2023-11-05 07:23:07 +02:00
parent a288abb16f
commit 47bd7e88eb
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
raft/consensus_state_machine.nim
View File

@ -65,7 +65,7 @@ proc new*[RaftNodeState, EventType, NodeType, RaftNodeStates](
result.state = startSymbol result.state = startSymbol
debug "new: ", fsm=repr(result) debug "new: ", fsm=repr(result)
proc addFSMTransition*[RaftNodeState, EventType, NodeType, RaftMessageBase]( proc addFsmTransition*[RaftNodeState, EventType, NodeType, RaftMessageBase](
fsm: ConsensusFSM[RaftNodeState, EventType, NodeType, RaftMessageBase], fsm: ConsensusFSM[RaftNodeState, EventType, NodeType, RaftMessageBase],
fromState: RaftNodeState, fromState: RaftNodeState,
termSymb: TerminalSymbol[EventType, NodeType, RaftMessageBase], termSymb: TerminalSymbol[EventType, NodeType, RaftMessageBase],
@ -74,9 +74,9 @@ proc addFSMTransition*[RaftNodeState, EventType, NodeType, RaftMessageBase](
fsm.stateTransitionsLUT[(fromState.state, termSymb)] = (toState, action) fsm.stateTransitionsLUT[(fromState.state, termSymb)] = (toState, action)
proc computeFSMLogicFunctionsPermutationValu*[RaftNodeState, NodeType, EventType, RaftMessageBase]( proc computeFsmLogicFunctionsPermutationValuе*[RaftNodeState, NodeType, EventType, RaftMessageBase](
fsm: ConsensusFSM[RaftNodeState, EventType, NodeType, RaftMessageBase], fsm: ConsensusFSM[RaftNodeState, EventType, NodeType, RaftMessageBase],
nts: RaftNodeState, node: NodeType,
termSymb: TerminalSymbol, termSymb: TerminalSymbol,
msg: Option[RaftMessageBase]): TerminalSymbol = msg: Option[RaftMessageBase]): TerminalSymbol =
@ -92,23 +92,22 @@ proc computeFSMLogicFunctionsPermutationValu*[RaftNodeState, NodeType, EventType
debug "computeFSMLogicFunctionsPermutationValue: ", logicFunctionsConds=logicFunctionsConds debug "computeFSMLogicFunctionsPermutationValue: ", logicFunctionsConds=logicFunctionsConds
for f in logicFunctionsConds: for f in logicFunctionsConds:
logicFunctionsCondsValues.add f(nts, e, msg) logicFunctionsCondsValues.add f(node, msg)
debug "computeFSMLogicFunctionsPermutationValue: ", logicFunctionsCondsValues=logicFunctionsCondsValues debug "computeFSMLogicFunctionsPermutationValue: ", logicFunctionsCondsValues=logicFunctionsCondsValues
termSymb[1] = logicFunctionsConds termSymb[1] = logicFunctionsConds
result = termSymb result = termSymb
proc consensusFSMAdvance*[RaftNodeState, EventType, NodeType, RaftMessageBase]( proc fsmAdvance*[RaftNodeState, EventType, NodeType, RaftMessageBase](
fsm: ConsensusFSM[RaftNodeState, EventType, NodeType, RaftMessageBase], fsm: ConsensusFSM[RaftNodeState, EventType, NodeType, RaftMessageBase],
node: NodeType, node: NodeType,
event: EventType, termSymb: TerminalSymbol[EventType, NodeType, RaftMessageBase],
rawInput: TerminalSymbol[EventType, NodeType, RaftMessageBase],
msg: Option[RaftMessageBase]): RaftNodeState = msg: Option[RaftMessageBase]): RaftNodeState =
withRLock(): withRLock():
var var
input = computeFSMLogicFunctionsPermutationValue(fsm, node, event, rawInput) input = computeFsmLogicFunctionsPermutationValue(fsm, node, termSymb, msg)
let trans = fsm.stateTransitionsLUT[(fsm.state, input)] let trans = fsm.stateTransitionsLUT[(fsm.state, input)]
let action = trans[1] let action = trans[1]