Revert "Merge pull request #1426 from chaosma/master"

This reverts commit 1a8ebafab4, reversing
changes made to 201a50f642.
pull/1464/head
Eugene Kim 5 years ago
parent 44715b0155
commit 69e51f6787
  1. 1
      node/node_handler.go
  2. 3
      node/node_newblock.go

@ -336,7 +336,6 @@ func (node *Node) VerifyNewBlock(newBlock *types.Block) error {
if node.NodeConfig.ShardID == 0 {
err := node.VerifyBlockCrossLinks(newBlock)
if err != nil {
utils.Logger().Debug().Err(err).Msg("ops2 VerifyBlockCrossLinks Failed")
return err
}
}

@ -103,11 +103,8 @@ func (node *Node) WaitForConsensusReadyv2(readySignal chan struct{}, stopChan ch
Uint64("blockNum", newBlock.NumberU64()).
Int("numCrossLinks", len(crossLinksToPropose)).
Msg("Successfully added cross links into new block")
} else {
utils.Logger().Debug().Err(localErr).Msg("ops0 ProposeCrossLinkDataForBeaconchain Failed")
}
} else {
utils.Logger().Debug().Err(localErr).Msg("ops1 ProposeCrossLinkDataForBeaconchain Failed")
newBlock, err = node.Worker.Commit(sig, mask, viewID, coinbase)
}
} else {

Loading…
Cancel
Save