Skip to content

Commit

Permalink
Hand Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
factom-clay committed Aug 29, 2018
1 parent c01f76b commit e70c301
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions state/processList.go
Original file line number Diff line number Diff line change
Expand Up @@ -901,16 +901,14 @@ func (p *ProcessList) Process(state *State) (progress bool) {
VMListLoop:
for j := vm.Height; j < len(vm.List); j++ {
state.processCnt++
if state.DebugExec() {
x := p.decodeState(state.Syncing, state.DBSig, state.EOM, state.DBSigDone, state.EOMDone,
len(state.LeaderPL.FedServers), state.EOMProcessed, state.DBSigProcessed)

// Compute a syncing state string and report if it has changed
if state.SyncingState[state.SyncingStateCurrent] != x {
state.LogPrintf("processStatus", x)
state.SyncingStateCurrent = (state.SyncingStateCurrent + 1) % len(state.SyncingState)
state.SyncingState[state.SyncingStateCurrent] = x
}
x := p.decodeState(state.Syncing, state.DBSig, state.EOM, state.DBSigDone, state.EOMDone,
len(state.LeaderPL.FedServers), state.EOMProcessed, state.DBSigProcessed)

// Compute a syncing state string and report if it has changed
if state.SyncingState[state.SyncingStateCurrent] != x {
state.LogPrintf("processStatus", x)
state.SyncingStateCurrent = (state.SyncingStateCurrent + 1) % len(state.SyncingState)
state.SyncingState[state.SyncingStateCurrent] = x
}
if vm.List[j] == nil {
//p.State.AddStatus(fmt.Sprintf("ProcessList.go Process: Found nil list at vm %d vm height %d ", i, j))
Expand Down

0 comments on commit e70c301

Please sign in to comment.