Merge pull request #974 from cyyber/master

Genesis Headerhash Updated
theQRL · Feb 26, 2018 · b45410d · b45410d
2 parents afd0157 + 3c057b2
commit b45410d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/qrl/core/config.py b/qrl/core/config.py
@@ -101,7 +101,7 @@ def __init__(self):
 
         self.version = version
         self.required_version = '0.0.'
-        self.genesis_prev_headerhash = b'The Sharp Blade'
+        self.genesis_prev_headerhash = b'Feersum Endjinn'
 
         ################################################################
         # Warning: Don't change following configuration.               #
@@ -152,7 +152,7 @@ def __init__(self):
         self.slave_dat_filename = 'slave.qrl'
         self.banned_peers_filename = 'banned_peers.qrl'
 
-        self.genesis_timestamp = 1517695543
+        self.genesis_timestamp = 1519600074
 
         # ======================================
         #       DIFFICULTY CONTROLLER

diff --git a/tests/core/test_ChainManager.py b/tests/core/test_ChainManager.py
@@ -186,7 +186,7 @@ def test_orphan_block(self):
                     alice_xmss = get_alice_xmss()
 
                     with mock.patch('qrl.core.misc.ntp.getTime') as time_mock:
-                        time_mock.return_value = 1517696848  # Very high to get an easy difficulty
+                        time_mock.return_value = 1519601174  # Very high to get an easy difficulty
                         block_1 = Block.create(block_number=1,
                                                prevblock_headerhash=genesis_block.headerhash,
                                                transactions=[],
@@ -206,7 +206,7 @@ def test_orphan_block(self):
                     bob_xmss = get_bob_xmss()
 
                     with mock.patch('qrl.core.misc.ntp.getTime') as time_mock:
-                        time_mock.return_value = 1517696848 + devconfig.minimum_minting_delay * 2
+                        time_mock.return_value = 1519601174 + devconfig.minimum_minting_delay * 2
                         block = Block.create(block_number=1,
                                              prevblock_headerhash=genesis_block.headerhash,
                                              transactions=[],
@@ -219,14 +219,14 @@ def test_orphan_block(self):
                             block.set_mining_nonce(block.mining_nonce + 1)
 
                     with mock.patch('qrl.core.misc.ntp.getTime') as time_mock:
-                        time_mock.return_value = 1517696848 + devconfig.minimum_minting_delay * 3
+                        time_mock.return_value = 1519601174 + devconfig.minimum_minting_delay * 3
                         block_2 = Block.create(block_number=2,
                                                prevblock_headerhash=block.headerhash,
                                                transactions=[],
                                                signing_xmss=bob_xmss,
                                                master_address=bob_xmss.address,
                                                nonce=2)
-                        block_2.set_mining_nonce(17)
+                        block_2.set_mining_nonce(10)
 
                     result = chain_manager.add_block(block_2)
                     self.assertTrue(result)