From 0e2480523ae4f111685fdc438ce4b37cad75f3fc Mon Sep 17 00:00:00 2001
From: Daniel Cousens <github@dcousens.com>
Date: Wed, 12 Oct 2016 11:58:03 +1100
Subject: [PATCH] TransactionBuilder: expandInput, consistent variable names

---
 src/transaction_builder.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/transaction_builder.js b/src/transaction_builder.js
index 8fd0f08..a20450d 100644
--- a/src/transaction_builder.js
+++ b/src/transaction_builder.js
@@ -11,15 +11,14 @@ var ECPair = require('./ecpair')
 var ECSignature = require('./ecsignature')
 var Transaction = require('./transaction')
 
-// inspects a scriptSig w/ optional provided redeemScript and derives
-// all necessary input information as required by TransactionBuilder
+// inspects a scriptSig w/ optional redeemScript and
+// derives any input information required
 function expandInput (scriptSig, redeemScript) {
   var scriptSigChunks = bscript.decompile(scriptSig)
-  var scriptSigType = bscript.classifyInput(scriptSigChunks, true)
-
+  var prevOutType = bscript.classifyInput(scriptSigChunks, true)
   var hashType, pubKeys, signatures, prevOutScript
 
-  switch (scriptSigType) {
+  switch (prevOutType) {
     case 'scripthash':
       // FIXME: maybe depth limit instead, how possible is this anyway?
       if (redeemScript) throw new Error('Recursive P2SH script')
@@ -42,7 +41,6 @@ function expandInput (scriptSig, redeemScript) {
       signatures = [s.signature]
 
       if (redeemScript) break
-
       prevOutScript = bscript.pubKeyHashOutput(bcrypto.hash160(pubKeys[0]))
       break
 
@@ -74,7 +72,6 @@ function expandInput (scriptSig, redeemScript) {
 
         return sss.signature
       })
-
       break
   }
 
@@ -83,7 +80,7 @@ function expandInput (scriptSig, redeemScript) {
     pubKeys: pubKeys,
     signatures: signatures,
     prevOutScript: prevOutScript,
-    prevOutType: scriptSigType
+    prevOutType: prevOutType
   }
 }