Merge pull request #4861 from SomberNight/blockchain_fork_ids

blockchain: generalise fork handling and follow most work chain
2018-11-28 12:54:57 +01:00
parent e12af33626 65ce3deeaa
commit d062548e41
9 changed files with 511 additions and 170 deletions
--- a/electrum/tests/test_wallet.py
+++ b/electrum/tests/test_wallet.py
@@ -71,7 +71,6 @@ class TestWalletStorage(WalletTestCase):
            storage.put(key, value)
        storage.write()

-        contents = ""
        with open(self.wallet_path, "r") as f:
            contents = f.read()
        self.assertEqual(some_dict, json.loads(contents))