Ripple calc

src/ripple/module/app/book/Taker.h

@@ -70,7 +70,6 @@ class Taker
     // The amounts still left over for us to try and take.
     Amounts m_remain;
 
-private:
     Amounts
     flow (Amounts amount, Offer const& offer, Account const& taker);
 

src/ripple/module/app/book/Types.h

@@ -30,38 +30,6 @@
 namespace ripple {
 namespace core {
 
-namespace detail {
-
-class AccountTag {};
-class CurrencyTag {};
-
-} // detail
-
-typedef base_uint<160, detail::AccountTag> Account;
-typedef base_uint<160, detail::CurrencyTag> Currency;
-
-inline std::string to_string(Currency const& c)
-{
-    return STAmount::createHumanCurrency(c);
-}
-
-inline std::string to_string(Account const& a)
-{
-    return RippleAddress::createHumanAccountID(a);
-}
-
-inline std::ostream& operator<< (std::ostream& os, Account const& x)
-{
-    os << to_string (x);
-    return os;
-}
-
-inline std::ostream& operator<< (std::ostream& os, Currency const& x)
-{
-    os << to_string (x);
-    return os;
-}
-
 /** A mutable view that overlays an immutable ledger to track changes. */
 typedef LedgerEntrySet LedgerView;
 
@@ -85,12 +53,6 @@ class Clock // : public abstract_clock <std::chrono::seconds>
 };
 
 } // core
-
-inline bool isXRP(core::Currency const& c)
-{
-    return c == zero;
-}
-
 } // ripple
 
 #endif

src/ripple/module/app/book/tests/Quality.test.cpp

@@ -32,7 +32,7 @@ class Quality_test : public beast::unit_test::suite
     Amount
     static raw (std::uint64_t mantissa, int exponent)
     {
-        return Amount (uint160(3), uint160(3), mantissa, exponent);
+        return Amount (Currency(3), Account(3), mantissa, exponent);
     }
 
     template <class Integer>

src/ripple/module/app/consensus/DisputedTx.cpp

