From 2f5655708df1b7722dfb4098cd9c79aad1a35886 Mon Sep 17 00:00:00 2001
From: Craig Raw <craig@quirk.biz>
Date: Thu, 9 Apr 2020 15:07:38 +0200
Subject: [PATCH] minor refactoring

---
 src/main/java/com/sparrowwallet/drongo/psbt/PSBTInput.java | 7 ++-----
 src/test/java/com/sparrowwallet/drongo/psbt/PSBTTest.java  | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/sparrowwallet/drongo/psbt/PSBTInput.java b/src/main/java/com/sparrowwallet/drongo/psbt/PSBTInput.java
index 054d0df..3020fd8 100644
--- a/src/main/java/com/sparrowwallet/drongo/psbt/PSBTInput.java
+++ b/src/main/java/com/sparrowwallet/drongo/psbt/PSBTInput.java
@@ -301,11 +301,8 @@ public class PSBTInput {
         } else if(ScriptPattern.isP2WSH(signingScript)) {
             if(getWitnessScript() != null) {
                 signingScript = getWitnessScript();
-            } else if(getFinalScriptWitness() != null) {
-                List<ScriptChunk> witnessChunks = getFinalScriptWitness().asScriptChunks();
-                if(witnessChunks.get(witnessChunks.size() - 1).isScript()) {
-                    return witnessChunks.get(witnessChunks.size() - 1).getScript();
-                }
+            } else if(getFinalScriptWitness() != null && getFinalScriptWitness().getWitnessScript() != null) {
+                return getFinalScriptWitness().getWitnessScript();
             } else {
                 return null;
             }
diff --git a/src/test/java/com/sparrowwallet/drongo/psbt/PSBTTest.java b/src/test/java/com/sparrowwallet/drongo/psbt/PSBTTest.java
index a6851ce..05fbe9a 100644
--- a/src/test/java/com/sparrowwallet/drongo/psbt/PSBTTest.java
+++ b/src/test/java/com/sparrowwallet/drongo/psbt/PSBTTest.java
@@ -284,6 +284,6 @@ public class PSBTTest {
 
         Assert.assertEquals("00473044022074018ad4180097b873323c0015720b3684cc8123891048e7dbcd9b55ad679c99022073d369b740e3eb53dcefa33823c8070514ca55a7dd9544f157c167913261118c01483045022100f61038b308dc1da865a34852746f015772934208c6d24454393cd99bdf2217770220056e675a675a6d0a02b85b14e5e29074d8a25a9b5760bea2816f661910a006ea01475221029583bf39ae0a609747ad199addd634fa6108559d6c5cd39b4c2183f1ab96e07f2102dab61ff49a14db6a7d02b0cd1fbb78fc4b18312b5b4e54dae4dba2fbfef536d752ae", psbt1.getPsbtInputs().get(0).getFinalScriptSig().getProgramAsHex());
         Assert.assertEquals("2200208c2353173743b595dfb4a07b72ba8e42e3797da74e87fe7d9d7497e3b2028903", psbt1.getPsbtInputs().get(1).getFinalScriptSig().getProgramAsHex());
-        Assert.assertEquals("0400473044022062eb7a556107a7c73f45ac4ab5a1dddf6f7075fb1275969a7f383efff784bcb202200c05dbb7470dbf2f08557dd356c7325c1ed30913e996cd3840945db12228da5f01473044022065f45ba5998b59a27ffe1a7bed016af1f1f90d54b3aa8f7450aa5f56a25103bd02207f724703ad1edb96680b284b56d4ffcb88f7fb759eabbe08aa30f29b851383d20147522103089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc21023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7352ae", psbt1.getPsbtInputs().get(1).getFinalScriptWitness().toByteArray());
+        Assert.assertEquals("0400473044022062eb7a556107a7c73f45ac4ab5a1dddf6f7075fb1275969a7f383efff784bcb202200c05dbb7470dbf2f08557dd356c7325c1ed30913e996cd3840945db12228da5f01473044022065f45ba5998b59a27ffe1a7bed016af1f1f90d54b3aa8f7450aa5f56a25103bd02207f724703ad1edb96680b284b56d4ffcb88f7fb759eabbe08aa30f29b851383d20147522103089dc10c7ac6db54f91329af617333db388cead0c231f723379d1b99030b02dc21023add904f3d6dcf59ddb906b0dee23529b7ffb9ed50e5e86151926860221f0e7352ae", Hex.toHexString(psbt1.getPsbtInputs().get(1).getFinalScriptWitness().toByteArray()));
     }
 }