diff --git a/src/cpp/ripple/CallRPC.cpp b/src/cpp/ripple/CallRPC.cpp index e78b7c06c3..4b5b468164 100644 --- a/src/cpp/ripple/CallRPC.cpp +++ b/src/cpp/ripple/CallRPC.cpp @@ -439,7 +439,6 @@ Json::Value RPCParser::parseCommand(std::string strMethod, Json::Value jvParams) // { "ripple_path_find", &RPCParser::parseRipplePathFind, -1, -1 }, { "submit", &RPCParser::parseSubmit, 2, 2 }, { "server_info", &RPCParser::parseAsIs, 0, 0 }, - { "ledger_okay", &RPCParser::parseAsIs, 0, 0 }, { "stop", &RPCParser::parseAsIs, 0, 0 }, // { "transaction_entry", &RPCParser::parseTransactionEntry, -1, -1 }, { "tx", &RPCParser::parseTx, 1, 1 }, diff --git a/src/cpp/ripple/LedgerMaster.cpp b/src/cpp/ripple/LedgerMaster.cpp index d0d4cd5cb3..0a139c7ca9 100644 --- a/src/cpp/ripple/LedgerMaster.cpp +++ b/src/cpp/ripple/LedgerMaster.cpp @@ -338,6 +338,8 @@ void LedgerMaster::checkPublish(const uint256& hash, uint32 seq) if (theConfig.RUN_STANDALONE) minVal = 0; + else if (theApp->getOPs().isNeedNetworkLedger()) + minVal = 1; cLog(lsTRACE) << "Sweeping for ledgers to publish: minval=" << minVal; @@ -347,6 +349,7 @@ void LedgerMaster::checkPublish(const uint256& hash, uint32 seq) Ledger::pointer ledger = mLedgerHistory.getLedgerBySeq(seq); if (ledger && (theApp->getValidations().getTrustedValidationCount(ledger->getHash()) >= minVal)) { // this ledger (and any priors) can be published + theApp->getOPs().clearNeedNetworkLedger(); if (ledger->getLedgerSeq() > (mLastValidateSeq + MAX_LEDGER_GAP)) mLastValidateSeq = ledger->getLedgerSeq() - MAX_LEDGER_GAP; diff --git a/src/cpp/ripple/RPCHandler.cpp b/src/cpp/ripple/RPCHandler.cpp index 7bc3d1783f..30d5de75f7 100644 --- a/src/cpp/ripple/RPCHandler.cpp +++ b/src/cpp/ripple/RPCHandler.cpp @@ -1160,16 +1160,6 @@ Json::Value RPCHandler::doSubmit(Json::Value jvRequest) } } -Json::Value RPCHandler::doLedgerOkay(Json::Value) -{ - theApp->getOPs().clearNeedNetworkLedger(); - Json::Value ret(Json::objectValue); - - ret["okay"] = true; - - return ret; -} - Json::Value RPCHandler::doServerInfo(Json::Value) { Json::Value ret(Json::objectValue); @@ -2457,7 +2447,6 @@ Json::Value RPCHandler::doCommand(Json::Value& jvRequest, int iRole) { "ripple_path_find", &RPCHandler::doRipplePathFind, false, optCurrent }, { "submit", &RPCHandler::doSubmit, false, optCurrent }, { "server_info", &RPCHandler::doServerInfo, true, optNone }, - { "ledger_okay", &RPCHandler::doLedgerOkay, true, optNone }, { "stop", &RPCHandler::doStop, true, optNone }, { "transaction_entry", &RPCHandler::doTransactionEntry, false, optCurrent }, { "tx", &RPCHandler::doTx, false, optNetwork }, diff --git a/src/cpp/ripple/RPCHandler.h b/src/cpp/ripple/RPCHandler.h index 5d4fe29da4..a5650a2145 100644 --- a/src/cpp/ripple/RPCHandler.h +++ b/src/cpp/ripple/RPCHandler.h @@ -90,7 +90,6 @@ class RPCHandler Json::Value doSubscribe(Json::Value params); Json::Value doUnsubscribe(Json::Value params); - Json::Value doLedgerOkay(Json::Value params); public: