Message, TransactionInput, TransactionOutput, TransactionOutPoint, Tr…

…ansactionWitness, PartialMerkleTree: remove deprecated method getMessageSize()
schildbach · Sep 2, 2024 · b76f0db · b76f0db
1 parent a1cc811
commit b76f0db
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 76 deletions.
diff --git a/core/src/main/java/org/bitcoinj/core/Message.java b/core/src/main/java/org/bitcoinj/core/Message.java
@@ -34,14 +34,6 @@ public interface Message {
      */
     int messageSize();
 
-    /**
-     * @deprecated use {@link #messageSize()}
-     */
-    @Deprecated
-    default int getMessageSize() {
-        return messageSize();
-    }
-
     /**
      * Serialize this message to a byte array that conforms to the Bitcoin wire protocol.
      *

diff --git a/core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java b/core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java
@@ -161,14 +161,6 @@ public int messageSize() {
         return size;
     }
 
-    /**
-     * @deprecated Use {@link #messageSize()}
-     */
-    @Deprecated
-    public int getMessageSize() {
-        return messageSize();
-    }
-
     // Based on CPartialMerkleTree::TraverseAndBuild in Bitcoin Core.
     private static void traverseAndBuild(int height, int pos, List<Sha256Hash> allLeafHashes, byte[] includeBits,
                                          List<Boolean> matchedChildBits, List<Sha256Hash> resultHashes) {

diff --git a/core/src/main/java/org/bitcoinj/core/TransactionInput.java b/core/src/main/java/org/bitcoinj/core/TransactionInput.java
@@ -198,14 +198,6 @@ public int messageSize() {
         return size;
     }
 
-    /**
-     * @deprecated Use {@link #messageSize()}
-     */
-    @Deprecated
-    public int getMessageSize() {
-        return messageSize();
-    }
-
     /**
      * Coinbase transactions have special inputs with hashes of zero. If this is such an input, returns true.
      */

diff --git a/core/src/main/java/org/bitcoinj/core/TransactionOutPoint.java b/core/src/main/java/org/bitcoinj/core/TransactionOutPoint.java
@@ -117,12 +117,6 @@ public byte[] serialize() {
         return write(ByteBuffer.allocate(BYTES)).array();
     }
 
-    /** @deprecated use {@link #BYTES} */
-    @Deprecated
-    public int getMessageSize() {
-        return BYTES;
-    }
-
     /**
      * An outpoint is a part of a transaction input that points to the output of another transaction. If we have both
      * sides in memory, and they have been linked together, this returns a pointer to the connected output, or null

diff --git a/core/src/main/java/org/bitcoinj/core/TransactionOutput.java b/core/src/main/java/org/bitcoinj/core/TransactionOutput.java
@@ -160,14 +160,6 @@ public int messageSize() {
         return size;
     }
 
-    /**
-     * @deprecated Use {@link #messageSize()}
-     */
-    @Deprecated
-    public int getMessageSize() {
-        return messageSize();
-    }
-
     /**
      * Returns the value of this output. This is the amount of currency that the destination address
      * receives.

diff --git a/core/src/main/java/org/bitcoinj/core/TransactionWitness.java b/core/src/main/java/org/bitcoinj/core/TransactionWitness.java
@@ -154,14 +154,6 @@ public int messageSize() {
         return size;
     }
 
-    /**
-     * @deprecated Use {@link #messageSize()}
-     */
-    @Deprecated
-    public int getMessageSize() {
-        return messageSize();
-    }
-
     @Override
     public String toString() {
         List<String> stringPushes = new ArrayList<>(pushes.size());

diff --git a/core/src/test/java/org/bitcoinj/core/FullBlockTestGenerator.java b/core/src/test/java/org/bitcoinj/core/FullBlockTestGenerator.java
@@ -1233,9 +1233,9 @@ public boolean add(Rule element) {
             checkState(stream.size() == b64Original.block.messageSize() + 8);
             // This check fails because it was created for "retain mode" and the likely encoding is not "optimal".
             // We since removed this capability retain the original encoding, but could not rewrite this test data.
-            // checkState(stream.size() == b64.getMessageSize());
+            // checkState(stream.size() == b64.messageSize());
             // checkState(Arrays.equals(stream.toByteArray(), b64.serialize()));
-            // checkState(b64.getOptimalEncodingMessageSize() == b64Original.block.getMessageSize());
+            // checkState(b64.getOptimalEncodingMessageSize() == b64Original.block.messageSize());
         }
         blocks.add(new BlockAndValidity(b64, true, false, b64.getHash(), chainHeadHeight + 19, "b64"));
         spendableOutputs.offer(b64Original.getCoinbaseOutput());

diff --git a/core/src/test/java/org/bitcoinj/core/MessageTest.java b/core/src/test/java/org/bitcoinj/core/MessageTest.java
diff --git a/core/src/test/java/org/bitcoinj/core/TransactionOutPointTest.java b/core/src/test/java/org/bitcoinj/core/TransactionOutPointTest.java
@@ -58,7 +58,6 @@ private Iterator<TransactionOutPoint> randomOutPoints() {
     public void deprecatedMembers() {
         TransactionOutPoint outpoint = TransactionOutPoint.UNCONNECTED;
         outpoint.getHash();
-        outpoint.getMessageSize();
         outpoint.getIndex();
     }
 }