merge some upstream improvements, set new checkpoint blockhigh

2020-02-06 21:37:53 +01:00
parent 36a49e3941
commit 8f64f9e0df
14 changed files with 1746 additions and 1701 deletions
--- a/lib/build.rs
+++ b/lib/build.rs
@@ -1,12 +1,11 @@
-fn main() {
-    // Build proto files
-    tower_grpc_build::Config::new()
-        .enable_server(false)
-        .enable_client(true)
-        .build(
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    tonic_build::configure()
+         .build_server(false)
+         .compile(
            &["proto/service.proto", "proto/compact_formats.proto"],
            &["proto"],
-        )
-        .unwrap_or_else(|e| panic!("protobuf compilation failed: {}", e));
+         )?;
    println!("cargo:rerun-if-changed=proto/service.proto");
-}
+    Ok(())
+ }
+