@@ -22,48 +22,50 @@ namespace ripple {
 // #define TRUST_NETWORK
 
 // Track a peer's yes/no vote on a particular disputed transaction
-void DisputedTx::setVote (const uint160& peer, bool votesYes)
+void DisputedTx::setVote (NodeID const& peer, bool votesYes)
 {
-    // VFALCO TODO Simplify this declaration. It doesn't exactly roll off the tongue!
-    std::pair <ripple::unordered_map <uint160, bool>::iterator, bool> res =
-        mVotes.insert (std::make_pair (peer, votesYes));
+    auto res = mVotes.insert (std::make_pair (peer, votesYes));
 
     // new vote
     if (res.second)
     {
         if (votesYes)
         {
-            WriteLog (lsDEBUG, LedgerConsensus) << "Peer " << peer << " votes YES on " << mTransactionID;
+            WriteLog (lsDEBUG, LedgerConsensus)
+                    << "Peer " << peer << " votes YES on " << mTransactionID;
             ++mYays;
         }
         else
         {
-            WriteLog (lsDEBUG, LedgerConsensus) << "Peer " << peer << " votes NO on " << mTransactionID;
+            WriteLog (lsDEBUG, LedgerConsensus)
+                    << "Peer " << peer << " votes NO on " << mTransactionID;
             ++mNays;
         }
     }
     // changes vote to yes
     else if (votesYes && !res.first->second)
     {
-        WriteLog (lsDEBUG, LedgerConsensus) << "Peer " << peer << " now votes YES on " << mTransactionID;
+        WriteLog (lsDEBUG, LedgerConsensus)
+                << "Peer " << peer << " now votes YES on " << mTransactionID;
         --mNays;
         ++mYays;
         res.first->second = true;
     }
     // changes vote to no
     else if (!votesYes && res.first->second)
     {
-        WriteLog (lsDEBUG, LedgerConsensus) << "Peer " << peer << " now votes NO on " << mTransactionID;
+        WriteLog (lsDEBUG, LedgerConsensus) << "Peer " << peer
+                                            << " now votes NO on " << mTransactionID;
         ++mNays;
         --mYays;
         res.first->second = false;
     }
 }
 
 // Remove a peer's vote on this disputed transasction
-void DisputedTx::unVote (const uint160& peer)
+void DisputedTx::unVote (NodeID const& peer)
 {
-    ripple::unordered_map<uint160, bool>::iterator it = mVotes.find (peer);
+    auto it = mVotes.find (peer);
 
     if (it != mVotes.end ())
     {
@@ -95,10 +97,12 @@ bool DisputedTx::updateVote (int percentTime, bool proposing)
         // This is basically the percentage of nodes voting 'yes' (including us)
         weight = (mYays * 100 + (mOurVote ? 100 : 0)) / (mNays + mYays + 1);
 
-        // VFALCO TODO Rename these macros and turn them into language constructs.
-        //             consolidate them into a class that collects all these related values.
+        // VFALCO TODO Rename these macros and turn them into language
+        //             constructs.  consolidate them into a class that collects
+        //             all these related values.
         //
-        // To prevent avalanche stalls, we increase the needed weight slightly over time
+        // To prevent avalanche stalls, we increase the needed weight slightly
+        // over time.
         if (percentTime < AV_MID_CONSENSUS_TIME)
             newPosition = weight >  AV_INIT_CONSENSUS_PCT;
         else if (percentTime < AV_LATE_CONSENSUS_TIME)
@@ -116,14 +120,17 @@ bool DisputedTx::updateVote (int percentTime, bool proposing)
 
     if (newPosition == mOurVote)
     {
-        WriteLog (lsINFO, LedgerConsensus) <<
-                                           "No change (" << (mOurVote ? "YES" : "NO") << ") : weight " << weight << ", percent " << percentTime;
+        WriteLog (lsINFO, LedgerConsensus)
+                << "No change (" << (mOurVote ? "YES" : "NO") << ") : weight "
+                << weight << ", percent " << percentTime;
         WriteLog (lsDEBUG, LedgerConsensus) << getJson ();
         return false;
     }
 
     mOurVote = newPosition;
-    WriteLog (lsDEBUG, LedgerConsensus) << "We now vote " << (mOurVote ? "YES" : "NO") << " on " << mTransactionID;
+    WriteLog (lsDEBUG, LedgerConsensus)
+            << "We now vote " << (mOurVote ? "YES" : "NO")
+            << " on " << mTransactionID;
     WriteLog (lsDEBUG, LedgerConsensus) << getJson ();
     return true;
 }
@@ -140,14 +147,11 @@ Json::Value DisputedTx::getJson ()
     {
         Json::Value votesj (Json::objectValue);
         for (auto& vote : mVotes)
-        {
             votesj[to_string (vote.first)] = vote.second;
-        }
         ret["votes"] = votesj;
     }
 
     return ret;
 }
 
 } // ripple
-

src/ripple/module/app/consensus/DisputedTx.h

@@ -66,8 +66,8 @@ class DisputedTx
 
     // VFALCO NOTE its not really a peer, its the 160 bit hash of the validator's public key
     //
-    void setVote (uint160 const& peer, bool votesYes);
-    void unVote (uint160 const& peer);
+    void setVote (NodeID const& peer, bool votesYes);
+    void unVote (NodeID const& peer);
 
     bool updateVote (int percentTime, bool proposing);
     Json::Value getJson ();
@@ -78,12 +78,10 @@ class DisputedTx
     int mNays;
     bool mOurVote;
     Serializer transaction;
-    ripple::unordered_map <uint160, bool> mVotes;
+
+    ripple::unordered_map <NodeID, bool> mVotes;
 };
 
-// VFALCO TODO Rename and put these in a tidy place
-typedef std::map<uint256, DisputedTx::pointer>::value_type u256_lct_pair;
-typedef std::map<uint160, LedgerProposal::pointer>::value_type u160_prop_pair;
 #define LEDGER_TOTAL_PASSES 8
 #define LEDGER_RETRY_PASSES 5
 

