Skip to content

Commit

Permalink
Javadoc format corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
Ross Nicoll authored and schildbach committed Jul 28, 2015
1 parent 0f0c7ba commit 16a5e1d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,20 @@
* depth-first traversal is performed, consuming bits and hashes as they were written during encoding.</p>
*
* <p>The serialization is fixed and provides a hard guarantee about the encoded size,
* <tt>SIZE <= 10 + ceil(32.25*N)</tt> where N represents the number of leaf nodes of the partial tree. N itself
* <tt>SIZE &lt;= 10 + ceil(32.25*N)</tt> where N represents the number of leaf nodes of the partial tree. N itself
* is bounded by:</p>
*
* <p>
* N <= total_transactions<br>
* N <= 1 + matched_transactions*tree_height
* N &lt;= total_transactions<br>
* N &lt;= 1 + matched_transactions*tree_height
* </p>
*
* <p><pre>The serialization format:
* - uint32 total_transactions (4 bytes)
* - varint number of hashes (1-3 bytes)
* - uint256[] hashes in depth-first order (<= 32*N bytes)
* - uint256[] hashes in depth-first order (&lt;= 32*N bytes)
* - varint number of bytes of flag bits (1-3 bytes)
* - byte[] flag bits, packed per 8 in a byte, least significant bit first (<= 2*N-1 bits)
* - byte[] flag bits, packed per 8 in a byte, least significant bit first (&lt;= 2*N-1 bits)
* The size constraints follow from this.</pre></p>
*/
public class PartialMerkleTree extends Message {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/bitcoinj/core/Transaction.java
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public Transaction(NetworkParameters params, byte[] payload, int offset, @Nullab
}

/**
* Creates a transaction by reading payload starting from offset bytes in. Length of a transaction is fixed.
* Creates a transaction by reading payload. Length of a transaction is fixed.
*/
public Transaction(NetworkParameters params, byte[] payload, @Nullable Message parent, boolean parseLazy, boolean parseRetain, int length)
throws ProtocolException {
Expand Down

0 comments on commit 16a5e1d

Please sign in to comment.