Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-13 10:45:51 +00:00
Code Issues Projects Releases Wiki Activity

Block.parseHeader() and Block.parseTransactions() are now protected, so they can be called from subclasses.

Browse Source
This commit is contained in:
Ross Nicoll 2015-05-26 00:02:20 +01:00 committed by Mike Hearn
parent e030f1a1f4
commit 4e8f1bb153
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/org/bitcoinj/core/Block.java
View File

@ -180,7 +180,7 @@ public class Block extends Message {
hash = null; hash = null;
} }
private void parseHeader() throws ProtocolException { protected void parseHeader() throws ProtocolException {
if (headerParsed) if (headerParsed)
return; return;
@ -198,7 +198,7 @@ public class Block extends Message {
headerBytesValid = parseRetain; headerBytesValid = parseRetain;
} }
private void parseTransactions() throws ProtocolException { protected void parseTransactions() throws ProtocolException {
if (transactionsParsed) if (transactionsParsed)
return; return;
@ -561,6 +561,12 @@ public class Block extends Message {
public Block cloneAsHeader() { public Block cloneAsHeader() {
maybeParseHeader(); maybeParseHeader();
Block block = new Block(params); Block block = new Block(params);
copyBitcoinHeaderTo(block);
return block;
}
/** Copy the block without transactions into the provided empty block. */
protected final void copyBitcoinHeaderTo(final Block block) {
block.nonce = nonce; block.nonce = nonce;
block.prevBlockHash = prevBlockHash; block.prevBlockHash = prevBlockHash;
block.merkleRoot = getMerkleRoot(); block.merkleRoot = getMerkleRoot();
@ -569,7 +575,6 @@ public class Block extends Message {
block.difficultyTarget = difficultyTarget; block.difficultyTarget = difficultyTarget;
block.transactions = null; block.transactions = null;
block.hash = getHash(); block.hash = getHash();
return block;
} }
/** /**