From e10d4e9047f6aa813daf1fa62ac741ddce258fc3 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Thu, 27 Jun 2019 19:10:34 -0700
Subject: [PATCH] chainntnfs/multi: replace txid with ConfRequest in txindex
 matching

---
 chainntnfs/bitcoindnotify/bitcoind.go |  2 +-
 chainntnfs/btcdnotify/btcd.go         |  2 +-
 chainntnfs/interface.go               | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/chainntnfs/bitcoindnotify/bitcoind.go b/chainntnfs/bitcoindnotify/bitcoind.go
index 77c2579c..2c02167b 100644
--- a/chainntnfs/bitcoindnotify/bitcoind.go
+++ b/chainntnfs/bitcoindnotify/bitcoind.go
@@ -457,7 +457,7 @@ func (b *BitcoindNotifier) historicalConfDetails(confRequest chainntnfs.ConfRequ
 	// txindex.
 	txNotFoundErr := "No such mempool or blockchain transaction"
 	txConf, txStatus, err := chainntnfs.ConfDetailsFromTxIndex(
-		b.chainConn, &confRequest.TxID, txNotFoundErr,
+		b.chainConn, confRequest, txNotFoundErr,
 	)
 
 	// We'll then check the status of the transaction lookup returned to
diff --git a/chainntnfs/btcdnotify/btcd.go b/chainntnfs/btcdnotify/btcd.go
index 18857f70..bfe42da0 100644
--- a/chainntnfs/btcdnotify/btcd.go
+++ b/chainntnfs/btcdnotify/btcd.go
@@ -479,7 +479,7 @@ func (b *BtcdNotifier) historicalConfDetails(confRequest chainntnfs.ConfRequest,
 	// txindex.
 	txNotFoundErr := "No information available about transaction"
 	txConf, txStatus, err := chainntnfs.ConfDetailsFromTxIndex(
-		b.chainConn, &confRequest.TxID, txNotFoundErr,
+		b.chainConn, confRequest, txNotFoundErr,
 	)
 
 	// We'll then check the status of the transaction lookup returned to
diff --git a/chainntnfs/interface.go b/chainntnfs/interface.go
index c20eb968..1f0e1e3f 100644
--- a/chainntnfs/interface.go
+++ b/chainntnfs/interface.go
@@ -605,12 +605,12 @@ type TxIndexConn interface {
 // the mempool this will be TxFoundMempool, if it is found in a block this will
 // be TxFoundIndex. Otherwise TxNotFoundIndex is returned. If the tx is found
 // in a block its confirmation details are also returned.
-func ConfDetailsFromTxIndex(chainConn TxIndexConn, txid *chainhash.Hash,
+func ConfDetailsFromTxIndex(chainConn TxIndexConn, r ConfRequest,
 	txNotFoundErr string) (*TxConfirmation, TxConfStatus, error) {
 
 	// If the transaction has some or all of its confirmations required,
 	// then we may be able to dispatch it immediately.
-	rawTxRes, err := chainConn.GetRawTransactionVerbose(txid)
+	rawTxRes, err := chainConn.GetRawTransactionVerbose(&r.TxID)
 	if err != nil {
 		// If the transaction lookup was successful, but it wasn't found
 		// within the index itself, then we can exit early. We'll also
@@ -624,7 +624,8 @@ func ConfDetailsFromTxIndex(chainConn TxIndexConn, txid *chainhash.Hash,
 		}
 
 		return nil, TxNotFoundIndex,
-			fmt.Errorf("unable to query for txid %v: %v", txid, err)
+			fmt.Errorf("unable to query for txid %v: %v",
+				r.TxID, err)
 	}
 
 	// Make sure we actually retrieved a transaction that is included in a
@@ -652,7 +653,7 @@ func ConfDetailsFromTxIndex(chainConn TxIndexConn, txid *chainhash.Hash,
 
 	// If the block was obtained, locate the transaction's index within the
 	// block so we can give the subscriber full confirmation details.
-	txidStr := txid.String()
+	txidStr := r.TxID.String()
 	for txIndex, txHash := range block.Tx {
 		if txHash != txidStr {
 			continue
@@ -684,5 +685,5 @@ func ConfDetailsFromTxIndex(chainConn TxIndexConn, txid *chainhash.Hash,
 	// We return an error because we should have found the transaction
 	// within the block, but didn't.
 	return nil, TxNotFoundIndex, fmt.Errorf("unable to locate "+
-		"tx %v in block %v", txid, blockHash)
+		"tx %v in block %v", r.TxID, blockHash)
 }