sdk http crate rename

multiversx · Oct 2, 2024 · db46f48 · db46f48
1 parent a5d9948
commit db46f48
Show file tree

Hide file tree

Showing 37 changed files with 72 additions and 70 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ members = [
   "framework/wasm-adapter",
 
   "sdk/core",
-  "sdk/reqwest",
+  "sdk/http",
   "sdk/wbg",
   "sdk/scenario-format",
 

diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
@@ -29,9 +29,9 @@ path = "../scenario"
 version = "0.23.0"
 path = "../../sdk/scenario-format"
 
-[dependencies.multiversx-sdk-reqwest]
+[dependencies.multiversx-sdk-http]
 version = "=0.6.1"
-path = "../../sdk/reqwest"
+path = "../../sdk/http"
 
 [dev-dependencies]
 serde_json = "1.0"
diff --git a/framework/snippets/src/account_tool.rs b/framework/snippets/src/account_tool.rs
@@ -4,7 +4,7 @@ use multiversx_sc_scenario::{
     imports::Bech32Address,
     scenario_model::{Account, BytesKey, BytesValue, Scenario, SetStateStep, Step},
 };
-use multiversx_sdk_reqwest::gateway::GatewayHttpProxy;
+use multiversx_sdk_http::GatewayHttpProxy;
 use std::collections::{BTreeMap, HashMap};
 
 /// Called directly from CLI, from `sc-meta`.

diff --git a/framework/snippets/src/interactor.rs b/framework/snippets/src/interactor.rs
@@ -4,7 +4,7 @@ use multiversx_sc_scenario::{
     mandos_system::{run_list::ScenarioRunnerList, run_trace::ScenarioTraceFile},
     multiversx_sc::types::Address,
 };
-use multiversx_sdk_reqwest::gateway::GatewayHttpProxy;
+use multiversx_sdk_http::GatewayHttpProxy;
 use std::{
     collections::HashMap,
     path::{Path, PathBuf},

diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_call.rs b/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
@@ -5,7 +5,7 @@ use multiversx_sc_scenario::{
     scenario::ScenarioRunner,
     scenario_model::{ScCallStep, SetStateStep, TxCall},
 };
-use multiversx_sdk_reqwest::core::{data::transaction::Transaction, utils::base64_encode};
+use multiversx_sdk_http::core::{data::transaction::Transaction, utils::base64_encode};
 
 impl Interactor {
     pub async fn sc_call<S>(&mut self, mut sc_call_step: S)

diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs b/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
@@ -5,7 +5,7 @@ use multiversx_sc_scenario::{
     mandos_system::ScenarioRunner,
     scenario_model::{ScDeployStep, SetStateStep},
 };
-use multiversx_sdk_reqwest::core::{data::transaction::Transaction, utils::base64_encode};
+use multiversx_sdk_http::core::{data::transaction::Transaction, utils::base64_encode};
 
 impl Interactor {
     pub(crate) fn sc_deploy_to_blockchain_tx(&self, sc_deploy_step: &ScDeployStep) -> Transaction {

diff --git a/framework/snippets/src/interactor_scenario/interactor_vm_query.rs b/framework/snippets/src/interactor_scenario/interactor_vm_query.rs
@@ -8,7 +8,7 @@ use multiversx_sc_scenario::{
     multiversx_sc::{abi::TypeAbiFrom, codec::TopDecodeMulti, types::ContractCall},
     scenario_model::{ScQueryStep, TxResponse},
 };
-use multiversx_sdk_reqwest::core::{data::vm::VMQueryInput, utils::base64_decode};
+use multiversx_sdk_http::core::{data::vm::VMQueryInput, utils::base64_decode};
 
 impl Interactor {
     pub async fn sc_query<S>(&mut self, mut step: S) -> &mut Self

diff --git a/framework/snippets/src/lib.rs b/framework/snippets/src/lib.rs
@@ -16,8 +16,8 @@ pub use interactor_tx::*;
 pub use log;
 pub use multi::*;
 pub use multiversx_sc_scenario::{self, multiversx_sc};
-pub use multiversx_sdk_reqwest::core as sdk_core;
-pub use multiversx_sdk_reqwest::core as sdk;
+pub use multiversx_sdk_http::core as sdk_core;
+pub use multiversx_sdk_http::core as sdk;
 pub use tokio;
 
 /// Imports normally needed in interactors, grouped together.

diff --git a/sdk/core/src/gateway.rs b/sdk/core/src/gateway.rs
@@ -76,8 +76,10 @@ pub trait GatewayRequest: Send {
 }
 
 pub trait GatewayAsyncService: Send {
-    fn request<G>(&self, request: G) -> impl std::future::Future<Output = anyhow::Result<G::Result>> + Send
+    fn request<G>(
+        &self,
+        request: G,
+    ) -> impl std::future::Future<Output = anyhow::Result<G::Result>> + Send
     where
         G: GatewayRequest;
 }
-
diff --git a/sdk/reqwest/Cargo.toml → sdk/http/Cargo.toml b/sdk/reqwest/Cargo.toml → sdk/http/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "multiversx-sdk-reqwest"
+name = "multiversx-sdk-http"
 version = "0.6.1"
 edition = "2021"
 

diff --git a/sdk/reqwest/README.md → sdk/http/README.md b/sdk/reqwest/README.md → sdk/http/README.md
diff --git a/sdk/reqwest/examples/account.rs → sdk/http/examples/account.rs b/sdk/reqwest/examples/account.rs → sdk/http/examples/account.rs
@@ -1,5 +1,5 @@
 use multiversx_sdk::data::address::Address;
-use multiversx_sdk_reqwest::gateway::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {

diff --git a/sdk/reqwest/examples/account_storage.rs → sdk/http/examples/account_storage.rs b/sdk/reqwest/examples/account_storage.rs → sdk/http/examples/account_storage.rs
@@ -1,5 +1,5 @@
 use multiversx_sdk::data::address::Address;
-use multiversx_sdk_reqwest::gateway::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {

diff --git a/sdk/reqwest/examples/generate_mnemonic.rs → sdk/http/examples/generate_mnemonic.rs b/sdk/reqwest/examples/generate_mnemonic.rs → sdk/http/examples/generate_mnemonic.rs
diff --git a/sdk/reqwest/examples/get_esdt_tokens.rs → sdk/http/examples/get_esdt_tokens.rs b/sdk/reqwest/examples/get_esdt_tokens.rs → sdk/http/examples/get_esdt_tokens.rs
@@ -1,5 +1,5 @@
 use multiversx_sdk::data::address::Address;
-use multiversx_sdk_reqwest::gateway::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {

diff --git a/...qwest/examples/get_hyper_block_by_hash.rs → sdk/http/examples/get_hyper_block_by_hash.rs b/...qwest/examples/get_hyper_block_by_hash.rs → sdk/http/examples/get_hyper_block_by_hash.rs
@@ -1,4 +1,4 @@
-use multiversx_sdk_reqwest::gateway::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {

diff --git a/...west/examples/get_hyper_block_by_nonce.rs → ...http/examples/get_hyper_block_by_nonce.rs b/...west/examples/get_hyper_block_by_nonce.rs → ...http/examples/get_hyper_block_by_nonce.rs
@@ -1,4 +1,4 @@
-use multiversx_sdk_reqwest::gateway::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {

diff --git a/...eqwest/examples/get_hyper_block_latest.rs → sdk/http/examples/get_hyper_block_latest.rs b/...eqwest/examples/get_hyper_block_latest.rs → sdk/http/examples/get_hyper_block_latest.rs
@@ -1,4 +1,4 @@
-use multiversx_sdk_reqwest::gateway::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {

diff --git a/sdk/reqwest/examples/get_network_config.rs → sdk/http/examples/get_network_config.rs b/sdk/reqwest/examples/get_network_config.rs → sdk/http/examples/get_network_config.rs
@@ -1,4 +1,4 @@
-use multiversx_sdk_reqwest::gateway::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {

diff --git a/...reqwest/examples/get_network_economics.rs → sdk/http/examples/get_network_economics.rs b/...reqwest/examples/get_network_economics.rs → sdk/http/examples/get_network_economics.rs
@@ -1,4 +1,4 @@
-use multiversx_sdk_reqwest::gateway::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {

diff --git a/sdk/reqwest/examples/sign_tx.rs → sdk/http/examples/sign_tx.rs b/sdk/reqwest/examples/sign_tx.rs → sdk/http/examples/sign_tx.rs
@@ -1,5 +1,5 @@
 use multiversx_sdk::{data::transaction::Transaction, wallet::Wallet};
-use multiversx_sdk_reqwest::gateway::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {

diff --git a/sdk/reqwest/examples/sign_txs.rs → sdk/http/examples/sign_txs.rs b/sdk/reqwest/examples/sign_txs.rs → sdk/http/examples/sign_txs.rs
@@ -1,5 +1,5 @@
 use multiversx_sdk::{data::transaction::Transaction, wallet::Wallet};
-use multiversx_sdk_reqwest::gateway::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {

diff --git a/sdk/reqwest/examples/tx_cost.rs → sdk/http/examples/tx_cost.rs b/sdk/reqwest/examples/tx_cost.rs → sdk/http/examples/tx_cost.rs
@@ -2,7 +2,7 @@ use multiversx_sdk::{
     data::{address::Address, transaction::Transaction},
     utils::base64_encode,
 };
-use multiversx_sdk_reqwest::gateway::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {

diff --git a/sdk/reqwest/examples/tx_default_args.rs → sdk/http/examples/tx_default_args.rs b/sdk/reqwest/examples/tx_default_args.rs → sdk/http/examples/tx_default_args.rs
@@ -1,5 +1,5 @@
 use multiversx_sdk::data::address::Address;
-use multiversx_sdk_reqwest::gateway::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {

diff --git a/sdk/reqwest/examples/tx_info.rs → sdk/http/examples/tx_info.rs b/sdk/reqwest/examples/tx_info.rs → sdk/http/examples/tx_info.rs
@@ -1,4 +1,4 @@
-use multiversx_sdk_reqwest::gateway::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {

diff --git a/sdk/reqwest/examples/vm_query.rs → sdk/http/examples/vm_query.rs b/sdk/reqwest/examples/vm_query.rs → sdk/http/examples/vm_query.rs
@@ -1,5 +1,5 @@
 use multiversx_sdk::data::{address::Address, vm::VMQueryInput};
-use multiversx_sdk_reqwest::gateway::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEFAULT_USE_CHAIN_SIMULATOR, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {

diff --git a/sdk/reqwest/src/gateway/gateway_proxy.rs → sdk/http/src/gateway_http_proxy.rs b/sdk/reqwest/src/gateway/gateway_proxy.rs → sdk/http/src/gateway_http_proxy.rs
@@ -1,19 +1,25 @@
-use multiversx_sdk::gateway::GatewayRequest;
-use reqwest::Client;
+mod http_account;
+mod http_block;
+mod http_chain_simulator;
+mod http_network;
+mod http_tx;
+mod http_tx_retrieve;
+
+use multiversx_sdk::gateway::{GatewayAsyncService, GatewayRequest};
 
 /// Allows communication with the MultiversX gateway API.
 #[derive(Clone, Debug)]
 pub struct GatewayHttpProxy {
     pub(crate) proxy_uri: String,
-    pub(crate) client: Client,
+    pub(crate) client: reqwest::Client,
     pub chain_simulator: bool,
 }
 
 impl GatewayHttpProxy {
     pub fn new(proxy_uri: String, chain_simulator: bool) -> Self {
         Self {
             proxy_uri,
-            client: Client::new(),
+            client: reqwest::Client::new(),
             chain_simulator,
         }
     }
@@ -53,3 +59,14 @@ impl GatewayHttpProxy {
     }
 }
 
+impl GatewayAsyncService for GatewayHttpProxy {
+    fn request<G>(
+        &self,
+        request: G,
+    ) -> impl std::future::Future<Output = anyhow::Result<G::Result>> + Send
+    where
+        G: multiversx_sdk::gateway::GatewayRequest,
+    {
+        self.http_request(request)
+    }
+}
diff --git a/sdk/reqwest/src/gateway/gateway_account.rs → ...tp/src/gateway_http_proxy/http_account.rs b/sdk/reqwest/src/gateway/gateway_account.rs → ...tp/src/gateway_http_proxy/http_account.rs
@@ -21,7 +21,8 @@ impl GatewayHttpProxy {
         &self,
         address: &Address,
     ) -> Result<HashMap<String, Vec<String>>> {
-        self.http_request(GetAccountEsdtRolesRequest::new(address)).await
+        self.http_request(GetAccountEsdtRolesRequest::new(address))
+            .await
     }
 
     // get_account_esdt_tokens retrieves an all esdt token of an account from the network
@@ -38,6 +39,7 @@ impl GatewayHttpProxy {
         &self,
         address: &Address,
     ) -> Result<HashMap<String, String>> {
-        self.http_request(GetAccountStorageRequest::new(address)).await
+        self.http_request(GetAccountStorageRequest::new(address))
+            .await
     }
 }
diff --git a/sdk/reqwest/src/gateway/gateway_block.rs → ...http/src/gateway_http_proxy/http_block.rs b/sdk/reqwest/src/gateway/gateway_block.rs → ...http/src/gateway_http_proxy/http_block.rs
@@ -14,7 +14,8 @@ impl GatewayHttpProxy {
 
     // get_hyper_block_by_nonce retrieves a hyper block's info by nonce from the network
     pub async fn get_hyper_block_by_nonce(&self, nonce: u64) -> Result<HyperBlock> {
-        self.http_request(GetHyperBlockRequest::by_nonce(nonce)).await
+        self.http_request(GetHyperBlockRequest::by_nonce(nonce))
+            .await
     }
 
     // get_latest_hyper_block_nonce retrieves the latest hyper block (metachain) nonce from the network

diff --git a/...st/src/gateway/gateway_chain_simulator.rs → ...ateway_http_proxy/http_chain_simulator.rs b/...st/src/gateway/gateway_chain_simulator.rs → ...ateway_http_proxy/http_chain_simulator.rs
diff --git a/sdk/reqwest/src/gateway/gateway_network.rs → ...tp/src/gateway_http_proxy/http_network.rs b/sdk/reqwest/src/gateway/gateway_network.rs → ...tp/src/gateway_http_proxy/http_network.rs
diff --git a/sdk/reqwest/src/gateway/gateway_tx.rs → sdk/http/src/gateway_http_proxy/http_tx.rs b/sdk/reqwest/src/gateway/gateway_tx.rs → sdk/http/src/gateway_http_proxy/http_tx.rs
diff --git a/...eqwest/src/gateway/gateway_tx_retrieve.rs → ...rc/gateway_http_proxy/http_tx_retrieve.rs b/...eqwest/src/gateway/gateway_tx_retrieve.rs → ...rc/gateway_http_proxy/http_tx_retrieve.rs
diff --git a/sdk/http/src/lib.rs b/sdk/http/src/lib.rs
@@ -0,0 +1,14 @@
+mod gateway_http_proxy;
+
+pub use gateway_http_proxy::GatewayHttpProxy;
+
+pub use multiversx_sdk as core;
+
+pub const MAINNET_GATEWAY: &str = "https://gateway.multiversx.com";
+pub const TESTNET_GATEWAY: &str = "https://testnet-gateway.multiversx.com";
+pub const DEVNET_GATEWAY: &str = "https://devnet-gateway.multiversx.com";
+
+// MetachainShardId will be used to identify a shard ID as metachain
+pub const METACHAIN_SHARD_ID: u32 = 0xFFFFFFFF;
+
+pub const DEFAULT_USE_CHAIN_SIMULATOR: bool = false;
diff --git a/sdk/reqwest/src/gateway.rs b/sdk/reqwest/src/gateway.rs
diff --git a/sdk/reqwest/src/lib.rs b/sdk/reqwest/src/lib.rs