Update protobuf dependencies (#150)

Author: mohanson

Cargo.lock

@@ -10,5 +10,5 @@ authors = ["Nervos Core Dev <dev@nervos.org>"]
 
 [dependencies]
 clap = { version = "4.0.27", features = ["cargo"] }
-protobuf = { version = "2.25.1", features = ["with-bytes", "with-serde"] }
+protobuf = { version = "3.7", features = ["with-bytes"] }
 ckb-vm-pprof-protos = { path = "../ckb-vm-pprof-protos", version = "0.119.0" }

ckb-vm-pprof-converter/Cargo.toml

@@ -133,9 +133,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         samples.push(sample);
     }
     let samples_value =
-        profile::ValueType { field_type: strings[CYCLES] as i64, unit: strings[COUNT] as i64, ..Default::default() };
+        profile::ValueType { type_: strings[CYCLES] as i64, unit: strings[COUNT] as i64, ..Default::default() };
     let time_value =
-        profile::ValueType { field_type: strings[CPU] as i64, unit: strings[NANOSECONDS] as i64, ..Default::default() };
+        profile::ValueType { type_: strings[CPU] as i64, unit: strings[NANOSECONDS] as i64, ..Default::default() };
     let profile = profile::Profile {
         sample_type: vec![samples_value, time_value.clone()].into(),
         sample: samples.into(),

ckb-vm-pprof-converter/src/main.rs

@@ -9,10 +9,10 @@ authors = ["Nervos Core Dev <dev@nervos.org>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-protoc-rust = "2.0"
+protobuf-codegen = "3.7"
 
 [target.'cfg(target_os = "linux")'.build-dependencies]
-protoc-bin-vendored = "3.0.0"
+protoc-bin-vendored = "3.1"
 
 [dependencies]
-protobuf = { version = "2.25.1", features = ["with-bytes", "with-serde"] }
+protobuf = { version = "3.7", features = ["with-bytes"] }

ckb-vm-pprof-protos/Cargo.toml

@@ -1,10 +1,10 @@
-extern crate protoc_rust;
+extern crate protobuf_codegen;
 
 fn main() {
-    let mut codegen = protoc_rust::Codegen::new();
+    let mut codegen = protobuf_codegen::Codegen::new();
     #[cfg(target_os = "linux")]
     {
-        codegen.protoc_path(protoc_bin_vendored::protoc_bin_path().unwrap());
+        codegen.protoc_path(&protoc_bin_vendored::protoc_bin_path().unwrap());
     }
     codegen.out_dir("src").inputs(&["protos/profile.proto"]).include("protos").run().expect("protoc");
 }

ckb-vm-pprof-protos/build.rs

@@ -0,0 +1,3 @@
+// @generated
+
+pub mod profile;

ckb-vm-pprof-protos/src/mod.rs

@@ -17,5 +17,5 @@ ckb-vm = { version = "= 0.24.12", default-features = false, features = ["asm"] }
 log = "0.4.16"
 nix = "0.23.1"
 lazy_static = "1.4.0"
-protobuf = { version = "2.25.1", features = ["with-bytes", "with-serde"] }
+protobuf = { version = "3.7", features = ["with-bytes"] }
 ckb-vm-pprof-protos = { path = "../ckb-vm-pprof-protos", version = "0.119.0" }

ckb-vm-signal-profiler/Cargo.toml

@@ -111,12 +111,12 @@ impl Report {
             samples.push(sample);
         }
         let samples_value = protos::ValueType {
-            field_type: strings[SAMPLES] as i64,
+            type_: strings[SAMPLES] as i64,
             unit: strings[COUNT] as i64,
             ..Default::default()
         };
         let time_value = protos::ValueType {
-            field_type: strings[CPU] as i64,
+            type_: strings[CPU] as i64,
             unit: strings[NANOSECONDS] as i64,
             ..Default::default()
         };