Merge #1664 #1669 #1671 #1673

1664: chore: update get_block_template rpc doc r=quake,u2,keroro520,yangby-cryptape a=shaojunda replace difficulty with compact_target 1669: chore(test): Allow CI debug logs r=u2,zhangsoledad a=keroro520 The number of logs is acceptable after #1474. 1671: test: disconnect check by all part r=u2,keroro520,quake a=driftluo Disconnect check by all part 1673: docs: Update PoW mining algorithm description r=u2,quake a=ashchan Now that this has been decided the doc should reflect that before the next round of mining test. Co-authored-by: shaojunda <[email protected]> Co-authored-by: keroro520 <[email protected]> Co-authored-by: driftluo <[email protected]> Co-authored-by: James Chen <[email protected]>
nervosnetwork · Oct 10, 2019 · cd3bbd1 · cd3bbd1
5 parents 186539b + c60d730 + d6aa09a + 1498d48 + 1946d89
commit cd3bbd1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ TBD.
 
 ## Mining
 
-Mining on testnet Rylai is for testing purpose only, the mining algorithm **WILL BE CHANGED SOON**.
+Testnet Rylai uses the [Eaglesong](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0010-eaglesong/0010-eaglesong.md) mining algorithm, which the mainnet is going to use too. Mining on testnet is for testing purpose only.
 
 At this time Rylai will be **RESET** every two weeks.
 

diff --git a/rpc/README.md b/rpc/README.md
@@ -1533,10 +1533,10 @@ http://localhost:8114
             },
             "hash": "0x076049e2cc6b9f1ed4bb27b2337c55071dabfaf0183b1b17a4965bd0372d8dec"
         },
+        "compact_target": "0x100",
         "current_time": "0x16d6269e84f",
         "cycles_limit": "0x2540be400",
         "dao": "0x004fb9e277860700b2f80165348723003d1862ec960000000028eb3d7e7a0100",
-        "difficulty": "0x100",
         "epoch": "0x3e80001000000",
         "number": "0x1",
         "parent_hash": "0xd5c495b7dd4d9d066a6a4d4356bc31955ad3199e0d856f34cfbe159c46ee335b",

diff --git a/rpc/json/rpc.json b/rpc/json/rpc.json
@@ -1304,7 +1304,7 @@
             "current_time": "0x16d6269e84f",
             "cycles_limit": "0x2540be400",
             "dao": "0x004fb9e277860700b2f80165348723003d1862ec960000000028eb3d7e7a0100",
-            "difficulty": "0x100",
+            "compact_target": "0x100",
             "epoch": "0x3e80001000000",
             "number": "0x1",
             "parent_hash": "0xd5c495b7dd4d9d066a6a4d4356bc31955ad3199e0d856f34cfbe159c46ee335b",

diff --git a/test/src/node.rs b/test/src/node.rs
@@ -461,11 +461,6 @@ impl Node {
             message: Default::default(),
         });
 
-        if ::std::env::var("CI").is_ok() {
-            ckb_config.logger.filter =
-                Some(::std::env::var("CKB_LOG").unwrap_or_else(|_| "info".to_string()));
-        }
-
         modify_ckb_config(&mut ckb_config);
         fs::write(
             &ckb_config_path,

diff --git a/test/src/specs/sync/ibd_process.rs b/test/src/specs/sync/ibd_process.rs
@@ -139,6 +139,17 @@ impl Spec for IBDProcessWithWhiteList {
         }
 
         node6.disconnect(node0);
+
+        // Make sure both sides are disconnected
+        let is_disconnect_already = wait_until(10, || {
+            let peers = rpc_client0.get_peers();
+            peers.iter().any(|peer| peer.node_id == node6.node_id())
+        });
+
+        if is_disconnect_already {
+            panic!("node6 can't disconnect with node0");
+        }
+
         node6.generate_blocks(2);
 
         let generate_res = wait_until(10, || net.nodes[6].get_tip_block_number() == 2);
@@ -147,7 +158,8 @@ impl Spec for IBDProcessWithWhiteList {
             panic!("node6 can't generate blocks to 2");
         }
 
-        node0.connect_uncheck(node6);
+        // Make sure node0 re-connect with node6
+        node0.connect(node6);
 
         // IBD only with outbound/whitelist node
         let rpc_client1 = node1.rpc_client();