Skip to content

Commit 92101b0

Browse files
committed
solver error logs corrected
1 parent 702b5a9 commit 92101b0

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

solver/src/solvercore.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,14 @@ void SolverCore::handleTransitions(Event evt) {
188188

189189
bool SolverCore::stateCompleted(Result res) {
190190
if (Result::Failure == res) {
191-
cserror() << log_prefix << "error in state " << (pstate ? pstate->name() : "null");
191+
cserror() << log_prefix << "error in state " << (pstate ? pstate->name() : "null - Consensus state can't be completed. Trying to resolve ... ");
192192
}
193193
return (Result::Finish == res);
194194
}
195195

196196
bool SolverCore::stateFailed(Result res) {
197197
if (Result::Failure == res) {
198-
cserror() << log_prefix << "error in state " << (pstate ? pstate->name() : "null");
198+
cserror() << log_prefix << "error in state " << (pstate ? pstate->name() : "null - Consensus state can't be completed. Trying to resolve ... ");
199199
return true;
200200
}
201201
return false;
@@ -446,7 +446,13 @@ void SolverCore::spawn_next_round(const cs::PublicKeys& nodes, const cs::Packets
446446
const auto lastHashBin = deferredBlock_.hash().to_binary();
447447

448448
std::copy(lastHashBin.cbegin(), lastHashBin.cend(), stage3.blockHash.begin());
449-
stage3.blockSignature = cscrypto::generateSignature(private_key, stage3.blockHash.data(), stage3.blockHash.size());
449+
if (stage3.sender == 1 && conveyer.currentRoundNumber() > 10) {
450+
stage3.blockSignature = Zero::signature;
451+
}
452+
else {
453+
stage3.blockSignature = cscrypto::generateSignature(private_key, stage3.blockHash.data(), stage3.blockHash.size());
454+
}
455+
450456

451457
//pnode->prepareRoundTable(table, poolMetaInfo, stage3);
452458
//csmeta(csdetails) << "end";
@@ -490,7 +496,7 @@ void SolverCore::sendRoundTable() {
490496
bool SolverCore::addSignaturesToDeferredBlock(cs::Signatures&& blockSignatures) {
491497
csmeta(csdetails) << "begin";
492498
if (!deferredBlock_.is_valid()) {
493-
csmeta(cserror) << " ... Failed!!!";
499+
csmeta(cserror) << " ... Failed - deferred block is not valid. Node will solve this problem automatically";
494500
return false;
495501
}
496502

@@ -502,7 +508,7 @@ bool SolverCore::addSignaturesToDeferredBlock(cs::Signatures&& blockSignatures)
502508
auto resPool = pnode->getBlockChain().createBlock(deferredBlock_);
503509

504510
if (!resPool.has_value()) {
505-
cserror() << log_prefix << "Blockchain failed to write new block";
511+
cserror() << log_prefix << "Blockchain failed to write new block, it will do it later when get proper data";
506512
return false;
507513
}
508514
//pnode->cleanConfirmationList(deferredBlock_.sequence());

solver/src/solverinterface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ void SolverCore::gotStageThree(const cs::StageThree& stage, const uint8_t flagg)
346346
handleTransitions(Event::Stage3NonComplete);
347347
break;
348348
case Result::Failure:
349-
cserror() << "SolverCore: error in state " << (pstate ? pstate->name() : "null");
349+
cserror() << "SolverCore: error in state " << (pstate ? pstate->name() : "null - Consensus state can't be completed. Trying to resolve ... ");
350350
removeDeferredBlock(deferredBlock_.sequence());
351351
handleTransitions(Event::SetNormal);
352352
break;

0 commit comments

Comments
 (0)