maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2448 from patricklodder/1.14.4-fix-acceptblock

Browse source 
qa: fix p2p-acceptblock
This commit is contained in:
Ross Nicoll 2021-08-14 08:55:33 +01:00 committed by GitHub
parent 23ba9e1644 6aff1141f4
commit c49da8b6f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qa/pull-tester/rpc-tests.py
View file

@ -116,6 +116,7 @@ testScripts = [
'wallet-dump.py', 'wallet-dump.py',
'listtransactions.py', 'listtransactions.py',
# vv Tests less than 60s vv # vv Tests less than 60s vv
'p2p-acceptblock.py',
'sendheaders.py', 'sendheaders.py',
'zapwallettxes.py', 'zapwallettxes.py',
'importmulti.py', 'importmulti.py',
@ -191,7 +192,6 @@ testScriptsExt = [
'forknotify.py', 'forknotify.py',
'invalidateblock.py', 'invalidateblock.py',
'maxblocksinflight.py', 'maxblocksinflight.py',
'p2p-acceptblock.py',
] ]

10
qa/rpc-tests/p2p-acceptblock.py
View file

@ -39,7 +39,7 @@ The test:
it's missing an intermediate block. it's missing an intermediate block.
Node1 should reorg to this longer chain. Node1 should reorg to this longer chain.
4b.Send 288 more blocks on the longer chain. 4b.Send 1440 more blocks on the longer chain.
Node0 should process all but the last block (too far ahead in height). Node0 should process all but the last block (too far ahead in height).
Send all headers to Node1, and then send the last block in that chain. Send all headers to Node1, and then send the last block in that chain.
Node1 should accept the block because it's coming from a whitelisted peer. Node1 should accept the block because it's coming from a whitelisted peer.
@ -206,14 +206,14 @@ class AcceptBlockTest(BitcoinTestFramework):
assert_equal(self.nodes[1].getblockcount(), 3) assert_equal(self.nodes[1].getblockcount(), 3)
print("Successfully reorged to length 3 chain from whitelisted peer") print("Successfully reorged to length 3 chain from whitelisted peer")
# 4b. Now mine 288 more blocks and deliver; all should be processed but # 4b. Now mine 1440 more blocks and deliver; all should be processed but
# the last (height-too-high) on node0. Node1 should process the tip if # the last (height-too-high) on node0. Node1 should process the tip if
# we give it the headers chain leading to the tip. # we give it the headers chain leading to the tip.
tips = blocks_h3 tips = blocks_h3
headers_message = msg_headers() headers_message = msg_headers()
all_blocks = [] # node0's blocks all_blocks = [] # node0's blocks
for j in range(2): for j in range(2):
for i in range(288): for i in range(1440):
next_block = create_block(tips[j].sha256, create_coinbase(i + 4), tips[j].nTime+1) next_block = create_block(tips[j].sha256, create_coinbase(i + 4), tips[j].nTime+1)
next_block.solve() next_block.solve()
if j==0: if j==0:
@ -224,7 +224,7 @@ class AcceptBlockTest(BitcoinTestFramework):
tips[j] = next_block tips[j] = next_block
time.sleep(2) time.sleep(2)
# Blocks 1-287 should be accepted, block 288 should be ignored because it's too far ahead # Blocks 1-1439 should be accepted, block 1440 should be ignored because it's too far ahead
for x in all_blocks[:-1]: for x in all_blocks[:-1]:
self.nodes[0].getblock(x.hash) self.nodes[0].getblock(x.hash)
assert_raises_jsonrpc(-1, "Block not found on disk", self.nodes[0].getblock, all_blocks[-1].hash) assert_raises_jsonrpc(-1, "Block not found on disk", self.nodes[0].getblock, all_blocks[-1].hash)
@ -270,7 +270,7 @@ class AcceptBlockTest(BitcoinTestFramework):
test_node.send_message(msg_block(blocks_h2f[0])) test_node.send_message(msg_block(blocks_h2f[0]))
test_node.sync_with_ping() test_node.sync_with_ping()
assert_equal(self.nodes[0].getblockcount(), 290) assert_equal(self.nodes[0].getblockcount(), 1442)
print("Successfully reorged to longer chain from non-whitelisted peer") print("Successfully reorged to longer chain from non-whitelisted peer")
[ c.disconnect_node() for c in connections ] [ c.disconnect_node() for c in connections ]

2
qa/rpc-tests/test_framework/blocktools.py
View file

@ -11,7 +11,7 @@ from .script import CScript, OP_TRUE, OP_CHECKSIG, OP_RETURN
def create_block(hashprev, coinbase, nTime=None): def create_block(hashprev, coinbase, nTime=None):
block = CBlock() block = CBlock()
# Dogecoin: Create a non-AuxPoW block but include chain ID # Dogecoin: Create a non-AuxPoW block but include chain ID
block.nVersion = 0x620003 block.nVersion = 0x620004
if nTime is None: if nTime is None:
import time import time
block.nTime = int(time.time()+600) block.nTime = int(time.time()+600)