diff --git a/.testnet/scenarios/perf/ce_export_latency_probe.py b/.testnet/scenarios/perf/ce_export_latency_probe.py index 554517357..1c8602dc2 100644 --- a/.testnet/scenarios/perf/ce_export_latency_probe.py +++ b/.testnet/scenarios/perf/ce_export_latency_probe.py @@ -109,7 +109,6 @@ def _summarize_logs(ctx, log, *, label, started, ended): "rng_fallback": r"tier=1", "rng_participant_aligned": r"tier=2", "rng_validator_quorum": r"tier=3", - "export_retry": r"terRETRY_EXPORT", "export_quorum_timeout": r"Export: exportSigSet quorum alignment timeout", "export_missing_observation_ignored": ( r"Export: missing exportSigSetHash observation ignored" diff --git a/include/xrpl/protocol/TER.h b/include/xrpl/protocol/TER.h index 0095b4ab5..1caf5afeb 100644 --- a/include/xrpl/protocol/TER.h +++ b/include/xrpl/protocol/TER.h @@ -237,10 +237,8 @@ enum TERcodes : TERUnderlyingType { terQUEUED, // Transaction is being held in TxQ until fee drops terPRE_TICKET, // Ticket is not yet in ledger but might be on its way terNO_AMM, // AMM doesn't exist for the asset pair - terNO_HOOK, // Transaction requires a non-existent hook definition + terNO_HOOK // Transaction requires a non-existent hook definition // (referenced by sfHookHash) - terRETRY_EXPORT // Export does not yet have enough validator signatures. - // Retained in retriable set for next ledger. }; //------------------------------------------------------------------------------ diff --git a/src/libxrpl/protocol/TER.cpp b/src/libxrpl/protocol/TER.cpp index 7d585d5dd..38b24b0ff 100644 --- a/src/libxrpl/protocol/TER.cpp +++ b/src/libxrpl/protocol/TER.cpp @@ -241,7 +241,6 @@ transResults() MAKE_ERROR(terPRE_TICKET, "Ticket is not yet in ledger."), MAKE_ERROR(terNO_HOOK, "No hook with that hash exists on the ledger."), MAKE_ERROR(terNO_AMM, "AMM doesn't exist for the asset pair."), - MAKE_ERROR(terRETRY_EXPORT, "Export awaiting validator signatures."), MAKE_ERROR(tesSUCCESS, "The transaction was applied. Only final in a validated ledger."), MAKE_ERROR(tesPARTIAL, "The transaction was applied but should be submitted again until returning tesSUCCESS."), diff --git a/src/xrpld/app/misc/NetworkOPs.cpp b/src/xrpld/app/misc/NetworkOPs.cpp index 0d3cffbc4..c66e04a33 100644 --- a/src/xrpld/app/misc/NetworkOPs.cpp +++ b/src/xrpld/app/misc/NetworkOPs.cpp @@ -1540,7 +1540,7 @@ NetworkOPsImp::apply(std::unique_lock& batchLock) if ((e.applied || ((mMode != OperatingMode::FULL) && (e.failType != FailHard::yes) && e.local) || - (e.result == terQUEUED) || (e.result == terRETRY_EXPORT)) && + (e.result == terQUEUED)) && !enforceFailHard) { auto const toSkip = @@ -1559,8 +1559,7 @@ NetworkOPsImp::apply(std::unique_lock& batchLock) tx.set_status(protocol::tsCURRENT); tx.set_receivetimestamp( app_.timeKeeper().now().time_since_epoch().count()); - tx.set_deferred( - e.result == terQUEUED || e.result == terRETRY_EXPORT); + tx.set_deferred(e.result == terQUEUED); // FIXME: This should be when we received it app_.overlay().relay(e.transaction->getID(), tx, *toSkip); e.transaction->setBroadcast();