Move all BIP174 test cases into BIP14 describe block

test/psbt.js

@@ -93,74 +93,74 @@ describe(`Psbt`, () => {
         assert.strictEqual(psbt.toBase64(), f.result)
       })
     })
-  })
-
-  fixtures.bip174.signer.forEach(f => {
-    it('Signs PSBT to the expected result', () => {
-      const psbt =  Psbt.fromBase64(f.psbt)
 
-      f.keys.forEach(({inputToSign, WIF}) => {
+    fixtures.bip174.signer.forEach(f => {
-        const keyPair = ECPair.fromWIF(WIF, NETWORKS.testnet);
+      it('Signs PSBT to the expected result', () => {
-        psbt.signInput(inputToSign, keyPair);
+        const psbt =  Psbt.fromBase64(f.psbt)
+  
+        f.keys.forEach(({inputToSign, WIF}) => {
+          const keyPair = ECPair.fromWIF(WIF, NETWORKS.testnet);
+          psbt.signInput(inputToSign, keyPair);
+        })
+  
+        assert.strictEqual(psbt.toBase64(), f.result)
       })
-
-      assert.strictEqual(psbt.toBase64(), f.result)
     })
-  })
+  
-
+    fixtures.bip174.combiner.forEach(f => {
-  fixtures.bip174.combiner.forEach(f => {
+      it('Combines two PSBTs to the expected result', () => {
-    it('Combines two PSBTs to the expected result', () => {
+        const psbts =  f.psbts.map(psbt => Psbt.fromBase64(psbt))
-      const psbts =  f.psbts.map(psbt => Psbt.fromBase64(psbt))
+  
-
+        psbts[0].combine(psbts[1])
-      psbts[0].combine(psbts[1])
+  
-
+        // Produces a different Base64 string due to implemetation specific key-value ordering.
-      // Produces a different Base64 string due to implemetation specific key-value ordering.
+        // That means this test will fail:
-      // That means this test will fail:
+        // assert.strictEqual(psbts[0].toBase64(), f.result)
-      // assert.strictEqual(psbts[0].toBase64(), f.result)
+        // However, if we compare the actual PSBT properties we can see they are logically identical:
-      // However, if we compare the actual PSBT properties we can see they are logically identical:
+        assert.deepStrictEqual(psbts[0], Psbt.fromBase64(f.result))
-      assert.deepStrictEqual(psbts[0], Psbt.fromBase64(f.result))
+      })
     })
-  })
+  
-
+    fixtures.bip174.finalizer.forEach(f => {
-  fixtures.bip174.finalizer.forEach(f => {
+      it(`Finalizes inputs and gives the expected PSBT: ${f.description}`, () => {
-    it(`Finalizes inputs and gives the expected PSBT: ${f.description}`, () => {
+        const psbt =  Psbt.fromBase64(f.psbt)
-      const psbt =  Psbt.fromBase64(f.psbt)
+  
-
+        psbt.finalizeAllInputs()
-      psbt.finalizeAllInputs()
+  
-
+        assert.strictEqual(psbt.toBase64(), f.result)
-      assert.strictEqual(psbt.toBase64(), f.result)
+      })
     })
-  })
+  
-
+    fixtures.bip174.extractor.forEach(f => {
-  fixtures.bip174.extractor.forEach(f => {
+      it('Extracts the expected transaction from a PSBT', () => {
-    it('Extracts the expected transaction from a PSBT', () => {
+        const psbt1 =  Psbt.fromBase64(f.psbt)
-      const psbt1 =  Psbt.fromBase64(f.psbt)
+        const transaction1 = psbt1.extractTransaction(true).toHex()
-      const transaction1 = psbt1.extractTransaction(true).toHex()
+  
-
+        const psbt2 =  Psbt.fromBase64(f.psbt)
-      const psbt2 =  Psbt.fromBase64(f.psbt)
+        const transaction2 = psbt2.extractTransaction().toHex()
-      const transaction2 = psbt2.extractTransaction().toHex()
+  
-
+        assert.strictEqual(transaction1, transaction2)
-      assert.strictEqual(transaction1, transaction2)
+        assert.strictEqual(transaction1, f.transaction)
-      assert.strictEqual(transaction1, f.transaction)
+  
-
+        const psbt3 =  Psbt.fromBase64(f.psbt)
-      const psbt3 =  Psbt.fromBase64(f.psbt)
+        delete psbt3.inputs[0].finalScriptSig
-      delete psbt3.inputs[0].finalScriptSig
+        delete psbt3.inputs[0].finalScriptWitness
-      delete psbt3.inputs[0].finalScriptWitness
+        assert.throws(() => {
-      assert.throws(() => {
+          psbt3.extractTransaction()
-        psbt3.extractTransaction()
+        }, new RegExp('Not finalized'))
-      }, new RegExp('Not finalized'))
+  
-
+        const psbt4 =  Psbt.fromBase64(f.psbt)
-      const psbt4 =  Psbt.fromBase64(f.psbt)
+        psbt4.setMaximumFeeRate(1)
-      psbt4.setMaximumFeeRate(1)
+        assert.throws(() => {
-      assert.throws(() => {
+          psbt4.extractTransaction()
-        psbt4.extractTransaction()
+        }, new RegExp('Warning: You are paying around [\\d.]+ in fees'))
-      }, new RegExp('Warning: You are paying around [\\d.]+ in fees'))
+  
-
+        const psbt5 =  Psbt.fromBase64(f.psbt)
-      const psbt5 =  Psbt.fromBase64(f.psbt)
+        psbt5.extractTransaction(true)
-      psbt5.extractTransaction(true)
+        const fr1 = psbt5.getFeeRate()
-      const fr1 = psbt5.getFeeRate()
+        const fr2 = psbt5.getFeeRate()
-      const fr2 = psbt5.getFeeRate()
+        assert.strictEqual(fr1, fr2)
-      assert.strictEqual(fr1, fr2)
+      })
     })
   })
 
@@ -504,5 +504,4 @@ describe(`Psbt`, () => {
       assert.ok(psbt.inputs[index].nonWitnessUtxo.equals(value))
     })
   })
-})
+})
-