nits

Signed-off-by: Sam Batschelet <[email protected]>

Author: hexfusion

spacesvm/src/api/client.rs

@@ -53,9 +53,8 @@ impl Client<HttpConnector> {
         Id::Num(id)
     }
 
-    pub fn set_endpoint(mut self, endpoint: Uri) -> Self {
+    pub fn set_endpoint(&mut self, endpoint: Uri) {
         self.endpoint = endpoint;
-        self
     }
 
     pub fn set_private_key(mut self, private_key: Key) -> Self {

tests/e2e/src/tests/mod.rs

@@ -1,15 +1,16 @@
 use std::{
     fs,
     path::Path,
+    str::FromStr,
     thread,
     time::{Duration, Instant},
 };
 
 use avalanche_network_runner_sdk::{BlockchainSpec, Client, GlobalConfig, StartRequest};
-use avalanche_types::subnet;
+use avalanche_types::{ids, subnet};
 use spacesvm::{
     self,
-    api::client::{claim_tx, get_or_create_pk, Uri},
+    api::client::{claim_tx, get_or_create_pk, set_tx, Uri},
 };
 
 #[tokio::test]
@@ -180,19 +181,34 @@ async fn e2e() {
         log::info!("{}: {}", node_name, iv.uri);
         rpc_eps.push(iv.uri.clone());
     }
+    let mut blockchain_id = ids::Id::empty();
+    for (k, v) in cluster_info.custom_chains.iter() {
+        log::info!("custom chain info: {}={:?}", k, v);
+        if v.chain_name == "spacesvm" {
+            blockchain_id = ids::Id::from_str(&v.chain_id).unwrap();
+            break;
+        }
+    }
+
+    log::info!("avalanchego RPC endpoints: {:?}", rpc_eps);
 
-    let ep = format!(
-        "{}/{}",
-        rpc_eps[0].to_owned(),
-        spacesvm::vm::PUBLIC_API_ENDPOINT
-    );
     let private_key = get_or_create_pk("/tmp/.spacesvm-cli-pk").expect("generate new private key");
+    let chain_url = format!("{}/ext/bc/{}/public", rpc_eps[0], blockchain_id);
+    let mut scli =
+        spacesvm::api::client::Client::new(chain_url.parse::<Uri>().expect("valid endpoint"))
+            .set_private_key(private_key);
+    for ep in rpc_eps.iter() {
+        let chain_url = format!("{}/ext/bc/{}/public", ep, blockchain_id)
+            .parse::<Uri>()
+            .expect("valid endpoint");
+        scli.set_endpoint(chain_url);
+        let resp = scli.ping().await.unwrap();
+        log::info!("ping response from {}: {:?}", ep, resp);
+
+        thread::sleep(Duration::from_millis(300));
+    }
 
-    let mut scli = spacesvm::api::client::Client::new(ep.parse::<Uri>().expect("valid endpoint"))
-        .set_private_key(private_key);
-    log::info!("ping request...");
-    let resp = scli.ping().await.expect("ping success");
-    log::info!("ping response from {}: {:?}", ep, resp);
+    scli.set_endpoint(chain_url.parse::<Uri>().expect("valid endpoint"));
 
     log::info!("decode claim tx request...");
     let resp = scli
@@ -208,6 +224,20 @@ async fn e2e() {
         .expect("issue_tx success");
     log::info!("issue claim tx response from {}: {:?}", ep, resp);
 
+    log::info!("decode set tx request...");
+    let resp = scli
+        .decode_tx(set_tx("test", "foo", "bar"))
+        .await
+        .expect("decodeTx success");
+    log::info!("decode set response from {}: {:?}", ep, resp);
+
+    log::info!("issue set tx request...");
+    let resp = scli
+        .issue_tx(&resp.typed_data)
+        .await
+        .expect("issue_tx success");
+    log::info!("issue tx tx response from {}: {:?}", ep, resp);
+
     if crate::get_network_runner_enable_shutdown() {
         log::info!("shutdown is enabled... stopping...");
         let _resp = cli.stop().await.expect("failed stop");