From c8caff20cd6b688a4c6d28113d64d12b28fe2977 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas.schildbach@bloq.com>
Date: Sat, 2 Feb 2019 16:33:16 +0100
Subject: [PATCH] Transaction: Rename parameters redeemScript and
 connectedScript to scriptCode in witness signature methods.

---
 .../java/org/bitcoinj/core/Transaction.java   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/bitcoinj/core/Transaction.java b/core/src/main/java/org/bitcoinj/core/Transaction.java
index fea3b004..0ffe6da7 100644
--- a/core/src/main/java/org/bitcoinj/core/Transaction.java
+++ b/core/src/main/java/org/bitcoinj/core/Transaction.java
@@ -1186,33 +1186,33 @@ public class Transaction extends ChildMessage {
     public TransactionSignature calculateWitnessSignature(
             int inputIndex,
             ECKey key,
-            byte[] redeemScript,
+            byte[] scriptCode,
             Coin value,
             SigHash hashType,
             boolean anyoneCanPay) {
-        Sha256Hash hash = hashForSignatureWitness(inputIndex, redeemScript, value, hashType, anyoneCanPay);
+        Sha256Hash hash = hashForSignatureWitness(inputIndex, scriptCode, value, hashType, anyoneCanPay);
         return new TransactionSignature(key.sign(hash), hashType, anyoneCanPay);
     }
 
     public TransactionSignature calculateWitnessSignature(
             int inputIndex,
             ECKey key,
-            Script redeemScript,
+            Script scriptCode,
             Coin value,
             SigHash hashType,
             boolean anyoneCanPay) {
-        return calculateWitnessSignature(inputIndex, key, redeemScript.getProgram(), value, hashType, anyoneCanPay);
+        return calculateWitnessSignature(inputIndex, key, scriptCode.getProgram(), value, hashType, anyoneCanPay);
     }
 
     public TransactionSignature calculateWitnessSignature(
             int inputIndex,
             ECKey key,
             @Nullable KeyParameter aesKey,
-            byte[] redeemScript,
+            byte[] scriptCode,
             Coin value,
             SigHash hashType,
             boolean anyoneCanPay) {
-        Sha256Hash hash = hashForSignatureWitness(inputIndex, redeemScript, value, hashType, anyoneCanPay);
+        Sha256Hash hash = hashForSignatureWitness(inputIndex, scriptCode, value, hashType, anyoneCanPay);
         return new TransactionSignature(key.sign(hash, aesKey), hashType, anyoneCanPay);
     }
 
@@ -1220,11 +1220,11 @@ public class Transaction extends ChildMessage {
             int inputIndex,
             ECKey key,
             @Nullable KeyParameter aesKey,
-            Script redeemScript,
+            Script scriptCode,
             Coin value,
             SigHash hashType,
             boolean anyoneCanPay) {
-        return calculateWitnessSignature(inputIndex, key, aesKey, redeemScript.getProgram(), value, hashType, anyoneCanPay);
+        return calculateWitnessSignature(inputIndex, key, aesKey, scriptCode.getProgram(), value, hashType, anyoneCanPay);
     }
 
     public synchronized Sha256Hash hashForSignatureWitness(
@@ -1263,7 +1263,7 @@ public class Transaction extends ChildMessage {
 
     public synchronized Sha256Hash hashForSignatureWitness(
             int inputIndex,
-            byte[] connectedScript,
+            byte[] scriptCode,
             Coin prevValue,
             byte sigHashType){
         ByteArrayOutputStream bos = new UnsafeByteArrayOutputStream(length == UNKNOWN_LENGTH ? 256 : length + 4);
@@ -1318,7 +1318,7 @@ public class Transaction extends ChildMessage {
             bos.write(hashSequence);
             bos.write(inputs.get(inputIndex).getOutpoint().getHash().getReversedBytes());
             uint32ToByteStreamLE(inputs.get(inputIndex).getOutpoint().getIndex(), bos);
-            bos.write(connectedScript);
+            bos.write(scriptCode);
             uint64ToByteStreamLE(BigInteger.valueOf(prevValue.getValue()), bos);
             uint32ToByteStreamLE(inputs.get(inputIndex).getSequenceNumber(), bos);
             bos.write(hashOutputs);