Merge branch 'master' of github.com:dukeh3/bitcoinj

Author: Rene Malmgren

base/src/main/java/org/bitcoinj/base/utils/Fiat.java

@@ -112,7 +112,7 @@ public Fiat add(final Fiat value) {
 
     public Fiat subtract(final Fiat value) {
         checkArgument(value.currencyCode.equals(currencyCode), () ->
-                "values to substract must be of same currency: " + value.currencyCode + " vs " + currencyCode);
+                "values to subtract must be of same currency: " + value.currencyCode + " vs " + currencyCode);
         return new Fiat(currencyCode, Math.subtractExact(this.value, value.value));
     }
 

base/src/test/java/org/bitcoinj/base/internal/StopwatchTest.java

@@ -36,7 +36,8 @@ public void setUp() {
 
     @Test
     public void toString_() {
-        stopwatch.toString();
+        String string = stopwatch.toString();
+        assertTrue(string.endsWith(" ms"));
     }
 
     @Test
@@ -45,7 +46,7 @@ public void stop() {
     }
 
     @Test
-    public void addSubstract() {
+    public void addSubtract() {
         Instant i1 = Instant.now();
         Instant i2 = i1.plus(stopwatch.stop());
         Instant i3 = i2.minus(stopwatch);

core/src/main/java/org/bitcoinj/core/BloomFilter.java

@@ -358,7 +358,7 @@ public synchronized boolean applyAndUpdate(Transaction tx) {
             for (ScriptChunk chunk : script.chunks()) {
                 if (!chunk.isPushData())
                     continue;
-                if (contains(chunk.data)) {
+                if (contains(chunk.pushData())) {
                     boolean isSendingToPubKeys = ScriptPattern.isP2PK(script) || ScriptPattern.isSentToMultisig(script);
                     if (flag == BloomUpdate.UPDATE_ALL || (flag == BloomUpdate.UPDATE_P2PUBKEY_ONLY && isSendingToPubKeys))
                         insert(output.getOutPointFor());
@@ -372,7 +372,7 @@ public synchronized boolean applyAndUpdate(Transaction tx) {
                 return true;
             }
             for (ScriptChunk chunk : input.getScriptSig().chunks()) {
-                if (chunk.isPushData() && contains(chunk.data))
+                if (chunk.isPushData() && contains(chunk.pushData()))
                     return true;
             }
         }

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

@@ -16,13 +16,15 @@
 
 package org.bitcoinj.crypto;
 
-import java.util.List;
 import java.util.Locale;
 
 /**
- * <p>This is just a wrapper for the i (child number) as per BIP 32 with a boolean getter for the most significant bit
- * and a getter for the actual 0-based child number. A {@link List} of these forms a <i>path</i> through a
+ * This is just a wrapper for the i (child number) as per BIP 32 with a boolean getter for the most significant bit
+ * and a getter for the actual 0-based child number. A list of these forms a <i>path</i> through a
  * {@link DeterministicHierarchy}. This class is immutable.
+ * <p>
+ * This is a value-based class; use of identity-sensitive operations (including reference equality (==), identity
+ * hash code, or synchronization) on instances of {@code ChildNumber} may have unpredictable results and should be avoided.
  */
 public class ChildNumber implements Comparable<ChildNumber> {
     /**

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

@@ -79,7 +79,11 @@ public String toString() {
     private static final InternalUtils.Splitter SEPARATOR_SPLITTER = s -> Stream.of(s.split(SEPARATOR))
             .map(String::trim)
             .collect(Collectors.toList());
-    protected final int[] children;
+    /**
+     * Internal representation of {@code HDPath}, use should be limited to {@code HDPath} and its nested subclasses.
+     * Java doesn't give us an easy way to limit scope accordingly.
+     */
+    final int[] children;
 
     /** Partial path with BIP44 purpose */
     public static final HDPartialPath BIP44_PARENT = partial(ChildNumber.PURPOSE_BIP44);