From 6278dc39b1e883fef0ed8fb538cc7b4fee01e9eb Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas.schildbach@bloq.com>
Date: Wed, 6 Feb 2019 15:33:35 +0100
Subject: [PATCH] KeyChainGroup: Inline method makeP2SHOutputScript().

---
 core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java
index 5aae7af6..6f2e7bd3 100644
--- a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java
+++ b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java
@@ -132,7 +132,9 @@ public class KeyChainGroup implements KeyBag {
 
         if (isMarried()) {
             for (Map.Entry<KeyChain.KeyPurpose, DeterministicKey> entry : this.currentKeys.entrySet()) {
-                Address address = makeP2SHOutputScript(entry.getValue(), getActiveKeyChain()).getToAddress(params);
+                Address address = ScriptBuilder
+                        .createP2SHOutputScript(getActiveKeyChain().getRedeemData(entry.getValue()).redeemScript)
+                        .getToAddress(params);
                 currentAddresses.put(entry.getKey(), address);
             }
         }
@@ -624,10 +626,6 @@ public class KeyChainGroup implements KeyBag {
         throw new UnsupportedOperationException();   // Unused.
     }
 
-    private Script makeP2SHOutputScript(DeterministicKey followedKey, DeterministicKeyChain chain) {
-        return ScriptBuilder.createP2SHOutputScript(chain.getRedeemData(followedKey).redeemScript);
-    }
-
     /** Adds a listener for events that are run when keys are added, on the user thread. */
     public void addEventListener(KeyChainEventListener listener) {
         addEventListener(listener, Threading.USER_THREAD);