Merge branch '2.0' into ci/2.0-private-tangle-tests

iotaledger · Oct 19, 2023 · 8f0098c · 8f0098c
2 parents 1976f54 + 9cdf229
commit 8f0098c
Show file tree

Hide file tree

Showing 20 changed files with 16 additions and 54 deletions.
diff --git a/bindings/core/src/method_handler/client.rs b/bindings/core/src/method_handler/client.rs
@@ -6,7 +6,7 @@ use iota_sdk::client::mqtt::{MqttPayload, Topic};
 use iota_sdk::{
     client::{request_funds_from_faucet, secret::SecretManager, Client},
     types::{
-        api::core::response::OutputWithMetadataResponse,
+        api::core::OutputWithMetadataResponse,
         block::{
             output::{
                 dto::OutputDto, AccountOutput, BasicOutput, FoundryOutput, NftOutput, Output, OutputBuilderAmount, Rent,

diff --git a/bindings/core/src/response.rs b/bindings/core/src/response.rs
@@ -15,7 +15,7 @@ use iota_sdk::{
     },
     types::{
         api::{
-            core::response::{
+            core::{
                 BlockMetadataResponse, InfoResponse as NodeInfo, IssuanceBlockHeaderResponse,
                 OutputWithMetadataResponse, PeerResponse,
             },

diff --git a/sdk/examples/client/block/01_block_confirmation_time.rs b/sdk/examples/client/block/01_block_confirmation_time.rs
@@ -11,7 +11,7 @@
 use crypto::keys::bip44::Bip44;
 use iota_sdk::{
     client::{constants::IOTA_COIN_TYPE, secret::SecretManager, Client, Result},
-    types::api::core::response::BlockState,
+    types::api::core::BlockState,
 };
 
 #[tokio::main]

diff --git a/sdk/src/client/error.rs b/sdk/src/client/error.rs
@@ -22,9 +22,6 @@ pub type Result<T> = std::result::Result<T, Error>;
 /// Error type of the iota client crate.
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
-    /// Block dtos error
-    #[error("{0}")]
-    ApiTypes(#[from] crate::types::api::core::error::Error),
     /// Invalid bech32 HRP, should match the one from the used network
     #[error("invalid bech32 hrp for the connected network: {provided}, expected: {expected}")]
     Bech32HrpMismatch {

diff --git a/sdk/src/client/node_api/core/routes.rs b/sdk/src/client/node_api/core/routes.rs
@@ -15,7 +15,7 @@ use crate::{
         Client, ClientInner, Result,
     },
     types::{
-        api::core::response::{
+        api::core::{
             BlockMetadataResponse, CommitteeResponse, CongestionResponse, InfoResponse, IssuanceBlockHeaderResponse,
             ManaRewardsResponse, PeerResponse, RoutesResponse, SubmitBlockResponse, UtxoChangesResponse,
             ValidatorResponse, ValidatorsResponse,

diff --git a/sdk/src/client/node_manager/builder.rs b/sdk/src/client/node_manager/builder.rs
@@ -22,7 +22,7 @@ use crate::{
             NodeManager,
         },
     },
-    types::api::core::response::InfoResponse,
+    types::api::core::InfoResponse,
 };
 
 /// Node manager builder

diff --git a/sdk/src/client/node_manager/mod.rs b/sdk/src/client/node_manager/mod.rs
@@ -28,7 +28,7 @@ use crate::{
         error::{Error, Result},
         node_manager::builder::NodeManagerBuilder,
     },
-    types::api::core::response::InfoResponse,
+    types::api::core::InfoResponse,
 };
 
 // The node manager takes care of selecting node(s) for requests until a result is returned or if quorum is enabled it

diff --git a/sdk/src/client/node_manager/syncing.rs b/sdk/src/client/node_manager/syncing.rs
@@ -3,7 +3,7 @@
 
 #[cfg(not(target_family = "wasm"))]
 use {
-    crate::types::api::core::response::InfoResponse,
+    crate::types::api::core::InfoResponse,
     crate::types::block::PROTOCOL_VERSION,
     std::{collections::HashSet, time::Duration},
     tokio::time::sleep,

diff --git a/sdk/src/types/api/core/response.rs → sdk/src/types/api/core.rs b/sdk/src/types/api/core/response.rs → sdk/src/types/api/core.rs
diff --git a/sdk/src/types/api/core/error.rs b/sdk/src/types/api/core/error.rs
diff --git a/sdk/src/types/api/core/mod.rs b/sdk/src/types/api/core/mod.rs
diff --git a/sdk/src/wallet/account/mod.rs b/sdk/src/wallet/account/mod.rs
@@ -60,7 +60,7 @@ use crate::{
         Client,
     },
     types::{
-        api::core::response::OutputWithMetadataResponse,
+        api::core::OutputWithMetadataResponse,
         block::{
             address::Bech32Address,
             output::{dto::FoundryOutputDto, AccountId, FoundryId, FoundryOutput, NftId, Output, OutputId, TokenId},

diff --git a/sdk/src/wallet/account/operations/reissue.rs b/sdk/src/wallet/account/operations/reissue.rs
@@ -6,7 +6,7 @@ use crypto::keys::bip44::Bip44;
 use crate::{
     client::{secret::SecretManage, Error as ClientError},
     types::{
-        api::core::response::{BlockState, TransactionState},
+        api::core::{BlockState, TransactionState},
         block::{
             payload::{transaction::TransactionId, Payload},
             BlockId,

diff --git a/sdk/src/wallet/account/operations/syncing/outputs.rs b/sdk/src/wallet/account/operations/syncing/outputs.rs
@@ -7,7 +7,7 @@ use instant::Instant;
 use crate::{
     client::{secret::SecretManage, Client, Error as ClientError},
     types::{
-        api::core::response::OutputWithMetadataResponse,
+        api::core::OutputWithMetadataResponse,
         block::{
             core::{BasicBlock, Block},
             input::Input,

diff --git a/sdk/src/wallet/account/operations/syncing/transactions.rs b/sdk/src/wallet/account/operations/syncing/transactions.rs
@@ -4,7 +4,7 @@
 use crate::{
     client::{secret::SecretManage, unix_timestamp_now},
     types::{
-        api::core::response::TransactionState,
+        api::core::TransactionState,
         block::{input::Input, output::OutputId, BlockId},
     },
     wallet::account::{

diff --git a/sdk/src/wallet/account/operations/transaction/mod.rs b/sdk/src/wallet/account/operations/transaction/mod.rs
@@ -18,7 +18,7 @@ use crate::{
         Error,
     },
     types::{
-        api::core::response::OutputWithMetadataResponse,
+        api::core::OutputWithMetadataResponse,
         block::{
             output::{dto::OutputDto, Output},
             payload::transaction::TransactionPayload,

diff --git a/sdk/src/wallet/account/types/mod.rs b/sdk/src/wallet/account/types/mod.rs
@@ -19,7 +19,7 @@ pub use self::{
 use crate::{
     client::secret::types::InputSigningData,
     types::{
-        api::core::response::OutputWithMetadataResponse,
+        api::core::OutputWithMetadataResponse,
         block::{
             address::Address,
             output::{dto::OutputDto, AccountTransition, Output, OutputId, OutputMetadata},

diff --git a/sdk/src/wallet/account/update.rs b/sdk/src/wallet/account/update.rs
@@ -14,7 +14,7 @@ use crate::{
 };
 #[cfg(feature = "events")]
 use crate::{
-    types::{api::core::response::OutputWithMetadataResponse, block::payload::transaction::dto::TransactionPayloadDto},
+    types::{api::core::OutputWithMetadataResponse, block::payload::transaction::dto::TransactionPayloadDto},
     wallet::{
         account::types::OutputDataDto,
         events::types::{NewOutputEvent, SpentOutputEvent, TransactionInclusionEvent, WalletEvent},

diff --git a/sdk/src/wallet/events/types.rs b/sdk/src/wallet/events/types.rs
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize, Serializer};
 use crate::{
     client::api::PreparedTransactionDataDto,
     types::{
-        api::core::response::OutputWithMetadataResponse,
+        api::core::OutputWithMetadataResponse,
         block::{
             address::Bech32Address,
             payload::transaction::{dto::TransactionPayloadDto, TransactionId},

diff --git a/sdk/tests/client/node_api/core.rs b/sdk/tests/client/node_api/core.rs
@@ -6,7 +6,7 @@
 use iota_sdk::{
     client::{api::GetAddressesOptions, node_api::indexer::query_parameters::QueryParameter, Client, NodeInfoWrapper},
     types::{
-        api::core::response::TransactionState,
+        api::core::TransactionState,
         block::{
             output::{Output, OutputId},
             BlockWrapper,