From f548e27e6787fc85cd0ae74a9abf31d3327287f8 Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Sat, 5 May 2012 16:46:29 -0700 Subject: [PATCH] Cosmetic changes. --- src/Ledger.h | 13 +++++++------ src/SerializedLedger.cpp | 1 + src/SerializedLedger.h | 1 + src/SerializedObject.h | 1 + src/SerializedTypes.h | 1 + src/SerializedValidation.cpp | 3 ++- src/SerializedValidation.h | 1 + src/Serializer.cpp | 5 +++-- src/TransactionEngine.cpp | 1 + src/TransactionEngine.h | 1 + src/TransactionFormats.cpp | 1 + src/TransactionFormats.h | 1 + src/TransactionMaster.cpp | 1 + src/TransactionMaster.h | 1 + 14 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/Ledger.h b/src/Ledger.h index 16730c4ad7..5e8f70f47d 100644 --- a/src/Ledger.h +++ b/src/Ledger.h @@ -21,7 +21,7 @@ enum LedgerStateParms lepNONE = 0, // no special flags // input flags - lepCREATE, // Create if not present + lepCREATE, // Create if not present // output flags lepOKAY, // success @@ -60,11 +60,11 @@ private: uint32 mLedgerSeq; uint16 mLedgerInterval; bool mClosed, mValidHash, mAccepted, mImmutable; - + SHAMap::pointer mTransactionMap, mAccountStateMap; mutable boost::recursive_mutex mLock; - + Ledger(const Ledger&); // no implementation Ledger& operator=(const Ledger&); // no implementation @@ -72,7 +72,7 @@ protected: bool addTransaction(Transaction::pointer); bool addTransaction(const uint256& id, const Serializer& txn, uint64_t fee); - + static Ledger::pointer getSQL(const std::string& sqlStatement); SerializedLedgerEntry::pointer getASNode(LedgerStateParms& parms, const uint256& nodeID, @@ -87,7 +87,7 @@ public: Ledger(Ledger::pointer previous); // ledger after this one void updateHash(); - void setClosed() { mClosed = true; } + void setClosed() { mClosed = true; } void setAccepted() { mAccepted = true; } bool isClosed() { return mClosed; } bool isAccepted() { return mAccepted; } @@ -118,7 +118,7 @@ public: bool hasTransaction(const uint256& TransID) const; Transaction::pointer getTransaction(const uint256& transID) const; - Ledger::pointer switchPreviousLedger(Ledger::pointer oldPrevious, Ledger::pointer newPrevious, int limit); + Ledger::pointer switchPreviousLedger(Ledger::pointer oldPrevious, Ledger::pointer newPrevious, int limit); // high-level functions AccountState::pointer getAccountState(const NewcoinAddress& acctID); @@ -165,3 +165,4 @@ inline LedgerStateParms operator&(const LedgerStateParms& l1, const LedgerStateP } #endif +// vim:ts=4 diff --git a/src/SerializedLedger.cpp b/src/SerializedLedger.cpp index 4a566542a6..8b016698f3 100644 --- a/src/SerializedLedger.cpp +++ b/src/SerializedLedger.cpp @@ -71,3 +71,4 @@ bool SerializedLedgerEntry::isEquivalent(const SerializedType& t) const if (mObject != v->mObject) return false; return true; } +// vim:ts=4 diff --git a/src/SerializedLedger.h b/src/SerializedLedger.h index 628e6640f4..5d3d37759e 100644 --- a/src/SerializedLedger.h +++ b/src/SerializedLedger.h @@ -74,3 +74,4 @@ public: }; #endif +// vim:ts=4 diff --git a/src/SerializedObject.h b/src/SerializedObject.h index 20bc74141b..4e41fc0569 100644 --- a/src/SerializedObject.h +++ b/src/SerializedObject.h @@ -131,3 +131,4 @@ public: #endif +// vim:ts=4 diff --git a/src/SerializedTypes.h b/src/SerializedTypes.h index b522ad2645..e505409bd6 100644 --- a/src/SerializedTypes.h +++ b/src/SerializedTypes.h @@ -407,3 +407,4 @@ public: }; #endif +// vim:ts=4 diff --git a/src/SerializedValidation.cpp b/src/SerializedValidation.cpp index 01e463d8d7..47c4633c32 100644 --- a/src/SerializedValidation.cpp +++ b/src/SerializedValidation.cpp @@ -1,7 +1,7 @@ #include "SerializedValidation.h" -SOElement SerializedValidation::sValidationFormat[16] = { +SOElement SerializedValidation::sValidationFormat[] = { { sfFlags, "Flags", STI_UINT32, SOE_FLAGS, 0 }, { sfLedgerHash, "LedgerHash", STI_HASH256, SOE_REQUIRED, 0 }, { sfSigningKey, "SigningKey", STI_VL, SOE_REQUIRED, 0 }, @@ -90,3 +90,4 @@ std::vector SerializedValidation::getSignature() const { return mSignature.peekValue(); } +// vim:ts=4 diff --git a/src/SerializedValidation.h b/src/SerializedValidation.h index d7934651df..8eefc9f18f 100644 --- a/src/SerializedValidation.h +++ b/src/SerializedValidation.h @@ -35,3 +35,4 @@ public: }; #endif +// vim:ts=4 diff --git a/src/Serializer.cpp b/src/Serializer.cpp index ac3c029ba1..3ca3446c93 100644 --- a/src/Serializer.cpp +++ b/src/Serializer.cpp @@ -233,12 +233,12 @@ bool Serializer::checkSignature(int pubkeyOffset, int signatureOffset) const CKey pubCKey; if (!pubCKey.SetPubKey(pubkey)) return false; - return pubCKey.Verify(getSHA512Half(signatureOffset), signature); + return pubCKey.Verify(getSHA512Half(signatureOffset), signature); } bool Serializer::checkSignature(const std::vector &signature, CKey& key) const { - return key.Verify(getSHA512Half(), signature); + return key.Verify(getSHA512Half(), signature); } bool Serializer::makeSignature(std::vector &signature, CKey& key) const @@ -571,3 +571,4 @@ std::vector SerializerIterator::getTaggedList() mPos += length; return tl; } +// vim:ts=4 diff --git a/src/TransactionEngine.cpp b/src/TransactionEngine.cpp index b65d121865..f25fd08142 100644 --- a/src/TransactionEngine.cpp +++ b/src/TransactionEngine.cpp @@ -191,3 +191,4 @@ TransactionEngineResult TransactionEngine::doDelete(const SerializedTransaction& { return terUNKNOWN; } +// vim:ts=4 diff --git a/src/TransactionEngine.h b/src/TransactionEngine.h index f729a5a0cd..a53212c4df 100644 --- a/src/TransactionEngine.h +++ b/src/TransactionEngine.h @@ -80,3 +80,4 @@ inline TransactionEngineParams operator&(const TransactionEngineParams& l1, cons } #endif +// vim:ts=4 diff --git a/src/TransactionFormats.cpp b/src/TransactionFormats.cpp index b285c2dcb8..6d6835880c 100644 --- a/src/TransactionFormats.cpp +++ b/src/TransactionFormats.cpp @@ -55,3 +55,4 @@ TransactionFormat* getTxnFormat(TransactionType t) } return NULL; } +// vim:ts=4 diff --git a/src/TransactionFormats.h b/src/TransactionFormats.h index eb5efaf180..fff06ca360 100644 --- a/src/TransactionFormats.h +++ b/src/TransactionFormats.h @@ -29,3 +29,4 @@ const int TransactionMaxLen=1048576; extern TransactionFormat InnerTxnFormats[]; extern TransactionFormat* getTxnFormat(TransactionType t); #endif +// vim:ts=4 diff --git a/src/TransactionMaster.cpp b/src/TransactionMaster.cpp index 1b74621597..f967d26e66 100644 --- a/src/TransactionMaster.cpp +++ b/src/TransactionMaster.cpp @@ -38,3 +38,4 @@ bool TransactionMaster::canonicalize(Transaction::pointer& txn, bool may_be_new) theApp->getIOService().post(boost::bind(&Transaction::saveTransaction, txn)); return false; } +// vim:ts=4 diff --git a/src/TransactionMaster.h b/src/TransactionMaster.h index cdf02d8163..1f30353bca 100644 --- a/src/TransactionMaster.h +++ b/src/TransactionMaster.h @@ -22,3 +22,4 @@ public: }; #endif +// vim:ts=4