From 497d048ebf3b269ee3782423da10478fe822f194 Mon Sep 17 00:00:00 2001
From: junderw <junderwood@bitcoinbank.co.jp>
Date: Tue, 9 Jul 2019 11:57:50 +0900
Subject: [PATCH] Refactor: externalize outputAdder

---
 src/psbt.js    | 49 ++++++++++++++++++++++++--------------------
 ts_src/psbt.ts | 55 +++++++++++++++++++++++++++-----------------------
 2 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/src/psbt.js b/src/psbt.js
index c549d30..eff98ae 100644
--- a/src/psbt.js
+++ b/src/psbt.js
@@ -134,10 +134,11 @@ class Psbt extends bip174_1.Psbt {
   }
   addInput(inputData) {
     checkInputsForPartialSig(this.inputs, 'addInput');
-    const inputAdder = getInputAdder(this.__CACHE);
+    const c = this.__CACHE;
+    const inputAdder = getInputAdder(c);
     super.addInput(inputData, inputAdder);
-    this.__CACHE.__FEE_RATE = undefined;
-    this.__CACHE.__EXTRACTED_TX = undefined;
+    c.__FEE_RATE = undefined;
+    c.__EXTRACTED_TX = undefined;
     return this;
   }
   addOutput(outputData) {
@@ -148,26 +149,11 @@ class Psbt extends bip174_1.Psbt {
       const script = address_1.toOutputScript(address, network);
       outputData = Object.assign(outputData, { script });
     }
-    const self = this;
-    const outputAdder = (_outputData, txBuf) => {
-      if (
-        !txBuf ||
-        _outputData.script === undefined ||
-        _outputData.value === undefined ||
-        !Buffer.isBuffer(_outputData.script) ||
-        typeof _outputData.value !== 'number'
-      ) {
-        throw new Error('Error adding output.');
-      }
-      self.__CACHE.__TX.outs.push({
-        script: _outputData.script,
-        value: _outputData.value,
-      });
-      return self.__CACHE.__TX.toBuffer();
-    };
+    const c = this.__CACHE;
+    const outputAdder = getOutputAdder(c);
     super.addOutput(outputData, true, outputAdder);
-    this.__CACHE.__FEE_RATE = undefined;
-    this.__CACHE.__EXTRACTED_TX = undefined;
+    c.__FEE_RATE = undefined;
+    c.__EXTRACTED_TX = undefined;
     return this;
   }
   addNonWitnessUtxoToInput(inputIndex, nonWitnessUtxo) {
@@ -854,6 +840,25 @@ function getInputAdder(cache) {
     return selfCache.__TX.toBuffer();
   };
 }
+function getOutputAdder(cache) {
+  const selfCache = cache;
+  return (_outputData, txBuf) => {
+    if (
+      !txBuf ||
+      _outputData.script === undefined ||
+      _outputData.value === undefined ||
+      !Buffer.isBuffer(_outputData.script) ||
+      typeof _outputData.value !== 'number'
+    ) {
+      throw new Error('Error adding output.');
+    }
+    selfCache.__TX.outs.push({
+      script: _outputData.script,
+      value: _outputData.value,
+    });
+    return selfCache.__TX.toBuffer();
+  };
+}
 function check32Bit(num) {
   if (
     typeof num !== 'number' ||
diff --git a/ts_src/psbt.ts b/ts_src/psbt.ts
index 0174b3b..370b481 100644
--- a/ts_src/psbt.ts
+++ b/ts_src/psbt.ts
@@ -168,10 +168,11 @@ export class Psbt extends PsbtBase {
 
   addInput(inputData: TransactionInput): this {
     checkInputsForPartialSig(this.inputs, 'addInput');
-    const inputAdder = getInputAdder(this.__CACHE);
+    const c = this.__CACHE;
+    const inputAdder = getInputAdder(c);
     super.addInput(inputData, inputAdder);
-    this.__CACHE.__FEE_RATE = undefined;
-    this.__CACHE.__EXTRACTED_TX = undefined;
+    c.__FEE_RATE = undefined;
+    c.__EXTRACTED_TX = undefined;
     return this;
   }
 
@@ -183,29 +184,11 @@ export class Psbt extends PsbtBase {
       const script = toOutputScript(address, network);
       outputData = Object.assign(outputData, { script });
     }
-    const self = this;
-    const outputAdder = (
-      _outputData: TransactionOutput,
-      txBuf: Buffer,
-    ): Buffer => {
-      if (
-        !txBuf ||
-        (_outputData as any).script === undefined ||
-        (_outputData as any).value === undefined ||
-        !Buffer.isBuffer((_outputData as any).script) ||
-        typeof (_outputData as any).value !== 'number'
-      ) {
-        throw new Error('Error adding output.');
-      }
-      self.__CACHE.__TX.outs.push({
-        script: (_outputData as any).script!,
-        value: _outputData.value,
-      });
-      return self.__CACHE.__TX.toBuffer();
-    };
+    const c = this.__CACHE;
+    const outputAdder = getOutputAdder(c);
     super.addOutput(outputData, true, outputAdder);
-    this.__CACHE.__FEE_RATE = undefined;
-    this.__CACHE.__EXTRACTED_TX = undefined;
+    c.__FEE_RATE = undefined;
+    c.__EXTRACTED_TX = undefined;
     return this;
   }
 
@@ -1070,6 +1053,28 @@ function getInputAdder(
   };
 }
 
+function getOutputAdder(
+  cache: PsbtCache,
+): (_outputData: TransactionOutput, txBuf: Buffer) => Buffer {
+  const selfCache = cache;
+  return (_outputData: TransactionOutput, txBuf: Buffer): Buffer => {
+    if (
+      !txBuf ||
+      (_outputData as any).script === undefined ||
+      (_outputData as any).value === undefined ||
+      !Buffer.isBuffer((_outputData as any).script) ||
+      typeof (_outputData as any).value !== 'number'
+    ) {
+      throw new Error('Error adding output.');
+    }
+    selfCache.__TX.outs.push({
+      script: (_outputData as any).script!,
+      value: _outputData.value,
+    });
+    return selfCache.__TX.toBuffer();
+  };
+}
+
 function check32Bit(num: number): void {
   if (
     typeof num !== 'number' ||