From 5220fb51418e8e746a347639b9144773230d8a72 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Mon, 11 Aug 2014 19:21:25 +0200 Subject: [PATCH] Hide some fields in PartialMerkleTree --- .../java/com/google/bitcoin/core/FilteredBlock.java | 2 +- .../com/google/bitcoin/core/PartialMerkleTree.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/google/bitcoin/core/FilteredBlock.java b/core/src/main/java/com/google/bitcoin/core/FilteredBlock.java index 3fcb7c57..12888a6c 100644 --- a/core/src/main/java/com/google/bitcoin/core/FilteredBlock.java +++ b/core/src/main/java/com/google/bitcoin/core/FilteredBlock.java @@ -115,6 +115,6 @@ public class FilteredBlock extends Message { /** Number of transactions in this block, before it was filtered */ public int getTransactionCount() { - return merkleTree.transactionCount; + return merkleTree.getTransactionCount(); } } diff --git a/core/src/main/java/com/google/bitcoin/core/PartialMerkleTree.java b/core/src/main/java/com/google/bitcoin/core/PartialMerkleTree.java index 7d10829c..d06fb3fe 100644 --- a/core/src/main/java/com/google/bitcoin/core/PartialMerkleTree.java +++ b/core/src/main/java/com/google/bitcoin/core/PartialMerkleTree.java @@ -50,13 +50,13 @@ import java.util.List; */ public class PartialMerkleTree extends Message { // the total number of transactions in the block - int transactionCount; + private int transactionCount; // node-is-parent-of-matched-txid bits - byte[] matchedChildBits; + private byte[] matchedChildBits; // txids and internal hashes - List hashes; + private List hashes; public PartialMerkleTree(NetworkParameters params, byte[] payloadBytes, int offset) throws ProtocolException { super(params, payloadBytes, offset); @@ -176,4 +176,8 @@ public class PartialMerkleTree extends Message { return merkleRoot; } + + public int getTransactionCount() { + return transactionCount; + } }