DeterministicKeyChain, DeterministicHierarchy: add putKeys(), and use it

core/src/main/java/org/bitcoinj/crypto/DeterministicHierarchy.java

@@ -69,6 +69,14 @@ public class DeterministicHierarchy {
         keys.put(path, key);
     }
 
+    /**
+     * Inserts a list of keys into the hierarchy
+     * @param keys A list of keys to put in the hierarchy
+     */
+    public final void putKeys(List<DeterministicKey> keys) {
+        keys.forEach(this::putKey);
+    }
+
     /**
      * Returns a key for the given path, optionally creating it.
      *

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

@@ -505,8 +505,7 @@ public class DeterministicKeyChain implements EncryptableKeyChain {
             // It's safe to do this because when a network thread tries to calculate a Bloom filter, we'll go ahead
             // and calculate the full lookahead zone there, so network requests will always use the right amount.
             List<DeterministicKey> lookahead = maybeLookAhead(parentKey, index, 0, 0);
-            basicKeyChain.importKeys(lookahead);
+            putKeys(lookahead);
-            lookahead.forEach(hierarchy::putKey);
             List<DeterministicKey> keys = new ArrayList<>(numberOfKeys);
             for (int i = 0; i < numberOfKeys; i++) {
                 HDPath path = parentKey.getPath().extend(new ChildNumber(index - numberOfKeys + i, false));
@@ -530,6 +529,11 @@ public class DeterministicKeyChain implements EncryptableKeyChain {
         basicKeyChain.importKey(key);
     }
 
+    private void putKeys(List<DeterministicKey> keys) {
+        hierarchy.putKeys(keys);
+        basicKeyChain.importKeys(keys);
+    }
+
     private void checkForBitFlip(DeterministicKey k) {
         DeterministicKey parent = checkNotNull(k.getParent());
         byte[] rederived = HDKeyDerivation.deriveChildKeyBytesFromPublic(parent, k.getChildNumber(), HDKeyDerivation.PublicDeriveMode.WITH_INVERSION).keyBytes;
@@ -1184,8 +1188,7 @@ public class DeterministicKeyChain implements EncryptableKeyChain {
                 // Batch add all keys at once so there's only one event listener invocation, as this will be listened to
                 // by the wallet and used to rebuild/broadcast the Bloom filter. That's expensive so we don't want to do
                 // it more often than necessary.
-                basicKeyChain.importKeys(keys);
+                putKeys(keys);
-                keys.forEach(hierarchy::putKey);
             }
         } finally {
             lock.unlock();