ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up jtx:

Browse Source 
* Tidy declaration order
* Remove AccountInfo
* Remove Env autofill settings
This commit is contained in:
Vinnie Falco
2015-06-13 07:38:07 -07:00
committed by Nik Bougalis
parent 9dd08e4dab
commit eb709f415b
10 changed files with 53 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/ripple/test/jtx/impl/Env.cpp
View File

@@ -67,16 +67,6 @@ Env::memoize (Account const& account)
map_.emplace(account.id(), account);
}
Account const&
Env::lookup (std::string const& base58ID) const
{
RippleAddress ra;
if (! ra.setAccountID(base58ID))
throw std::runtime_error(
"Env::lookup: invalid account ID");
return lookup(ra.getAccountID());
}
Account const&
Env::lookup (AccountID const& id) const
{
@@ -87,6 +77,16 @@ Env::lookup (AccountID const& id) const
return iter->second;
}
Account const&
Env::lookup (std::string const& base58ID) const
{
RippleAddress ra;
if (! ra.setAccountID(base58ID))
throw std::runtime_error(
"Env::lookup: invalid account ID");
return lookup(ra.getAccountID());
}
PrettyAmount
Env::balance (Account const& account) const
{
@@ -130,24 +130,14 @@ Env::seq (Account const& account) const
std::shared_ptr<SLE const>
Env::le (Account const& account) const
{
// VFALCO NOTE This hack should be removed
// when fetch returns shared_ptr again
auto const st = ledger->fetch(
return ledger->fetch(
getAccountRootIndex(account.id()));
if (! st)
return nullptr;
return std::make_shared<SLE const>(*st);
}
std::shared_ptr<SLE const>
Env::le (uint256 const& key) const
{
// VFALCO NOTE This hack should be removed
// when fetch returns shared_ptr again
auto const st = ledger->fetch(key);
if (! st)
return nullptr;
return std::make_shared<SLE const>(*st);
return ledger->fetch(key);
}
void
@@ -229,21 +219,13 @@ void
Env::autofill_sig (JTx& jt)
{
auto& jv = jt.jv;
auto const should = [](boost::tribool v, bool b)
{
if (boost::indeterminate(v))
return b;
return bool(v);
};
if (jt.signer)
jt.signer(*this, jt);
else if(should(jt.fill_sig, fill_sig_))
else if(jt.fill_sig)
{
auto const account =
lookup(jv[jss::Account].asString());
auto const ar =
ledger->fetch(getAccountRootIndex(account));
auto const ar = le(account);
if (ar->isFieldPresent(sfRegularKey))
jtx::sign(jv, lookup(
ar->getFieldAccount160(sfRegularKey)));
@@ -256,19 +238,10 @@ void
Env::autofill (JTx& jt)
{
auto& jv = jt.jv;
auto const should = [](boost::tribool v, bool b)
{
if (boost::indeterminate(v))
return b;
return bool(v);
};
if(should(jt.fill_fee, fill_fee_))
if(jt.fill_fee)
jtx::fill_fee(jv, *ledger);
if(should(jt.fill_seq, fill_seq_))
if(jt.fill_seq)
jtx::fill_seq(jv, *ledger);
// Must come last
autofill_sig(jt);
}