DeterministicKeyChain, MarriedKeyChain: migrate to Network from NetworkParameters

Author: schildbach

core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java

@@ -1453,7 +1453,7 @@ public String toString() {
         return helper.toString();
     }
 
-    public String toString(boolean includeLookahead, boolean includePrivateKeys, @Nullable AesKey aesKey, NetworkParameters params) {
+    public String toString(boolean includeLookahead, boolean includePrivateKeys, @Nullable AesKey aesKey, Network network) {
         final DeterministicKey watchingKey = getWatchingKey();
         final StringBuilder builder = new StringBuilder();
         if (seed != null) {
@@ -1487,15 +1487,21 @@ public String toString(boolean includeLookahead, boolean includePrivateKeys, @Nu
             builder.append("\n");
         }
         builder.append("Ouput script type: ").append(outputScriptType).append('\n');
-        builder.append("Key to watch:      ").append(watchingKey.serializePubB58(params.network(), outputScriptType))
+        builder.append("Key to watch:      ").append(watchingKey.serializePubB58(network, outputScriptType))
                 .append('\n');
         builder.append("Lookahead siz/thr: ").append(lookaheadSize).append('/').append(lookaheadThreshold).append('\n');
-        formatAddresses(includeLookahead, includePrivateKeys, aesKey, params, builder);
+        formatAddresses(includeLookahead, includePrivateKeys, aesKey, network, builder);
         return builder.toString();
     }
 
+    /** @deprecated use {@link #toString(boolean, boolean, AesKey, Network)} */
+    @Deprecated
+    public String toString(boolean includeLookahead, boolean includePrivateKeys, @Nullable AesKey aesKey, NetworkParameters params) {
+        return toString(includeLookahead, includePrivateKeys, aesKey, params.network());
+    }
+
     protected void formatAddresses(boolean includeLookahead, boolean includePrivateKeys, @Nullable AesKey aesKey,
-            NetworkParameters params, StringBuilder builder) {
+            Network network, StringBuilder builder) {
         for (DeterministicKey key : getKeys(includeLookahead, true)) {
             String comment = null;
             if (key.equals(getRootKey()))
@@ -1510,7 +1516,7 @@ else if (internalParentKey.equals(key.getParent()) && key.getChildNumber().i() >
                 comment = "*";
             else if (externalParentKey.equals(key.getParent()) && key.getChildNumber().i() >= issuedExternalKeys)
                 comment = "*";
-            key.formatKeyWithAddress(includePrivateKeys, aesKey, builder, params.network(), outputScriptType, comment);
+            key.formatKeyWithAddress(includePrivateKeys, aesKey, builder, network, outputScriptType, comment);
         }
     }
 

core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java

@@ -1137,7 +1137,7 @@ public String toString(boolean includeLookahead, boolean includePrivateKeys, @Nu
             builder.append(basic.toString(includePrivateKeys, aesKey, params.network()));
         if (chains != null)
             for (DeterministicKeyChain chain : chains)
-                builder.append(chain.toString(includeLookahead, includePrivateKeys, aesKey, params)).append('\n');
+                builder.append(chain.toString(includeLookahead, includePrivateKeys, aesKey, params.network())).append('\n');
         return builder.toString();
     }
 

core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java

@@ -17,12 +17,12 @@
 package org.bitcoinj.wallet;
 
 import com.google.protobuf.ByteString;
+import org.bitcoinj.base.Network;
 import org.bitcoinj.base.ScriptType;
 import org.bitcoinj.crypto.AesKey;
 import org.bitcoinj.base.internal.ByteUtils;
 import org.bitcoinj.core.BloomFilter;
 import org.bitcoinj.crypto.ECKey;
-import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.crypto.ChildNumber;
 import org.bitcoinj.crypto.DeterministicKey;
 import org.bitcoinj.crypto.KeyCrypter;
@@ -254,18 +254,18 @@ public List<Protos.Key> serializeToProtobuf() {
 
     @Override
     protected void formatAddresses(boolean includeLookahead, boolean includePrivateKeys, @Nullable AesKey aesKey,
-            NetworkParameters params, StringBuilder builder) {
+            Network network, StringBuilder builder) {
         for (DeterministicKeyChain followingChain : followingKeyChains)
-            builder.append("Following chain:  ").append(followingChain.getWatchingKey().serializePubB58(params.network()))
+            builder.append("Following chain:  ").append(followingChain.getWatchingKey().serializePubB58(network))
                     .append('\n');
         builder.append('\n');
         for (RedeemData redeemData : marriedKeysRedeemData.values())
-            formatScript(ScriptBuilder.createP2SHOutputScript(redeemData.redeemScript), builder, params);
+            formatScript(ScriptBuilder.createP2SHOutputScript(redeemData.redeemScript), builder, network);
     }
 
-    private void formatScript(Script script, StringBuilder builder, NetworkParameters params) {
+    private void formatScript(Script script, StringBuilder builder, Network network) {
         builder.append("  addr:");
-        builder.append(script.getToAddress(params.network()));
+        builder.append(script.getToAddress(network));
         builder.append("  hash160:");
         builder.append(ByteUtils.formatHex(script.getPubKeyHash()));
         script.creationTime().ifPresent(creationTime -> builder.append("  creationTimeSeconds:").append(creationTime));