Multiserver connection & Load Balancer

hhanh00 · Oct 11, 2024 · 26f21a8 · 26f21a8
1 parent 4535696
commit 26f21a8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,6 +26,8 @@ tracing-subscriber = { version = "0.3.18", features = [ "env-filter" ] }
 tokio = { version = "1.40", features = ["rt-multi-thread"] }
 tokio-stream = "0.1.15"
 tonic = { version = "0.12", features = ["tls", "tls-native-roots", "tls-webpki-roots"] }
+tower = "0.4.13"
+hyper = "1.4.1"
 prost = "0.13"
 hex = { version = "0.4", features = ["serde"] }
 fpdec = "0.10.3"

diff --git a/dart-warp b/dart-warp
diff --git a/warp-macros/src/lib.rs b/warp-macros/src/lib.rs
@@ -122,7 +122,6 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let mut has_connection = false;
     let mut mut_connection = false;
     let mut has_client = false;
-    let mut has_url = false;
     for input in inputs.iter() {
         if let FnArg::Typed(pat) = input {
             if let Pat::Ident(param) = pat.pat.as_ref() {
@@ -140,10 +139,6 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
                         has_network = true;
                         continue;
                     }
-                    "url" => {
-                        has_url = true;
-                        continue;
-                    }
                     "connection" => {
                         has_connection = true;
                         if type_name == "& mut Connection" {
@@ -234,13 +229,6 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
     } else {
         quote! {}
     };
-    let url = if has_url {
-        quote! {
-            let url = coin_def.config.lwd_url.clone().unwrap();
-        }
-    } else {
-        quote! {}
-    };
     let connection = if has_connection {
         if mut_connection {
             quote! {
@@ -257,7 +245,7 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
     };
     let client = if has_client {
         quote! {
-            let mut client = coin_def.connect_lwd().await?;
+            let mut client = coin_def.connect_lwd()?;
             let client = &mut client;
         }
     } else {
@@ -292,7 +280,6 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
                     #coin
                     #network
                     #connection
-                    #url
                     #client
                     #(#convs)*
                     #ident(#(#args),*).await
@@ -315,7 +302,6 @@ pub fn c_export(_attr: TokenStream, item: TokenStream) -> TokenStream {
                     #coin
                     #network
                     #connection
-                    #url
                     #client
                     #(#convs)*
                     #ident(#(#args),*)

diff --git a/ywallet b/ywallet
diff --git a/zcash-warp b/zcash-warp
+2 −0		Cargo.toml
+1 −1		flatbuffers/data.fbs
+25 −19		src/cli.rs
+59 −3		src/coin.rs
+35 −22		src/generated/data_generated.rs
+3 −3		src/lwd.rs
+2 −1		src/main.rs
+6 −6		src/txdetails.rs
+3 −3		src/utils.rs
+4 −13		src/utils/tx.rs
+14 −21		src/warp/sync.rs