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,16 +1,17 @@
DECLARE_INSTANCE(SerializedValidation);
DECLARE_INSTANCE (SerializedValidation);
SerializedValidation::SerializedValidation (SerializerIterator& sit, bool checkSignature)
: STObject (getFormat (), sit, sfValidation)
, mTrusted (false)
{
mNodeID = RippleAddress::createNodePublic(getFieldVL(sfSigningPubKey)).getNodeID();
assert(mNodeID.isNonZero());
if (checkSignature && !isValid())
mNodeID = RippleAddress::createNodePublic (getFieldVL (sfSigningPubKey)).getNodeID ();
assert (mNodeID.isNonZero ());
if (checkSignature && !isValid ())
{
Log(lsTRACE) << "Invalid validation " << getJson(0);
throw std::runtime_error("Invalid validation");
Log (lsTRACE) << "Invalid validation " << getJson (0);
throw std::runtime_error ("Invalid validation");
}
}
@@ -19,93 +20,94 @@ SerializedValidation::SerializedValidation (
const RippleAddress& raPub, bool isFull)
: STObject (getFormat (), sfValidation)
, mTrusted (false)
{ // Does not sign
setFieldH256(sfLedgerHash, ledgerHash);
setFieldU32(sfSigningTime, signTime);
{
// Does not sign
setFieldH256 (sfLedgerHash, ledgerHash);
setFieldU32 (sfSigningTime, signTime);
setFieldVL(sfSigningPubKey, raPub.getNodePublic());
mNodeID = raPub.getNodeID();
assert(mNodeID.isNonZero());
setFieldVL (sfSigningPubKey, raPub.getNodePublic ());
mNodeID = raPub.getNodeID ();
assert (mNodeID.isNonZero ());
if (!isFull)
setFlag(sFullFlag);
setFlag (sFullFlag);
}
void SerializedValidation::sign(const RippleAddress& raPriv)
void SerializedValidation::sign (const RippleAddress& raPriv)
{
uint256 signingHash;
sign(signingHash, raPriv);
sign (signingHash, raPriv);
}
void SerializedValidation::sign(uint256& signingHash, const RippleAddress& raPriv)
void SerializedValidation::sign (uint256& signingHash, const RippleAddress& raPriv)
{
signingHash = getSigningHash();
signingHash = getSigningHash ();
Blob signature;
raPriv.signNodePrivate(signingHash, signature);
setFieldVL(sfSignature, signature);
raPriv.signNodePrivate (signingHash, signature);
setFieldVL (sfSignature, signature);
}
uint256 SerializedValidation::getSigningHash() const
uint256 SerializedValidation::getSigningHash () const
{
return STObject::getSigningHash(theConfig.SIGN_VALIDATION);
return STObject::getSigningHash (theConfig.SIGN_VALIDATION);
}
uint256 SerializedValidation::getLedgerHash() const
uint256 SerializedValidation::getLedgerHash () const
{
return getFieldH256(sfLedgerHash);
return getFieldH256 (sfLedgerHash);
}
uint32 SerializedValidation::getSignTime() const
uint32 SerializedValidation::getSignTime () const
{
return getFieldU32(sfSigningTime);
return getFieldU32 (sfSigningTime);
}
uint32 SerializedValidation::getFlags() const
uint32 SerializedValidation::getFlags () const
{
return getFieldU32(sfFlags);
return getFieldU32 (sfFlags);
}
bool SerializedValidation::isValid() const
bool SerializedValidation::isValid () const
{
return isValid(getSigningHash());
return isValid (getSigningHash ());
}
bool SerializedValidation::isValid(uint256 const& signingHash) const
bool SerializedValidation::isValid (uint256 const& signingHash) const
{
try
{
RippleAddress raPublicKey = RippleAddress::createNodePublic(getFieldVL(sfSigningPubKey));
return raPublicKey.isValid() && raPublicKey.verifyNodePublic(signingHash, getFieldVL(sfSignature));
RippleAddress raPublicKey = RippleAddress::createNodePublic (getFieldVL (sfSigningPubKey));
return raPublicKey.isValid () && raPublicKey.verifyNodePublic (signingHash, getFieldVL (sfSignature));
}
catch (...)
{
Log(lsINFO) << "exception validating validation";
Log (lsINFO) << "exception validating validation";
return false;
}
}
RippleAddress SerializedValidation::getSignerPublic() const
RippleAddress SerializedValidation::getSignerPublic () const
{
RippleAddress a;
a.setNodePublic(getFieldVL(sfSigningPubKey));
a.setNodePublic (getFieldVL (sfSigningPubKey));
return a;
}
bool SerializedValidation::isFull() const
bool SerializedValidation::isFull () const
{
return (getFlags() & sFullFlag) != 0;
return (getFlags () & sFullFlag) != 0;
}
Blob SerializedValidation::getSignature() const
Blob SerializedValidation::getSignature () const
{
return getFieldVL(sfSignature);
return getFieldVL (sfSignature);
}
Blob SerializedValidation::getSigned() const
Blob SerializedValidation::getSigned () const
{
Serializer s;
add(s);
return s.peekData();
add (s);
return s.peekData ();
}
SOTemplate const& SerializedValidation::getFormat ()
@@ -124,7 +126,7 @@ SOTemplate const& SerializedValidation::getFormat ()
format.push_back (SOElement (sfFeatures, SOE_OPTIONAL));
format.push_back (SOElement (sfBaseFee, SOE_OPTIONAL));
format.push_back (SOElement (sfReserveBase, SOE_OPTIONAL));
format.push_back (SOElement (sfReserveIncrement,SOE_OPTIONAL));
format.push_back (SOElement (sfReserveIncrement, SOE_OPTIONAL));
format.push_back (SOElement (sfSigningTime, SOE_REQUIRED));
format.push_back (SOElement (sfSigningPubKey, SOE_REQUIRED));
format.push_back (SOElement (sfSignature, SOE_OPTIONAL));