src/ripple/module/app/consensus/LedgerConsensus.cpp

@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <ripple/overlay/predicates.h>
+#include <ripple/types/api/UintTypes.h>
 
 namespace ripple {
 
@@ -340,7 +341,7 @@ class LedgerConsensusImp
         mAcquiring.erase (hash);
 
         // Adjust tracking for each peer that takes this position
-        std::vector<uint160> peers;
+        std::vector<NodeID> peers;
         for (auto& it : mPeerPositions)
         {
             if (it.second->getCurrentHash () == map->getHash ())
@@ -392,7 +393,7 @@ class LedgerConsensusImp
         if (mHaveCorrectLCL)
             priorLedger = mPreviousLedger->getParentHash (); // don't jump back
 
-        ripple::unordered_map<uint256, currentValidationCount> vals =
+        ripple::unordered_map<uint256, ValidationCounter> vals =
             getApp().getValidations ().getCurrentValidations
             (favoredLedger, priorLedger);
 
@@ -701,7 +702,7 @@ class LedgerConsensusImp
     */
     bool peerPosition (LedgerProposal::ref newPosition)
     {
-        uint160 peerID = newPosition->getPeerID ();
+        auto peerID = newPosition->getPeerID ();
 
         if (mDeadNodes.find (peerID) != mDeadNodes.end ())
         {
@@ -761,8 +762,6 @@ class LedgerConsensusImp
         {
             WriteLog (lsDEBUG, LedgerConsensus)
                 << "Don't have tx set for peer";
-            //      BOOST_FOREACH(u256_lct_pair& it, mDisputes)
-            //          it.second->unVote(peerID);
         }
 
         return true;
@@ -1194,7 +1193,7 @@ class LedgerConsensusImp
     /** Adjust the counts on all disputed transactions based
         on the set of peers taking this position
     */
-    void adjustCount (SHAMap::ref map, const std::vector<uint160>& peers)
+    void adjustCount (SHAMap::ref map, const std::vector<NodeID>& peers)
     {
         for (auto& it : mDisputes)
         {
@@ -1380,7 +1379,7 @@ class LedgerConsensusImp
                 return resultSuccess;
             }
 
-            if (isTefFailure (result) || isTemMalformed (result) || 
+            if (isTefFailure (result) || isTemMalformed (result) ||
                 isTelLocal (result))
             {
                 // failure
@@ -1696,15 +1695,10 @@ class LedgerConsensusImp
     */
     void playbackProposals ()
     {
-        ripple::unordered_map < uint160,
-              std::list<LedgerProposal::pointer> > & storedProposals
-              = getApp().getOPs ().peekStoredProposals ();
-
-        for (auto it = storedProposals.begin ()
-            , end = storedProposals.end (); it != end; ++it)
+        for (auto it: getApp().getOPs ().peekStoredProposals ())
         {
             bool relay = false;
-            for (auto proposal : it->second)
+            for (auto proposal : it.second)
             {
                 if (proposal->hasSignature ())
                 {
@@ -1892,7 +1886,7 @@ class LedgerConsensusImp
     int                             mPreviousMSeconds;
 
     // Convergence tracking, trusted peers indexed by hash of public key
-    ripple::unordered_map<uint160, LedgerProposal::pointer> mPeerPositions;
+    ripple::unordered_map<NodeID, LedgerProposal::pointer>  mPeerPositions;
 
     // Transaction Sets, indexed by hash of transaction tree
     ripple::unordered_map<uint256, SHAMap::pointer> mAcquired;
@@ -1910,7 +1904,7 @@ class LedgerConsensusImp
     std::map<std::uint32_t, int> mCloseTimes;
 
     // nodes that have bowed out of this consensus process
-    boost::unordered_set<uint160> mDeadNodes;
+    NodeIDSet mDeadNodes;
 };
 
 //------------------------------------------------------------------------------