ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-04-29 15:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes need after rebase onto 1.9.0-b1

Browse Source
This commit is contained in:
seelabs
2022-03-15 17:35:06 -04:00
parent 79c583e1f7
commit 57b9da62bd
7 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ripple/app/main/Application.cpp
View File

@@ -1175,7 +1175,7 @@ public:
getInboundLedgers().sweep();
getLedgerReplayer().sweep();
m_acceptedLedgerCache.sweep();
cachedSLEs_.expire();
cachedSLEs_.sweep();
if (sidechainFederator_)
sidechainFederator_->sweep();

2
src/ripple/app/sidechain/Federator.cpp
View File

@@ -959,7 +959,7 @@ Federator::payTxn(
seq,
signingPK = signingPK_,
signingSK = signingSK_,
j = j_](Job&) mutable {
j = j_]() mutable {
auto const txnJson = detail::getTxn(
thisChainSrcAccount, dstAccount, amt, seq, std::move(memos));

1
src/ripple/app/sidechain/FederatorEvents.h
View File

@@ -26,7 +26,6 @@
#include <ripple/protocol/Issue.h>
#include <ripple/protocol/STAmount.h>
#include <ripple/protocol/TER.h>
#include <beast/utility/Journal.h>
#include <boost/format.hpp>

2
src/ripple/app/sidechain/impl/SidechainListener.cpp
View File

@@ -82,7 +82,7 @@ SidechainListener::send(
RpcCallback onResponse)
{
std::weak_ptr<SidechainListener> selfWeak = shared_from_this();
auto job = [cmd, params, onResponse, selfWeak](Job&) {
auto job = [cmd, params, onResponse, selfWeak]() {
auto self = selfWeak.lock();
if (!self)
return;

2
src/ripple/app/sidechain/impl/SignatureCollector.cpp
View File

@@ -80,7 +80,7 @@ SignatureCollector::signAndSubmit(Json::Value const& txJson)
chain =
isMainChain_ ? Federator::mainChain : Federator::sideChain,
f = federator_.weak_from_this(),
j = j_](Job&) mutable {
j = j_]() mutable {
auto federator = f.lock();
if (!federator)
return;

7
src/ripple/core/JobTypes.h
View File

@@ -91,12 +91,7 @@ private:
add(jtTRANSACTION, "transaction", maxLimit, 250ms, 1000ms);
add(jtBATCH, "batch", maxLimit, 250ms, 1000ms);
// TODO chose ave latency and peak latency numbers
add(jtFEDERATORSIGNATURE,
"federatorSignature",
maxLimit,
false,
250ms,
1000ms);
add(jtFEDERATORSIGNATURE, "federatorSignature", maxLimit, 250ms, 1000ms);
add(jtADVANCE, "advanceLedger", maxLimit, 0ms, 0ms);
add(jtPUBLEDGER, "publishNewLedger", maxLimit, 3000ms, 4500ms);
add(jtTXN_DATA, "fetchTxnData", 5, 0ms, 0ms);

6
src/ripple/overlay/impl/PeerImp.cpp
View File

@@ -40,13 +40,13 @@
#include <ripple/overlay/impl/PeerImp.h>
#include <ripple/overlay/impl/Tuning.h>
#include <ripple/overlay/predicates.h>
#include <ripple/protocol/SField.h>
#include <ripple/protocol/digest.h>
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/beast/core/ostream.hpp>
#include "protocol/SField.h"
#include <algorithm>
#include <memory>
#include <mutex>
@@ -3106,7 +3106,7 @@ PeerImp::onMessage(
seq,
m,
j = sidechainJ,
sig = std::move(sig)](Job&) mutable {
sig = std::move(sig)]() mutable {
auto& hashRouter = self->app_.getHashRouter();
if (auto const toSkip = hashRouter.shouldRelay(suppression))
{
@@ -3229,7 +3229,7 @@ PeerImp::onMessage(
m,
j = sidechainJ,
chain = *dstChain,
sig = std::move(sig)](Job&) mutable {
sig = std::move(sig)]() mutable {
auto& hashRouter = self->app_.getHashRouter();
if (auto const toSkip = hashRouter.shouldRelay(suppression))
{