Try #350:

nervosnetwork · Mar 22, 2019 · 0c187fc · 0c187fc
2 parents 567e6d7 + dd5f8b6
commit 0c187fc
Show file tree

Hide file tree

Showing 25 changed files with 544 additions and 320 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ fmt:
 	cargo fmt ${VERBOSE} --all -- --check
 
 clippy:
-	cargo clippy ${VERBOSE} --all --all-targets --all-features -- -D warnings -D clippy::clone_on_ref_ptr -D clippy::enum_glob_use
+	cargo clippy ${VERBOSE} --all --all-targets --all-features -- -D warnings -D clippy::clone_on_ref_ptr -D clippy::enum_glob_use -D clippy::fallible_impl_from
 
 
 ci: fmt clippy test

diff --git a/network/src/service/discovery_service.rs b/network/src/service/discovery_service.rs
@@ -65,7 +65,7 @@ impl ServiceProtocol for DiscoveryProtocol {
                         Ok(())
                     })
             })
-            .unwrap();
+            .expect("Discovery init only once");
         control.future_task(discovery_task);
     }
 

diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml
@@ -15,3 +15,4 @@ siphasher = "0.3.0"
 rand = "0.6"
 ckb-util = { path = "../util" }
 ckb-merkle-tree = { path = "../util/merkle-tree"}
+failure = "0.1.5"
diff --git a/protocol/src/builder.rs b/protocol/src/builder.rs
@@ -622,6 +622,7 @@ mod tests {
     use ckb_core::block::BlockBuilder;
     use ckb_core::header::HeaderBuilder;
     use ckb_core::transaction::TransactionBuilder;
+    use ckb_util::TryInto;
     use flatbuffers::get_root;
 
     #[test]
@@ -632,7 +633,7 @@ mod tests {
         builder.finish(b, None);
 
         let fbs_header = get_root::<FbsHeader>(builder.finished_data());
-        assert_eq!(header, fbs_header.into());
+        assert_eq!(header, fbs_header.try_into().unwrap());
     }
 
     #[test]
@@ -645,7 +646,7 @@ mod tests {
         builder.finish(b, None);
 
         let fbs_block = get_root::<FbsBlock>(builder.finished_data());
-        assert_eq!(block, fbs_block.into());
+        assert_eq!(block, fbs_block.try_into().unwrap());
     }
 
     #[test]
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,7 @@ impl ServiceProtocol for DiscoveryProtocol { @@
                             Ok(())
                         })
                 })
-                .unwrap();
+                .expect("Discovery init only once");
             control.future_task(discovery_task);
         }
@@ Expand Down @@