highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-27 07:18:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Accept unrequested blocks with work equal to our tip

Browse Source 
This is a simple change that makes our accept requirements the
same as our request requirements, (ever so slightly) further
decoupling our consensus logic from our FindNextBlocksToDownload
logic in net_processing.

Github-Pull: #11531
Rebased-From: 932f118e6a
This commit is contained in:
Matt Corallo
2017-10-11 16:04:13 -04:00
committed by MarcoFalke
parent c6e4d0ce82
commit 51001d684b
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/functional/p2p-acceptblock.py
View File

@@ -142,8 +142,7 @@ class AcceptBlockTest(BitcoinTestFramework):
assert(tip_entry_found)
# But this block should be accepted by node since it has equal work.
# TODO: We currently drop this block but likely shouldn't
#self.nodes[0].getblock(block_h2f.hash)
self.nodes[0].getblock(block_h2f.hash)
self.log.info("Second height 2 block accepted, but not reorg'ed to")
# 4b. Now send another block that builds on the forking chain.
@@ -215,7 +214,6 @@ class AcceptBlockTest(BitcoinTestFramework):
test_node.wait_for_verack()
test_node.send_message(msg_block(block_h1f))
test_node.send_message(msg_block(block_h2f)) # This should not be required
test_node.sync_with_ping()
assert_equal(self.nodes[0].getblockcount(), 2)
@@ -239,7 +237,6 @@ class AcceptBlockTest(BitcoinTestFramework):
# 7. Send the missing block for the third time (now it is requested)
test_node.send_message(msg_block(block_h1f))
test_node.send_message(msg_block(block_h2f)) # This should not be required
test_node.sync_with_ping()
assert_equal(self.nodes[0].getblockcount(), 290)