fix: Use nostd for no_std environment (#124)

NoirHQ · Jan 17, 2025 · e25af14 · e25af14
1 parent c681ad6
commit e25af14
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/frame/solana/runtime-api/src/account.rs b/frame/solana/runtime-api/src/account.rs
@@ -17,7 +17,7 @@
 
 use crate::{error::Error, SolanaRuntimeCall};
 use frame_support::traits::Get;
-use nostd::marker::PhantomData;
+use nostd::{marker::PhantomData, prelude::*};
 use pallet_solana::Pubkey;
 use solana_inline_spl::token::GenericTokenAccount;
 use solana_rpc_client_api::filter::RpcFilterType;
@@ -101,7 +101,7 @@ impl<T> ProgramAccounts<T> {
 	}
 
 	fn calc_scan_result_size(account: &Account) -> usize {
-		account.data().len() + std::mem::size_of::<Account>() + std::mem::size_of::<Pubkey>()
+		account.data().len() + core::mem::size_of::<Account>() + core::mem::size_of::<Pubkey>()
 	}
 }
 

diff --git a/frame/solana/runtime-api/src/lib.rs b/frame/solana/runtime-api/src/lib.rs
@@ -24,7 +24,7 @@ pub mod fee;
 pub mod transaction;
 
 use error::Error;
-use nostd::{string::String, vec::Vec};
+use nostd::prelude::*;
 use sp_api::decl_runtime_apis;
 
 decl_runtime_apis! {

diff --git a/frame/solana/runtime-api/src/transaction.rs b/frame/solana/runtime-api/src/transaction.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use crate::{error::Error, SolanaRuntimeCall};
-use nostd::marker::PhantomData;
+use nostd::{marker::PhantomData, prelude::*};
 use pallet_solana::{runtime::bank::TransactionSimulationResult, Pubkey};
 use solana_sdk::{
 	feature_set::FeatureSet,

diff --git a/frame/solana/src/lib.rs b/frame/solana/src/lib.rs
@@ -108,7 +108,7 @@ pub mod pallet {
 		},
 	};
 	use frame_system::{pallet_prelude::*, CheckWeight};
-	use nostd::sync::Arc;
+	use nostd::{prelude::*, sync::Arc};
 	use np_runtime::traits::LossyInto;
 	use parity_scale_codec::Codec;
 	use solana_sdk::{

diff --git a/vendor/solana/rpc-client-api/src/filter.rs b/vendor/solana/rpc-client-api/src/filter.rs
@@ -1,6 +1,6 @@
 use {
     base64::{prelude::BASE64_STANDARD, Engine},
-    nostd::borrow::Cow,
+    nostd::{borrow::Cow, prelude::*},
     serde::{Deserialize, Serialize},
     solana_inline_spl::{token::GenericTokenAccount, token_2022::Account},
     solana_sdk::account::{AccountSharedData, ReadableAccount},