From e7d6fe6c8b6783cd068302feda997bb06c93d1cc Mon Sep 17 00:00:00 2001
From: Josh Juran <josh@ripple.com>
Date: Wed, 3 Dec 2014 18:14:21 -0500
Subject: [PATCH] Cull duplicate/unused code in RippleAddress:

Deduplicate a call to GeneratePublicDeterministicKey().
Remove unused member functions.
---
 src/ripple/protocol/RippleAddress.h        |  7 ------
 src/ripple/protocol/impl/RippleAddress.cpp | 26 +---------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/src/ripple/protocol/RippleAddress.h b/src/ripple/protocol/RippleAddress.h
index 4499f3ecc..259c32e61 100644
--- a/src/ripple/protocol/RippleAddress.h
+++ b/src/ripple/protocol/RippleAddress.h
@@ -153,8 +153,6 @@ public:
     //
     uint256 getAccountPrivate () const;
 
-    std::string humanAccountPrivate () const;
-
     bool setAccountPrivate (std::string const& strPrivate);
     void setAccountPrivate (Blob const& vPrivate);
     void setAccountPrivate (uint256 hash256);
@@ -183,11 +181,6 @@ public:
         return naNew;
     }
 
-    static std::string createHumanAccountPrivate (Blob const& vPrivate)
-    {
-        return createAccountPrivate (vPrivate).humanAccountPrivate ();
-    }
-
     //
     // Generators
     // Use to generate a master or regular family.
diff --git a/src/ripple/protocol/impl/RippleAddress.cpp b/src/ripple/protocol/impl/RippleAddress.cpp
index eb011aa60..86e886134 100644
--- a/src/ripple/protocol/impl/RippleAddress.cpp
+++ b/src/ripple/protocol/impl/RippleAddress.cpp
@@ -443,7 +443,7 @@ RippleAddress RippleAddress::createAccountPublic (
 {
     RippleAddress   naNew;
 
-    naNew.setAccountPublic (getPublicKey (GeneratePublicDeterministicKey (generator.getGenerator(), iSeq)));
+    naNew.setAccountPublic (generator, iSeq);
 
     return naNew;
 }
@@ -547,21 +547,6 @@ uint256 RippleAddress::getAccountPrivate () const
     }
 }
 
-std::string RippleAddress::humanAccountPrivate () const
-{
-    switch (nVersion)
-    {
-    case VER_NONE:
-        throw std::runtime_error ("unset source - humanAccountPrivate");
-
-    case VER_ACCOUNT_PRIVATE:
-        return ToString ();
-
-    default:
-        throw std::runtime_error ("bad source: " + std::to_string(nVersion));
-    }
-}
-
 bool RippleAddress::setAccountPrivate (std::string const& strPrivate)
 {
     mIsValid = SetString (
@@ -715,13 +700,6 @@ std::string RippleAddress::humanGenerator () const
     }
 }
 
-bool RippleAddress::setGenerator (std::string const& strGenerator)
-{
-    mIsValid = SetString (
-        strGenerator, VER_FAMILY_GENERATOR, Base58::getRippleAlphabet ());
-    return mIsValid;
-}
-
 void RippleAddress::setGenerator (Blob const& vPublic)
 {
     mIsValid        = true;
@@ -929,7 +907,6 @@ public:
 
         expect (naAccountPublic0.humanAccountID () == "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", naAccountPublic0.humanAccountID ());
         expect (naAccountPublic0.humanAccountPublic () == "aBQG8RQAzjs1eTKFEAQXr2gS4utcDiEC9wmi7pfUPTi27VCahwgw", naAccountPublic0.humanAccountPublic ());
-        expect (naAccountPrivate0.humanAccountPrivate () == "p9JfM6HHi64m6mvB6v5k7G2b1cXzGmYiCNJf6GHPKvFTWdeRVjh", naAccountPrivate0.humanAccountPrivate ());
 
         // Create account #1 public/private key pair.
         RippleAddress   naAccountPublic1    = RippleAddress::createAccountPublic (generator, 1);
@@ -937,7 +914,6 @@ public:
 
         expect (naAccountPublic1.humanAccountID () == "r4bYF7SLUMD7QgSLLpgJx38WJSY12ViRjP", naAccountPublic1.humanAccountID ());
         expect (naAccountPublic1.humanAccountPublic () == "aBPXpTfuLy1Bhk3HnGTTAqnovpKWQ23NpFMNkAF6F1Atg5vDyPrw", naAccountPublic1.humanAccountPublic ());
-        expect (naAccountPrivate1.humanAccountPrivate () == "p9JEm822LMrzJii1k7TvdphfENTp6G5jr253Xa5rkzUWVr8ogQt", naAccountPrivate1.humanAccountPrivate ());
 
         // Check account signing.
         expect (naAccountPrivate0.accountPrivateSign (uHash, vucTextSig), "Signing failed.");