diff --git a/core/src/main/java/org/bitcoinj/params/AbstractBitcoinNetParams.java b/core/src/main/java/org/bitcoinj/params/AbstractBitcoinNetParams.java index 9600ce9d..42279be0 100644 --- a/core/src/main/java/org/bitcoinj/params/AbstractBitcoinNetParams.java +++ b/core/src/main/java/org/bitcoinj/params/AbstractBitcoinNetParams.java @@ -54,11 +54,11 @@ public abstract class AbstractBitcoinNetParams extends NetworkParameters { /** * Checks if we are at a difficulty transition point. - * @param storedPrev The previous stored block + * @param height The height of the previous stored block * @return If this is a difficulty transition point */ - protected boolean isDifficultyTransitionPoint(StoredBlock storedPrev) { - return ((storedPrev.getHeight() + 1) % this.getInterval()) == 0; + public final boolean isDifficultyTransitionPoint(final int height) { + return ((height + 1) % this.getInterval()) == 0; } @Override @@ -67,7 +67,7 @@ public abstract class AbstractBitcoinNetParams extends NetworkParameters { Block prev = storedPrev.getHeader(); // Is this supposed to be a difficulty transition point? - if (!isDifficultyTransitionPoint(storedPrev)) { + if (!isDifficultyTransitionPoint(storedPrev.getHeight())) { // No ... so check the difficulty didn't actually change. if (nextBlock.getDifficultyTarget() != prev.getDifficultyTarget()) diff --git a/core/src/main/java/org/bitcoinj/params/TestNet3Params.java b/core/src/main/java/org/bitcoinj/params/TestNet3Params.java index 02ccbe16..f2c224da 100644 --- a/core/src/main/java/org/bitcoinj/params/TestNet3Params.java +++ b/core/src/main/java/org/bitcoinj/params/TestNet3Params.java @@ -89,7 +89,7 @@ public class TestNet3Params extends AbstractBitcoinNetParams { @Override public void checkDifficultyTransitions(final StoredBlock storedPrev, final Block nextBlock, final BlockStore blockStore) throws VerificationException, BlockStoreException { - if (!isDifficultyTransitionPoint(storedPrev) && nextBlock.getTime().after(testnetDiffDate)) { + if (!isDifficultyTransitionPoint(storedPrev.getHeight()) && nextBlock.getTime().after(testnetDiffDate)) { Block prev = storedPrev.getHeader(); // After 15th February 2012 the rules on the testnet change to avoid people running up the difficulty