Cleanup

solana-labs · Sep 29, 2020 · 39f5ade · 39f5ade
1 parent ff80165
commit 39f5ade
Show file tree

Hide file tree

Showing 8 changed files with 361 additions and 305 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/storage-bigtable/Cargo.toml b/storage-bigtable/Cargo.toml
@@ -28,10 +28,6 @@ futures = "0.3.5"
 tonic = {version="0.3.0", features = ["tls", "transport"]}
 zstd = "0.5.1"
 
-[build-dependencies]
-prost-build = "0.6"
-protobuf = "1.2"
-
 [lib]
 crate-type = ["lib"]
 name = "solana_storage_bigtable"

diff --git a/storage-bigtable/build-proto/src/main.rs b/storage-bigtable/build-proto/src/main.rs
@@ -15,5 +15,21 @@ fn main() -> Result<(), std::io::Error> {
         .compile(
             &[googleapis.join("google/bigtable/v2/bigtable.proto")],
             &[googleapis],
+        )?;
+
+    let out_dir = manifest_dir.join("../src/proto");
+    let proto_files = manifest_dir.join("../src/proto");
+
+    println!("Protobuf directory: {}", proto_files.display());
+    println!("output directory: {}", out_dir.display());
+
+    tonic_build::configure()
+        .build_client(true)
+        .build_server(false)
+        .format(true)
+        .out_dir(&out_dir)
+        .compile(
+            &[proto_files.join("confirmed_block.proto")],
+            &[proto_files],
         )
 }
diff --git a/storage-bigtable/build.rs b/storage-bigtable/build.rs