diff --git a/core/src/main/java/org/bitcoinj/core/Transaction.java b/core/src/main/java/org/bitcoinj/core/Transaction.java index 67ad9e517..0b11343c4 100644 --- a/core/src/main/java/org/bitcoinj/core/Transaction.java +++ b/core/src/main/java/org/bitcoinj/core/Transaction.java @@ -1425,7 +1425,7 @@ public class Transaction extends BaseMessage { size += in.getMessageSize(); size += VarInt.sizeOf(outputs.size()); for (TransactionOutput out : outputs) - size += out.getMessageSize(); + size += out.messageSize(); if (useSegwit) for (TransactionInput in : inputs) size += in.getWitness().getMessageSize(); diff --git a/core/src/main/java/org/bitcoinj/core/TransactionOutput.java b/core/src/main/java/org/bitcoinj/core/TransactionOutput.java index 06654c296..017df8cb6 100644 --- a/core/src/main/java/org/bitcoinj/core/TransactionOutput.java +++ b/core/src/main/java/org/bitcoinj/core/TransactionOutput.java @@ -145,7 +145,7 @@ public class TransactionOutput { * @return byte array containing the transaction output */ public byte[] serialize() { - return write(ByteBuffer.allocate(getMessageSize())).array(); + return write(ByteBuffer.allocate(messageSize())).array(); } /** @deprecated use {@link #serialize()} */ @@ -160,12 +160,20 @@ public class TransactionOutput { * * @return size of the serialized message in bytes */ - public int getMessageSize() { + public int messageSize() { int size = Coin.BYTES; // value size += VarInt.sizeOf(scriptBytes.length) + scriptBytes.length; 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/test/java/org/bitcoinj/core/TransactionOutputTest.java b/core/src/test/java/org/bitcoinj/core/TransactionOutputTest.java index 2c9a9c0c5..d1db4cd35 100644 --- a/core/src/test/java/org/bitcoinj/core/TransactionOutputTest.java +++ b/core/src/test/java/org/bitcoinj/core/TransactionOutputTest.java @@ -129,7 +129,7 @@ public class TransactionOutputTest extends TestWithWallet { @Test @Parameters(method = "randomOutputs") public void write(TransactionOutput output) { - ByteBuffer buf = ByteBuffer.allocate(output.getMessageSize()); + ByteBuffer buf = ByteBuffer.allocate(output.messageSize()); output.write(buf); assertFalse(buf.hasRemaining()); } diff --git a/core/src/test/java/org/bitcoinj/core/TransactionTest.java b/core/src/test/java/org/bitcoinj/core/TransactionTest.java index d5771df81..4b152a59e 100644 --- a/core/src/test/java/org/bitcoinj/core/TransactionTest.java +++ b/core/src/test/java/org/bitcoinj/core/TransactionTest.java @@ -184,7 +184,7 @@ public class TransactionTest { // add fake transaction output TransactionOutput output = new TransactionOutput(null, Coin.COIN, ADDRESS); tx.addOutput(output); - length += output.getMessageSize(); + length += output.messageSize(); // message size has now grown assertEquals(length, tx.messageSize());