Reformatting using AStyle

This commit is contained in:
Vinnie Falco
2013-06-14 08:45:13 -07:00
parent 36bd8f7173
commit 521e812fc4
294 changed files with 54609 additions and 47598 deletions

View File

@@ -1,175 +1,191 @@
DECLARE_INSTANCE(SerializedLedgerEntry)
DECLARE_INSTANCE (SerializedLedgerEntry)
// For logging
struct SerializedLedgerLog;
SETUP_LOG (SerializedLedgerLog)
SerializedLedgerEntry::SerializedLedgerEntry(SerializerIterator& sit, uint256 const& index)
: STObject(sfLedgerEntry), mIndex(index), mMutable(true)
SerializedLedgerEntry::SerializedLedgerEntry (SerializerIterator& sit, uint256 const& index)
: STObject (sfLedgerEntry), mIndex (index), mMutable (true)
{
set(sit);
uint16 type = getFieldU16(sfLedgerEntryType);
mFormat = LedgerEntryFormat::getLgrFormat(static_cast<LedgerEntryType>(type));
if (mFormat == NULL)
throw std::runtime_error("invalid ledger entry type");
mType = mFormat->t_type;
if (!setType(mFormat->elements))
throw std::runtime_error("ledger entry not valid for type");
set (sit);
uint16 type = getFieldU16 (sfLedgerEntryType);
mFormat = LedgerEntryFormat::getLgrFormat (static_cast<LedgerEntryType> (type));
if (mFormat == NULL)
throw std::runtime_error ("invalid ledger entry type");
mType = mFormat->t_type;
if (!setType (mFormat->elements))
throw std::runtime_error ("ledger entry not valid for type");
}
SerializedLedgerEntry::SerializedLedgerEntry(const Serializer& s, uint256 const& index)
: STObject(sfLedgerEntry), mIndex(index), mMutable(true)
SerializedLedgerEntry::SerializedLedgerEntry (const Serializer& s, uint256 const& index)
: STObject (sfLedgerEntry), mIndex (index), mMutable (true)
{
SerializerIterator sit(const_cast<Serializer&>(s)); // we know 's' isn't going away
set(sit);
SerializerIterator sit (const_cast<Serializer&> (s)); // we know 's' isn't going away
set (sit);
uint16 type = getFieldU16(sfLedgerEntryType);
mFormat = LedgerEntryFormat::getLgrFormat(static_cast<LedgerEntryType>(type));
if (mFormat == NULL)
throw std::runtime_error("invalid ledger entry type");
mType = mFormat->t_type;
if (!setType(mFormat->elements))
{
WriteLog (lsWARNING, SerializedLedgerLog) << "Ledger entry not valid for type " << mFormat->t_name;
WriteLog (lsWARNING, SerializedLedgerLog) << getJson(0);
throw std::runtime_error("ledger entry not valid for type");
}
uint16 type = getFieldU16 (sfLedgerEntryType);
mFormat = LedgerEntryFormat::getLgrFormat (static_cast<LedgerEntryType> (type));
if (mFormat == NULL)
throw std::runtime_error ("invalid ledger entry type");
mType = mFormat->t_type;
if (!setType (mFormat->elements))
{
WriteLog (lsWARNING, SerializedLedgerLog) << "Ledger entry not valid for type " << mFormat->t_name;
WriteLog (lsWARNING, SerializedLedgerLog) << getJson (0);
throw std::runtime_error ("ledger entry not valid for type");
}
}
SerializedLedgerEntry::SerializedLedgerEntry(LedgerEntryType type, uint256 const& index) :
STObject(sfLedgerEntry), mIndex(index), mType(type), mMutable(true)
SerializedLedgerEntry::SerializedLedgerEntry (LedgerEntryType type, uint256 const& index) :
STObject (sfLedgerEntry), mIndex (index), mType (type), mMutable (true)
{
mFormat = LedgerEntryFormat::getLgrFormat(type);
if (mFormat == NULL) throw std::runtime_error("invalid ledger entry type");
set(mFormat->elements);
setFieldU16(sfLedgerEntryType, static_cast<uint16>(mFormat->t_type));
mFormat = LedgerEntryFormat::getLgrFormat (type);
if (mFormat == NULL) throw std::runtime_error ("invalid ledger entry type");
set (mFormat->elements);
setFieldU16 (sfLedgerEntryType, static_cast<uint16> (mFormat->t_type));
}
SerializedLedgerEntry::pointer SerializedLedgerEntry::getMutable() const
SerializedLedgerEntry::pointer SerializedLedgerEntry::getMutable () const
{
SerializedLedgerEntry::pointer ret = boost::make_shared<SerializedLedgerEntry>(boost::cref(*this));
ret->mMutable = true;
return ret;
SerializedLedgerEntry::pointer ret = boost::make_shared<SerializedLedgerEntry> (boost::cref (*this));
ret->mMutable = true;
return ret;
}
std::string SerializedLedgerEntry::getFullText() const
std::string SerializedLedgerEntry::getFullText () const
{
std::string ret = "\"";
ret += mIndex.GetHex();
ret += "\" = { ";
ret += mFormat->t_name;
ret += ", ";
ret += STObject::getFullText();
ret += "}";
return ret;
std::string ret = "\"";
ret += mIndex.GetHex ();
ret += "\" = { ";
ret += mFormat->t_name;
ret += ", ";
ret += STObject::getFullText ();
ret += "}";
return ret;
}
std::string SerializedLedgerEntry::getText() const
std::string SerializedLedgerEntry::getText () const
{
return str(boost::format("{ %s, %s }")
% mIndex.GetHex()
% STObject::getText());
return str (boost::format ("{ %s, %s }")
% mIndex.GetHex ()
% STObject::getText ());
}
Json::Value SerializedLedgerEntry::getJson(int options) const
Json::Value SerializedLedgerEntry::getJson (int options) const
{
Json::Value ret(STObject::getJson(options));
Json::Value ret (STObject::getJson (options));
ret["index"] = mIndex.GetHex();
ret["index"] = mIndex.GetHex ();
return ret;
return ret;
}
bool SerializedLedgerEntry::isThreadedType()
bool SerializedLedgerEntry::isThreadedType ()
{
return getFieldIndex(sfPreviousTxnID) != -1;
return getFieldIndex (sfPreviousTxnID) != -1;
}
bool SerializedLedgerEntry::isThreaded()
bool SerializedLedgerEntry::isThreaded ()
{
return isFieldPresent(sfPreviousTxnID);
return isFieldPresent (sfPreviousTxnID);
}
uint256 SerializedLedgerEntry::getThreadedTransaction()
uint256 SerializedLedgerEntry::getThreadedTransaction ()
{
return getFieldH256(sfPreviousTxnID);
return getFieldH256 (sfPreviousTxnID);
}
uint32 SerializedLedgerEntry::getThreadedLedger()
uint32 SerializedLedgerEntry::getThreadedLedger ()
{
return getFieldU32(sfPreviousTxnLgrSeq);
return getFieldU32 (sfPreviousTxnLgrSeq);
}
bool SerializedLedgerEntry::thread(uint256 const& txID, uint32 ledgerSeq, uint256& prevTxID, uint32& prevLedgerID)
bool SerializedLedgerEntry::thread (uint256 const& txID, uint32 ledgerSeq, uint256& prevTxID, uint32& prevLedgerID)
{
uint256 oldPrevTxID = getFieldH256(sfPreviousTxnID);
WriteLog (lsTRACE, SerializedLedgerLog) << "Thread Tx:" << txID << " prev:" << oldPrevTxID;
if (oldPrevTxID == txID)
{ // this transaction is already threaded
assert(getFieldU32(sfPreviousTxnLgrSeq) == ledgerSeq);
return false;
}
prevTxID = oldPrevTxID;
prevLedgerID = getFieldU32(sfPreviousTxnLgrSeq);
setFieldH256(sfPreviousTxnID, txID);
setFieldU32(sfPreviousTxnLgrSeq, ledgerSeq);
return true;
uint256 oldPrevTxID = getFieldH256 (sfPreviousTxnID);
WriteLog (lsTRACE, SerializedLedgerLog) << "Thread Tx:" << txID << " prev:" << oldPrevTxID;
if (oldPrevTxID == txID)
{
// this transaction is already threaded
assert (getFieldU32 (sfPreviousTxnLgrSeq) == ledgerSeq);
return false;
}
prevTxID = oldPrevTxID;
prevLedgerID = getFieldU32 (sfPreviousTxnLgrSeq);
setFieldH256 (sfPreviousTxnID, txID);
setFieldU32 (sfPreviousTxnLgrSeq, ledgerSeq);
return true;
}
bool SerializedLedgerEntry::hasOneOwner()
bool SerializedLedgerEntry::hasOneOwner ()
{
return (mType != ltACCOUNT_ROOT) && (getFieldIndex(sfAccount) != -1);
return (mType != ltACCOUNT_ROOT) && (getFieldIndex (sfAccount) != -1);
}
bool SerializedLedgerEntry::hasTwoOwners()
bool SerializedLedgerEntry::hasTwoOwners ()
{
return mType == ltRIPPLE_STATE;
return mType == ltRIPPLE_STATE;
}
RippleAddress SerializedLedgerEntry::getOwner()
RippleAddress SerializedLedgerEntry::getOwner ()
{
return getFieldAccount(sfAccount);
return getFieldAccount (sfAccount);
}
RippleAddress SerializedLedgerEntry::getFirstOwner()
RippleAddress SerializedLedgerEntry::getFirstOwner ()
{
return RippleAddress::createAccountID(getFieldAmount(sfLowLimit).getIssuer());
return RippleAddress::createAccountID (getFieldAmount (sfLowLimit).getIssuer ());
}
RippleAddress SerializedLedgerEntry::getSecondOwner()
RippleAddress SerializedLedgerEntry::getSecondOwner ()
{
return RippleAddress::createAccountID(getFieldAmount(sfHighLimit).getIssuer());
return RippleAddress::createAccountID (getFieldAmount (sfHighLimit).getIssuer ());
}
std::vector<uint256> SerializedLedgerEntry::getOwners()
std::vector<uint256> SerializedLedgerEntry::getOwners ()
{
std::vector<uint256> owners;
uint160 account;
std::vector<uint256> owners;
uint160 account;
for (int i = 0, fields = getCount(); i < fields; ++i)
{
SField::ref fc = getFieldSType(i);
if ((fc == sfAccount) || (fc == sfOwner))
{
const STAccount* entry = dynamic_cast<const STAccount *>(peekAtPIndex(i));
if ((entry != NULL) && entry->getValueH160(account))
owners.push_back(Ledger::getAccountRootIndex(account));
}
if ((fc == sfLowLimit) || (fc == sfHighLimit))
{
const STAmount* entry = dynamic_cast<const STAmount *>(peekAtPIndex(i));
if ((entry != NULL))
{
uint160 issuer = entry->getIssuer();
if (issuer.isNonZero())
owners.push_back(Ledger::getAccountRootIndex(issuer));
}
}
}
for (int i = 0, fields = getCount (); i < fields; ++i)
{
SField::ref fc = getFieldSType (i);
return owners;
if ((fc == sfAccount) || (fc == sfOwner))
{
const STAccount* entry = dynamic_cast<const STAccount*> (peekAtPIndex (i));
if ((entry != NULL) && entry->getValueH160 (account))
owners.push_back (Ledger::getAccountRootIndex (account));
}
if ((fc == sfLowLimit) || (fc == sfHighLimit))
{
const STAmount* entry = dynamic_cast<const STAmount*> (peekAtPIndex (i));
if ((entry != NULL))
{
uint160 issuer = entry->getIssuer ();
if (issuer.isNonZero ())
owners.push_back (Ledger::getAccountRootIndex (issuer));
}
}
}
return owners;
}
// vim:ts=4