Merge pull request #6973

be84f67 Switch to Dandelion++ fluff mode if no out connections for stem mode (Lee Clagett)
This commit is contained in:
luigi1111 2020-11-29 01:54:43 -06:00
commit c041550ffa
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 113 additions and 6 deletions

View file

@ -525,12 +525,7 @@ namespace levin
if (!zone_ || !core_ || txs_.empty())
return;
if (zone_->fluffing)
{
core_->on_transactions_relayed(epee::to_span(txs_), relay_method::fluff);
fluff_notify::run(std::move(zone_), epee::to_span(txs_), source_);
}
else // forward tx in stem
if (!zone_->fluffing)
{
core_->on_transactions_relayed(epee::to_span(txs_), relay_method::stem);
for (int tries = 2; 0 < tries; tries--)
@ -550,6 +545,9 @@ namespace levin
MERROR("Unable to send transaction(s) via Dandelion++ stem");
}
core_->on_transactions_relayed(epee::to_span(txs_), relay_method::fluff);
fluff_notify::run(std::move(zone_), epee::to_span(txs_), source_);
}
};