diff --git a/src/ripple/app/ledger/Ledger.h b/src/ripple/app/ledger/Ledger.h index f237d1b681..0d0ea50529 100644 --- a/src/ripple/app/ledger/Ledger.h +++ b/src/ripple/app/ledger/Ledger.h @@ -410,17 +410,6 @@ std::pair> deserializeTxPlusMeta (SHAMapItem const& item); -// DEPRECATED -inline -std::shared_ptr -cachedRead (ReadView const& ledger, uint256 const& key, - boost::optional type = boost::none) -{ - if (type) - return ledger.read(Keylet(*type, key)); - return ledger.read(keylet::unchecked(key)); -} - } // ripple #endif diff --git a/src/ripple/app/ledger/impl/LocalTxs.cpp b/src/ripple/app/ledger/impl/LocalTxs.cpp index d9c000e944..67c77e7010 100644 --- a/src/ripple/app/ledger/impl/LocalTxs.cpp +++ b/src/ripple/app/ledger/impl/LocalTxs.cpp @@ -150,8 +150,9 @@ public: return true; if (view.txExists(txn.getID())) return true; - auto const sle = cachedRead(view, - keylet::account(txn.getAccount()).key, ltACCOUNT_ROOT); + + std::shared_ptr sle = view.read( + keylet::account(txn.getAccount())); if (! sle) return false; return sle->getFieldU32 (sfSequence) > txn.getSeq (); diff --git a/src/ripple/rpc/impl/TransactionSign.cpp b/src/ripple/rpc/impl/TransactionSign.cpp index 3faec9c148..2362964019 100644 --- a/src/ripple/rpc/impl/TransactionSign.cpp +++ b/src/ripple/rpc/impl/TransactionSign.cpp @@ -374,8 +374,8 @@ transactionPreProcessImpl ( if (!verify && !tx_json.isMember (jss::Sequence)) return RPC::missing_field_error ("tx_json.Sequence"); - std::shared_ptr sle = cachedRead(*ledger, - keylet::account(srcAddressID).key, ltACCOUNT_ROOT); + std::shared_ptr sle = ledger->read( + keylet::account(srcAddressID)); if (verify && !sle) { @@ -981,12 +981,11 @@ Json::Value transactionSignFor ( return preprocResult.first; { + std::shared_ptr account_state = ledger->read( + keylet::account(*signerAccountID)); // Make sure the account and secret belong together. auto const err = acctMatchesPubKey ( - cachedRead( - *ledger, - keylet::account(*signerAccountID).key, - ltACCOUNT_ROOT), + account_state, *signerAccountID, multiSignPubKey); @@ -1060,8 +1059,8 @@ Json::Value transactionSubmitMultiSigned ( auto const srcAddressID = txJsonResult.second; - std::shared_ptr sle = cachedRead(*ledger, - keylet::account(srcAddressID).key, ltACCOUNT_ROOT); + std::shared_ptr sle = ledger->read( + keylet::account(srcAddressID)); if (!sle) {