chore: mv client.rs into rust dir (#62)

* chore: mv client.rs into rust dir

i think the best practice is:
a Cargo.toml inlcude just [workspace]
libsolana_geyser_grpc in 'cargo new lib_geyser_grpc'
client in 'cargo new client'

finally the dir is
/Cargo.toml
/lib_geyser_grpc/Cargo.toml
/lib_geyser_grpc/src/
/client/Cargo.toml
/client/src/client.rs

* Moved rust code to subprojects/workspace (#63)

* Moved to submodules

* Moved config-check binary path

---------

Co-authored-by: Linus Kendall <git@linuskendall.com>

Cargo.lock

@@ -2664,6 +2664,30 @@ dependencies = [
  "vergen",
 ]
 
+[[package]]
+name = "solana-geyser-grpc-client"
+version = "0.5.2+solana.1.14.15"
+dependencies = [
+ "anyhow",
+ "backoff",
+ "cargo-lock",
+ "clap",
+ "futures",
+ "git-version",
+ "hyper",
+ "lazy_static",
+ "log",
+ "prost",
+ "protobuf-src",
+ "solana-geyser-grpc",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tonic",
+ "tonic-build",
+ "vergen",
+]
+
 [[package]]
 name = "solana-geyser-plugin-interface"
 version = "1.14.15"

Cargo.toml

@@ -1,41 +1,8 @@
-[package]
-name = "solana-geyser-grpc"
-version = "0.5.2+solana.1.14.15"
-authors = ["Triton One"]
-edition = "2021"
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[dependencies]
-anyhow = "1.0.62"
-bincode = "1.3.3"
-clap = { version = "3.2.22", features = ["cargo", "derive"] }
-futures = "0.3.24"
-hyper = { version = "0.14.20", features = ["server"] }
-lazy_static = "1.4.0"
-log = "0.4.17"
-prometheus = "0.13.2"
-prost = "0.11.0"
-serde = { version = "1.0.145", features = ["derive"] }
-serde_json = "1.0.86"
-solana-geyser-plugin-interface = "=1.14.15"
-solana-logger = "=1.14.15"
-solana-sdk = "=1.14.15"
-solana-transaction-status = "=1.14.15"
-tokio = { version = "1.21.2", features = ["rt-multi-thread", "macros", "time"] }
-tokio-stream = "0.1.11"
-tonic = { version = "0.8.2", features = ["gzip", "tls", "tls-roots"] }
-backoff = { version = "0.4.0", features = ["tokio"] }
-thiserror = "1.0"
-
-[build-dependencies]
-anyhow = "1.0.62"
-cargo-lock = "8.0.2"
-git-version = "0.3.5"
-protobuf-src = "1.1.0"
-tonic-build = "0.8.2"
-vergen = "=7.2.1"
+[workspace]
+members = [
+    "solana-geyser-grpc",
+    "rust",
+]
 
 [patch.crates-io]
 solana-geyser-plugin-interface = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.14.15-geyser-block-v2" }

rust/Cargo.toml

@@ -0,0 +1,33 @@
+[package]
+name = "solana-geyser-grpc-client"
+version = "0.5.2+solana.1.14.15"
+authors = ["Triton One"]
+edition = "2021"
+
+[[bin]]
+name = "client"
+path = "client/client.rs"
+
+[dependencies]
+anyhow = "1.0.62"
+clap = { version = "3.2.22", features = ["cargo", "derive"] }
+futures = "0.3.24"
+hyper = { version = "0.14.20", features = ["server"] }
+lazy_static = "1.4.0"
+log = "0.4.17"
+prost = "0.11.0"
+tokio = { version = "1.21.2", features = ["rt-multi-thread", "macros", "time"] }
+tokio-stream = "0.1.11"
+tonic = { version = "0.8.2", features = ["gzip", "tls", "tls-roots"] }
+backoff = { version = "0.4.0", features = ["tokio"] }
+thiserror = "1.0"
+solana-geyser-grpc = { path = "../solana-geyser-grpc" }
+
+[build-dependencies]
+anyhow = "1.0.62"
+cargo-lock = "8.0.2"
+git-version = "0.3.5"
+protobuf-src = "1.1.0"
+tonic-build = "0.8.2"
+vergen = "=7.2.1"
+

solana-geyser-grpc/Cargo.toml

@@ -0,0 +1,42 @@
+[package]
+name = "solana-geyser-grpc"
+version = "0.5.2+solana.1.14.15"
+authors = ["Triton One"]
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[[bin]]
+name = "config-check"
+path = "src/bin/config-check.rs"
+
+[dependencies]
+anyhow = "1.0.62"
+bincode = "1.3.3"
+clap = { version = "3.2.22", features = ["cargo", "derive"] }
+futures = "0.3.24"
+hyper = { version = "0.14.20", features = ["server"] }
+lazy_static = "1.4.0"
+log = "0.4.17"
+prometheus = "0.13.2"
+prost = "0.11.0"
+serde = { version = "1.0.145", features = ["derive"] }
+serde_json = "1.0.86"
+solana-geyser-plugin-interface = "=1.14.15"
+solana-logger = "=1.14.15"
+solana-sdk = "=1.14.15"
+solana-transaction-status = "=1.14.15"
+tokio = { version = "1.21.2", features = ["rt-multi-thread", "macros", "time"] }
+tokio-stream = "0.1.11"
+tonic = { version = "0.8.2", features = ["gzip", "tls", "tls-roots"] }
+backoff = { version = "0.4.0", features = ["tokio"] }
+thiserror = "1.0"
+
+[build-dependencies]
+anyhow = "1.0.62"
+cargo-lock = "8.0.2"
+git-version = "0.3.5"
+protobuf-src = "1.1.0"
+tonic-build = "0.8.2"
+vergen = "=7.2.1"

solana-geyser-grpc/build.rs

@@ -12,7 +12,7 @@ fn main() -> anyhow::Result<()> {
 
 fn compile_protos() -> anyhow::Result<()> {
     std::env::set_var("PROTOC", protobuf_src::protoc());
-    tonic_build::compile_protos("proto/geyser.proto")?;
+    tonic_build::compile_protos("../proto/geyser.proto")?;
     Ok(())
 }