mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-25 07:07:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Replace Block.fakeClock with Utils.mockClock

Browse source
This commit is contained in:
Matt Corallo 2013-05-22 18:45:04 +02:00 • committed by Mike Hearn
parent 5369ca925a
commit fb912322ff
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/src/main/java/com/google/bitcoin/core/Block.java
View file

@ -70,9 +70,6 @@ public class Block extends Message {
/** A value for difficultyTarget (nBits) that allows half of all possible hash solutions. Used in unit testing. */
public static final long EASIEST_DIFFICULTY_TARGET = 0x207fFFFFL;
// For unit testing. If not zero, use this instead of the current time.
static long fakeClock = 0;
// Fields defined as part of the protocol format.
private long version;
private Sha256Hash prevBlockHash;
@ -627,7 +624,7 @@ public class Block extends Message {
private void checkTimestamp() throws VerificationException {
maybeParseHeader();
// Allow injection of a fake clock to allow unit testing.
long currentTime = fakeClock != 0 ? fakeClock : System.currentTimeMillis() / 1000;
long currentTime = Utils.now().getTime()/1000;
if (time > currentTime + ALLOWED_TIME_DRIFT)
throw new VerificationException("Block too far in future");
}

8
core/src/main/java/com/google/bitcoin/core/Utils.java
View file

@ -432,6 +432,14 @@ public class Utils {
return mockTime;
}
/**
* Sets the mock clock to the given time (in seconds)
* @param mockClock
*/
public static void setMockClock(long mockClock) {
mockTime = new Date(mockClock * 1000);
}
/**
* Returns the current time, or a mocked out equivalent.
*/

10
core/src/test/java/com/google/bitcoin/core/BlockChainTest.java
View file

@ -170,23 +170,23 @@ public class BlockChainTest {
// Add a bunch of blocks in a loop until we reach a difficulty transition point. The unit test params have an
// artificially shortened period.
Block prev = unitTestParams.getGenesisBlock();
Block.fakeClock = System.currentTimeMillis() / 1000;
Utils.setMockClock(System.currentTimeMillis()/1000);
for (int i = 0; i < unitTestParams.getInterval() - 1; i++) {
Block newBlock = prev.createNextBlock(coinbaseTo, Block.fakeClock);
Block newBlock = prev.createNextBlock(coinbaseTo, Utils.now().getTime()/1000);
assertTrue(chain.add(newBlock));
prev = newBlock;
// The fake chain should seem to be "fast" for the purposes of difficulty calculations.
Block.fakeClock += 2;
Utils.rollMockClock(2);
}
// Now add another block that has no difficulty adjustment, it should be rejected.
try {
chain.add(prev.createNextBlock(coinbaseTo, Block.fakeClock));
chain.add(prev.createNextBlock(coinbaseTo, Utils.now().getTime()/1000));
fail();
} catch (VerificationException e) {
}
// Create a new block with the right difficulty target given our blistering speed relative to the huge amount
// of time it's supposed to take (set in the unit test network parameters).
Block b = prev.createNextBlock(coinbaseTo, Block.fakeClock);
Block b = prev.createNextBlock(coinbaseTo, Utils.now().getTime()/1000);
b.setDifficultyTarget(0x201fFFFFL);
b.solve();
assertTrue(chain.add(b));