Switch to rust edition 2024

api-client/Cargo.toml

@@ -3,7 +3,7 @@ name = "substrate-api-client"
 version = "1.22.0"
 authors = ["Supercomputing Systems AG <info@scs.ch>"]
 license = "Apache-2.0"
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/scs/substrate-api-client"
 description = "Json-rpc client with helper functions compatible with any Substrate node"
 readme = "../README.md"

api-client/src/api/api_client.rs

@@ -12,10 +12,10 @@
 */
 
 use crate::{
+	GetAccountInformation,
 	api::error::{Error, Result},
 	rpc::Request,
 	runtime_api::RuntimeApiClient,
-	GetAccountInformation,
 };
 use ac_compose_macros::rpc_params;
 use ac_node_api::metadata::Metadata;
@@ -272,7 +272,7 @@ mod tests {
 	use ac_primitives::{
 		DefaultRuntimeConfig, GenericAdditionalParams, GenericExtrinsicParams, PlainTip,
 	};
-	use frame_metadata::{v14::ExtrinsicMetadata, RuntimeMetadata};
+	use frame_metadata::{RuntimeMetadata, v14::ExtrinsicMetadata};
 	use scale_info::form::PortableForm;
 	use sp_core::H256;
 	use std::{collections::HashMap, fs};

api-client/src/api/error.rs

@@ -15,7 +15,7 @@
 
 */
 
-use crate::{api::UnexpectedTxStatus, rpc::Error as RpcClientError, ExtrinsicReport};
+use crate::{ExtrinsicReport, api::UnexpectedTxStatus, rpc::Error as RpcClientError};
 use ac_node_api::{
 	error::DispatchError,
 	metadata::{MetadataConversionError, MetadataError},

api-client/src/api/mod.rs

@@ -16,7 +16,7 @@
 */
 
 use crate::error::FailedExtrinsicError;
-use ac_node_api::{events::RawEventDetails, EventDetails, Metadata};
+use ac_node_api::{EventDetails, Metadata, events::RawEventDetails};
 use alloc::{string::String, vec::Vec};
 use codec::{Decode, Encode};
 use serde::{Deserialize, Serialize};

api-client/src/api/rpc_api/author.rs

@@ -14,12 +14,12 @@
 //! Interface to common author rpc functions and helpers thereof.
 
 use crate::{
-	api::{rpc_api::events::FetchEvents, Error, Result},
-	rpc::{HandleSubscription, Request, Subscribe},
 	Api, ExtrinsicReport, TransactionStatus, XtStatus,
+	api::{Error, Result, rpc_api::events::FetchEvents},
+	rpc::{HandleSubscription, Request, Subscribe},
 };
 use ac_compose_macros::rpc_params;
-use ac_primitives::{config::Config, UncheckedExtrinsic};
+use ac_primitives::{UncheckedExtrinsic, config::Config};
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;
 use codec::{Decode, Encode};

api-client/src/api/rpc_api/chain.rs

@@ -12,9 +12,9 @@
 */
 
 use crate::{
+	Error,
 	api::{Api, Result},
 	rpc::{Request, Subscribe},
-	Error,
 };
 use ac_compose_macros::rpc_params;
 use ac_primitives::config::Config;
@@ -37,7 +37,7 @@ pub trait GetChainInfo {
 	async fn get_header(&self, hash: Option<Self::Hash>) -> Result<Option<Self::Header>>;
 
 	async fn get_block_hash(&self, number: Option<Self::BlockNumber>)
-		-> Result<Option<Self::Hash>>;
+	-> Result<Option<Self::Hash>>;
 
 	/// Returns the genesis block
 	async fn get_genesis_block(&self) -> Result<Self::Block>;

api-client/src/api/rpc_api/events.rs

@@ -12,12 +12,12 @@
 */
 
 use crate::{
+	GetChainInfo, GetStorage,
 	api::{Api, Error, Result},
 	rpc::{HandleSubscription, Request, Subscribe},
-	GetChainInfo, GetStorage,
 };
 use ac_compose_macros::rpc_params;
-use ac_node_api::{metadata::Metadata, EventDetails, EventRecord, Events, Phase};
+use ac_node_api::{EventDetails, EventRecord, Events, Phase, metadata::Metadata};
 use ac_primitives::config::Config;
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;
@@ -238,10 +238,10 @@ mod tests {
 	use frame_metadata::RuntimeMetadataPrefixed;
 	use rococo_runtime::{BalancesCall, RuntimeCall, UncheckedExtrinsic};
 	use scale_info::TypeInfo;
-	use sp_core::{crypto::Ss58Codec, sr25519, Bytes, H256};
+	use sp_core::{Bytes, H256, crypto::Ss58Codec, sr25519};
 	use sp_runtime::{
-		generic::{Block, SignedBlock},
 		AccountId32, MultiAddress,
+		generic::{Block, SignedBlock},
 	};
 	use sp_storage::StorageData;
 	use sp_version::RuntimeVersion;

api-client/src/api/rpc_api/frame_system.rs

@@ -18,7 +18,7 @@ use crate::{
 	rpc::Request,
 };
 use ac_compose_macros::rpc_params;
-use ac_primitives::{config::Config, AccountInfo};
+use ac_primitives::{AccountInfo, config::Config};
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;
 use alloc::{string::String, vec::Vec};

api-client/src/api/rpc_api/pallet_transaction_payment.rs

@@ -15,7 +15,7 @@ use crate::{
 	rpc::Request,
 };
 use ac_compose_macros::rpc_params;
-use ac_primitives::{config::Config, FeeDetails, InclusionFee, NumberOrHex, RuntimeDispatchInfo};
+use ac_primitives::{FeeDetails, InclusionFee, NumberOrHex, RuntimeDispatchInfo, config::Config};
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;
 use core::str::FromStr;

api-client/src/api/rpc_api/runtime_update.rs

@@ -10,7 +10,7 @@
 	See the License for the specific language governing permissions and
 	limitations under the License.
 */
-use crate::{api::Error, rpc::Subscribe, rpc_api::EventSubscriptionFor, Result};
+use crate::{Result, api::Error, rpc::Subscribe, rpc_api::EventSubscriptionFor};
 use alloc::sync::Arc;
 use codec::{Decode, Encode};
 use core::sync::atomic::{AtomicBool, Ordering};
@@ -49,10 +49,10 @@ where
 	#[maybe_async::maybe_async(?Send)]
 	pub async fn detect_runtime_update(&mut self) -> Result<bool> {
 		'outer: loop {
-			if let Some(canceled) = &self.external_cancellation {
-				if canceled.load(Ordering::SeqCst) {
-					return Ok(false)
-				}
+			if let Some(canceled) = &self.external_cancellation
+				&& canceled.load(Ordering::SeqCst)
+			{
+				return Ok(false)
 			}
 			let event_records = self
 				.subscription

api-client/src/api/rpc_api/state.rs

@@ -11,9 +11,9 @@
    limitations under the License.
 */
 use crate::{
+	Api, ReadProof,
 	api::Result,
 	rpc::{Request, Subscribe},
-	Api, ReadProof,
 };
 use ac_compose_macros::rpc_params;
 use ac_node_api::MetadataError;

api-client/src/api/runtime_api/api_core.rs

@@ -13,7 +13,7 @@
 
 use super::{RuntimeApi, RuntimeApiClient};
 use crate::{api::Result, rpc::Request};
-use ac_primitives::{config::Config, RuntimeVersion};
+use ac_primitives::{RuntimeVersion, config::Config};
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;
 use alloc::vec;

api-client/src/api/runtime_api/block_builder.rs

@@ -13,7 +13,7 @@
 
 use super::{RuntimeApi, RuntimeApiClient};
 use crate::{api::Result, rpc::Request};
-use ac_primitives::{config::Config, UncheckedExtrinsic};
+use ac_primitives::{UncheckedExtrinsic, config::Config};
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;
 use alloc::{vec, vec::Vec};

api-client/src/api/runtime_api/metadata.rs

@@ -13,7 +13,7 @@
 
 use super::{RuntimeApi, RuntimeApiClient};
 use crate::{api::Result, rpc::Request};
-use ac_node_api::{error::MetadataError, Metadata};
+use ac_node_api::{Metadata, error::MetadataError};
 use ac_primitives::config::Config;
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;

api-client/src/api/runtime_api/mmr.rs

@@ -13,7 +13,7 @@
 
 use super::{RuntimeApi, RuntimeApiClient};
 use crate::{api::Result, rpc::Request};
-use ac_primitives::{config::Config, EncodableOpaqueLeaf, MmrError, Proof};
+use ac_primitives::{EncodableOpaqueLeaf, MmrError, Proof, config::Config};
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;
 use alloc::{vec, vec::Vec};

api-client/src/api/runtime_api/session_keys.rs

@@ -18,7 +18,7 @@ use ac_primitives::config::Config;
 use alloc::boxed::Box;
 use alloc::{vec, vec::Vec};
 use codec::Encode;
-use sp_core::{crypto::KeyTypeId, Bytes};
+use sp_core::{Bytes, crypto::KeyTypeId};
 
 #[maybe_async::maybe_async(?Send)]
 pub trait SessionKeysApi: RuntimeApi {

api-client/src/api/runtime_api/transaction_payment.rs

@@ -13,7 +13,7 @@
 
 use super::{RuntimeApi, RuntimeApiClient};
 use crate::{api::Result, rpc::Request};
-use ac_primitives::{config::Config, FeeDetails, RuntimeDispatchInfo, UncheckedExtrinsic, Weight};
+use ac_primitives::{FeeDetails, RuntimeDispatchInfo, UncheckedExtrinsic, Weight, config::Config};
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;
 use alloc::{vec, vec::Vec};

api-client/src/api/runtime_api/transaction_payment_call.rs

@@ -13,7 +13,7 @@
 
 use super::{RuntimeApi, RuntimeApiClient};
 use crate::{api::Result, rpc::Request};
-use ac_primitives::{config::Config, FeeDetails, RuntimeDispatchInfo, Weight};
+use ac_primitives::{FeeDetails, RuntimeDispatchInfo, Weight, config::Config};
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;
 use alloc::vec;

api-client/src/extrinsic/balances.rs

@@ -21,8 +21,8 @@
 use crate::{api::Api, rpc::Request};
 use ac_compose_macros::compose_extrinsic;
 use ac_primitives::{
-	config::Config, extrinsic_params::ExtrinsicParams, extrinsics::CallIndex, SignExtrinsic,
-	UncheckedExtrinsic,
+	SignExtrinsic, UncheckedExtrinsic, config::Config, extrinsic_params::ExtrinsicParams,
+	extrinsics::CallIndex,
 };
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;

api-client/src/extrinsic/contracts.rs

@@ -22,8 +22,8 @@
 use crate::{api::Api, rpc::Request};
 use ac_compose_macros::compose_extrinsic;
 use ac_primitives::{
-	config::Config, extrinsic_params::ExtrinsicParams, extrinsics::CallIndex, Determinism,
-	SignExtrinsic, UncheckedExtrinsic, Weight,
+	Determinism, SignExtrinsic, UncheckedExtrinsic, Weight, config::Config,
+	extrinsic_params::ExtrinsicParams, extrinsics::CallIndex,
 };
 use codec::{Compact, Encode};
 use sp_core::Bytes;

api-client/src/extrinsic/offline_extrinsic.rs

@@ -20,7 +20,7 @@
 use crate::Api;
 use ac_compose_macros::compose_extrinsic_offline;
 use ac_primitives::{
-	config::Config, extrinsic_params::ExtrinsicParams, Preamble, SignExtrinsic, UncheckedExtrinsic,
+	Preamble, SignExtrinsic, UncheckedExtrinsic, config::Config, extrinsic_params::ExtrinsicParams,
 };
 use codec::Encode;
 

api-client/src/extrinsic/staking.rs

@@ -18,11 +18,11 @@
 //! Extrinsics for `pallet-staking`.
 //! https://polkadot.js.org/docs/substrate/extrinsics#staking
 
-use crate::{rpc::Request, Api};
+use crate::{Api, rpc::Request};
 use ac_compose_macros::compose_extrinsic;
 use ac_primitives::{
-	config::Config, CallIndex, ExtrinsicParams, RewardDestination, SignExtrinsic,
-	UncheckedExtrinsic,
+	CallIndex, ExtrinsicParams, RewardDestination, SignExtrinsic, UncheckedExtrinsic,
+	config::Config,
 };
 use codec::{Compact, Decode, Encode};
 

api-client/src/extrinsic/utility.rs

@@ -18,11 +18,11 @@
 //! Extrinsics for `pallet-utility`.
 //! https://polkadot.js.org/docs/substrate/extrinsics/#utility
 
-use crate::{rpc::Request, Api};
+use crate::{Api, rpc::Request};
 use ac_compose_macros::compose_extrinsic;
 use ac_primitives::{
-	config::Config, extrinsic_params::ExtrinsicParams, extrinsics::CallIndex, SignExtrinsic,
-	UncheckedExtrinsic,
+	SignExtrinsic, UncheckedExtrinsic, config::Config, extrinsic_params::ExtrinsicParams,
+	extrinsics::CallIndex,
 };
 #[cfg(all(not(feature = "sync-api"), not(feature = "std")))]
 use alloc::boxed::Box;

api-client/src/rpc/tungstenite_client/client.rs

@@ -15,8 +15,8 @@
 
 */
 use crate::rpc::{
-	helpers, to_json_req, tungstenite_client::subscription::TungsteniteSubscriptionWrapper,
-	Error as RpcClientError, Request, Result, Subscribe,
+	Error as RpcClientError, Request, Result, Subscribe, helpers, to_json_req,
+	tungstenite_client::subscription::TungsteniteSubscriptionWrapper,
 };
 use ac_primitives::RpcParams;
 use log::*;
@@ -25,14 +25,14 @@ use serde_json::Value;
 use std::{
 	fmt::Debug,
 	net::TcpStream,
-	sync::mpsc::{channel, Sender as ThreadOut},
+	sync::mpsc::{Sender as ThreadOut, channel},
 	thread,
 	thread::sleep,
 	time::Duration,
 };
 use tungstenite::{
-	client::connect_with_config, handshake::client::Response, stream::MaybeTlsStream, Message,
-	WebSocket,
+	Message, WebSocket, client::connect_with_config, handshake::client::Response,
+	stream::MaybeTlsStream,
 };
 use url::Url;
 
@@ -127,10 +127,9 @@ impl TungsteniteRpcClient {
 			while current_attempt <= max_attempts {
 				if let Err(error) =
 					subscribe_to_server(&url, max_attempts, json_req.clone(), result_in.clone())
+					&& !do_reconnect(&error)
 				{
-					if !do_reconnect(&error) {
-						break
-					}
+					break
 				}
 				current_attempt += 1;
 			}

compose-macros/Cargo.toml

@@ -3,7 +3,7 @@ name = "ac-compose-macros"
 version = "1.22.0"
 authors = ["Supercomputing Systems AG <info@scs.ch>"]
 license = "Apache-2.0"
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/scs/substrate-api-client"
 description = "Macros for creating Substrate extrinsics and rpc calls"
 readme = "README.md"

examples/async/Cargo.toml

@@ -2,7 +2,7 @@
 name = "ac-examples-async"
 version = "1.22.0"
 license = "Apache-2.0"
-edition = "2021"
+edition = "2024"
 
 [dev-dependencies]
 codec = { workspace = true, features = ["std"] }

examples/async/examples/benchmark_bulk_xt.rs

@@ -18,11 +18,11 @@
 use rococo_runtime::{BalancesCall, RuntimeCall};
 use sp_keyring::Sr25519Keyring;
 use substrate_api_client::{
+	Api, SubmitExtrinsic,
 	ac_primitives::{
 		Config, ExtrinsicSigner as GenericExtrinsicSigner, RococoRuntimeConfig, SignExtrinsic,
 	},
 	rpc::JsonrpseeClient,
-	Api, SubmitExtrinsic,
 };
 
 // Define an extrinsic signer type which sets the generic types of the `GenericExtrinsicSigner`.

examples/async/examples/check_extrinsic_events.rs

@@ -15,11 +15,11 @@
 
 use sp_keyring::Sr25519Keyring;
 use substrate_api_client::{
+	Api, GetAccountInformation, SubmitAndWatch, TransactionStatus, XtStatus,
 	ac_node_api::RawEventDetails,
 	ac_primitives::{Config, RococoRuntimeConfig},
 	extrinsic::BalancesExtrinsics,
 	rpc::JsonrpseeClient,
-	Api, GetAccountInformation, SubmitAndWatch, TransactionStatus, XtStatus,
 };
 
 // To test this example with CI we run it against the Polkadot Rococo node. Remember to switch the Config to match your

examples/async/examples/compose_extrinsic.rs

@@ -20,15 +20,15 @@
 use codec::Compact;
 use rococo_runtime::{Address, BalancesCall, RuntimeCall};
 use sp_keyring::Sr25519Keyring;
-use sp_runtime::{generic::Era, MultiAddress};
+use sp_runtime::{MultiAddress, generic::Era};
 use substrate_api_client::{
+	Api, GetChainInfo, SubmitAndWatch, XtStatus,
 	ac_compose_macros::{compose_call, compose_extrinsic_offline},
 	ac_primitives::{
-		config::Config, ExtrinsicParams, ExtrinsicSigner, GenericAdditionalParams, PlainTip,
-		RococoRuntimeConfig, SignExtrinsic,
+		ExtrinsicParams, ExtrinsicSigner, GenericAdditionalParams, PlainTip, RococoRuntimeConfig,
+		SignExtrinsic, config::Config,
 	},
 	rpc::JsonrpseeClient,
-	Api, GetChainInfo, SubmitAndWatch, XtStatus,
 };
 
 type DefaultExtrinsicSigner = <RococoRuntimeConfig as Config>::ExtrinsicSigner;