From b1093efa833376a7883deb0cbcddd0aed364de84 Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Mon, 20 Aug 2012 13:43:33 -0400
Subject: Change CWallet addressgrouping to use CTxDestination instead of
 strings.

This is cleanup for the listaddressgroupings code. Also add some
real help text.
---
 src/wallet.h | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/wallet.h')

diff --git a/src/wallet.h b/src/wallet.h
index f02c1467b5..428cff7480 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -10,7 +10,6 @@
 
 #include <stdlib.h>
 
-#include "base58.h"
 #include "main.h"
 #include "key.h"
 #include "keystore.h"
@@ -177,8 +176,8 @@ public:
     int64 GetOldestKeyPoolTime();
     void GetAllReserveKeys(std::set<CKeyID>& setAddress);
 
-    std::set< std::set<std::string> > GetAddressGroupings();
-    std::map<std::string, int64> GetAddressBalances();
+    std::set< std::set<CTxDestination> > GetAddressGroupings();
+    std::map<CTxDestination, int64> GetAddressBalances();
 
     bool IsMine(const CTxIn& txin) const;
     int64 GetDebit(const CTxIn& txin) const;
@@ -647,13 +646,6 @@ public:
         return true;
     }
 
-    std::string GetAddressOfTxOut(int n) const
-    {
-        CTxDestination addr;
-        ExtractDestination(vout[n].scriptPubKey, addr);
-        return CBitcoinAddress(addr).ToString();
-    }
-
     bool WriteToDisk();
 
     int64 GetTxTime() const;
-- 
cgit v1.2.3