From 53e1c2d6bd28ab558b18c876322e5262692b3d59 Mon Sep 17 00:00:00 2001
From: Josh Rickmar <jrick@conformal.com>
Date: Mon, 4 Nov 2013 11:59:48 -0500
Subject: [PATCH] Stringify the address hash for txRequests map.

This change allows map lookups using address hashes (which are
returned as []byte) instead of either copying the hash into an array,
or doing a bytes.Equal().

A stupid range over a map until the right key is found was also just
changed to a single map lookup.
---
 rpcserver.go | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/rpcserver.go b/rpcserver.go
index f315e60c..a8fe1b7b 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -6,7 +6,6 @@ package main
 
 import (
 	"bytes"
-	"code.google.com/p/go.crypto/ripemd160"
 	"code.google.com/p/go.net/websocket"
 	"encoding/base64"
 	"encoding/hex"
@@ -83,7 +82,9 @@ func (r *wsRequests) getOrCreateContexts(walletNotification chan []byte) *reques
 	rc, ok := r.m[walletNotification]
 	if !ok {
 		rc = &requestContexts{
-			txRequests:      make(map[addressHash]interface{}),
+			// The key is a stringified addressHash.
+			txRequests:      make(map[string]interface{}),
+
 			spentRequests:   make(map[btcwire.OutPoint]interface{}),
 			minedTxRequests: make(map[btcwire.ShaHash]bool),
 		}
@@ -93,12 +94,12 @@ func (r *wsRequests) getOrCreateContexts(walletNotification chan []byte) *reques
 }
 
 // AddTxRequest adds the request context for new transaction notifications.
-func (r *wsRequests) AddTxRequest(walletNotification chan []byte, addr addressHash, id interface{}) {
+func (r *wsRequests) AddTxRequest(walletNotification chan []byte, addrhash string, id interface{}) {
 	r.Lock()
 	defer r.Unlock()
 
 	rc := r.getOrCreateContexts(walletNotification)
-	rc.txRequests[addr] = id
+	rc.txRequests[addrhash] = id
 }
 
 // AddSpentRequest adds a request context for notifications of a spent
@@ -152,14 +153,13 @@ func (r *wsRequests) CloseListeners(walletNotification chan []byte) {
 	close(walletNotification)
 }
 
-type addressHash [ripemd160.Size]byte
-
 // requestContexts holds all requests for a single wallet connection.
 type requestContexts struct {
 	// txRequests maps between a 160-byte pubkey hash and the JSON
 	// id of the requester so replies can be correctly routed back
-	// to the correct btcwallet callback.
-	txRequests map[addressHash]interface{}
+	// to the correct btcwallet callback.  The key must be a stringified
+	// address hash.
+	txRequests map[string]interface{}
 
 	// spentRequests maps between an Outpoint of an unspent
 	// transaction output and the JSON id of the requester so
@@ -968,9 +968,7 @@ func jsonWSRead(walletNotification chan []byte, replychan chan *btcjson.Reply, b
 			}
 			return ErrBadParamsField
 		}
-		var hash addressHash
-		copy(hash[:], addrhash)
-		s.ws.requests.AddTxRequest(walletNotification, hash, message.Id)
+		s.ws.requests.AddTxRequest(walletNotification, string(addrhash), message.Id)
 
 		rawReply = btcjson.Reply{
 			Result: nil,
@@ -1349,10 +1347,7 @@ func (s *rpcServer) newBlockNotifyCheckTxOut(block *btcutil.Block, tx *btcutil.T
 				log.Debug("Error getting payment address from tx; dropping any Tx notifications.")
 				break
 			}
-			for addr, id := range cxt.txRequests {
-				if !bytes.Equal(addr[:], txaddrhash) {
-					continue
-				}
+			if id, ok := cxt.txRequests[string(txaddrhash)]; ok {
 				blkhash, err := block.Sha()
 				if err != nil {
 					log.Error("Error getting block sha; dropping Tx notification.")