AaronFiore/electrum
1
0
Fork 0
Code Activity

blockchain.py: rename 'checkpoint' to 'forkpoint'

Browse Source
This commit is contained in:
SomberNight
2018-08-03 18:25:53 +02:00
parent 7307c800d7
commit 531cdeffa9
6 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/network.py
View File

@@ -964,7 +964,7 @@ class Network(util.DaemonThread):
interface.blockchain = branch.parent()
next_height = interface.bad
else:
interface.print_error('checkpoint conflicts with existing fork', branch.path())
interface.print_error('forkpoint conflicts with existing fork', branch.path())
branch.write(b'', 0)
branch.save_header(interface.bad_header)
interface.mode = 'catch_up'
@@ -980,7 +980,7 @@ class Network(util.DaemonThread):
with self.blockchains_lock:
self.blockchains[interface.bad] = b
interface.blockchain = b
interface.print_error("new chain", b.checkpoint)
interface.print_error("new chain", b.forkpoint)
interface.mode = 'catch_up'
maybe_next_height = interface.bad + 1
if maybe_next_height <= interface.tip:
@@ -1143,7 +1143,7 @@ class Network(util.DaemonThread):
@with_interface_lock
def blockchain(self):
if self.interface and self.interface.blockchain is not None:
self.blockchain_index = self.interface.blockchain.checkpoint
self.blockchain_index = self.interface.blockchain.forkpoint
return self.blockchains[self.blockchain_index]
@with_interface_lock