From 849296a0ac35b19ba9aeadddc6f2f759f0fc59e8 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Thu, 4 Jul 2024 01:01:31 -0400 Subject: [PATCH] Correct imports for no-std --- coins/monero/ringct/bulletproofs/src/plus/mod.rs | 2 +- coins/monero/ringct/mlsag/src/lib.rs | 1 + coins/monero/rpc/src/lib.rs | 4 ++-- coins/monero/src/block.rs | 1 + coins/monero/src/ringct.rs | 1 + coins/monero/src/transaction.rs | 1 + coins/monero/wallet/address/src/base58check.rs | 2 ++ coins/monero/wallet/address/src/lib.rs | 5 ++++- coins/monero/wallet/seed/src/lib.rs | 1 + coins/monero/wallet/src/extra.rs | 1 + coins/monero/wallet/src/lib.rs | 2 ++ coins/monero/wallet/src/output.rs | 3 ++- coins/monero/wallet/src/scan.rs | 2 +- coins/monero/wallet/src/send/eventuality.rs | 2 +- coins/monero/wallet/src/send/mod.rs | 6 +++++- coins/monero/wallet/src/send/tx.rs | 2 ++ coins/monero/wallet/src/send/tx_keys.rs | 1 + 17 files changed, 29 insertions(+), 8 deletions(-) diff --git a/coins/monero/ringct/bulletproofs/src/plus/mod.rs b/coins/monero/ringct/bulletproofs/src/plus/mod.rs index ec7ca6a7c..015242fbc 100644 --- a/coins/monero/ringct/bulletproofs/src/plus/mod.rs +++ b/coins/monero/ringct/bulletproofs/src/plus/mod.rs @@ -1,6 +1,6 @@ #![allow(non_snake_case)] -use std_shims::sync::OnceLock; +use std_shims::{sync::OnceLock, vec}; use curve25519_dalek::{constants::ED25519_BASEPOINT_POINT, scalar::Scalar, edwards::EdwardsPoint}; diff --git a/coins/monero/ringct/mlsag/src/lib.rs b/coins/monero/ringct/mlsag/src/lib.rs index deae941f9..d9f15eadc 100644 --- a/coins/monero/ringct/mlsag/src/lib.rs +++ b/coins/monero/ringct/mlsag/src/lib.rs @@ -5,6 +5,7 @@ #![allow(non_snake_case)] use std_shims::{ + vec, vec::Vec, io::{self, Read, Write}, }; diff --git a/coins/monero/rpc/src/lib.rs b/coins/monero/rpc/src/lib.rs index 454e004a6..8962e7760 100644 --- a/coins/monero/rpc/src/lib.rs +++ b/coins/monero/rpc/src/lib.rs @@ -4,9 +4,9 @@ #![cfg_attr(not(feature = "std"), no_std)] use core::fmt::Debug; -#[cfg(not(feature = "std"))] -use alloc::boxed::Box; use std_shims::{ + alloc::{boxed::Box, format}, + vec, vec::Vec, io, string::{String, ToString}, diff --git a/coins/monero/src/block.rs b/coins/monero/src/block.rs index 7bcd5b68f..c96682275 100644 --- a/coins/monero/src/block.rs +++ b/coins/monero/src/block.rs @@ -1,4 +1,5 @@ use std_shims::{ + vec, vec::Vec, io::{self, Read, Write}, }; diff --git a/coins/monero/src/ringct.rs b/coins/monero/src/ringct.rs index 1eb2b4234..a544e15f8 100644 --- a/coins/monero/src/ringct.rs +++ b/coins/monero/src/ringct.rs @@ -1,4 +1,5 @@ use std_shims::{ + vec, vec::Vec, io::{self, Read, Write}, }; diff --git a/coins/monero/src/transaction.rs b/coins/monero/src/transaction.rs index a1e921f45..8039621ee 100644 --- a/coins/monero/src/transaction.rs +++ b/coins/monero/src/transaction.rs @@ -1,5 +1,6 @@ use core::cmp::Ordering; use std_shims::{ + vec, vec::Vec, io::{self, Read, Write}, }; diff --git a/coins/monero/wallet/address/src/base58check.rs b/coins/monero/wallet/address/src/base58check.rs index fcd418b3d..003f21f1b 100644 --- a/coins/monero/wallet/address/src/base58check.rs +++ b/coins/monero/wallet/address/src/base58check.rs @@ -1,3 +1,5 @@ +use std_shims::{vec::Vec, string::String}; + use monero_primitives::keccak256; const ALPHABET_LEN: u64 = 58; diff --git a/coins/monero/wallet/address/src/lib.rs b/coins/monero/wallet/address/src/lib.rs index 3b50940c6..731faab89 100644 --- a/coins/monero/wallet/address/src/lib.rs +++ b/coins/monero/wallet/address/src/lib.rs @@ -4,7 +4,10 @@ #![cfg_attr(not(feature = "std"), no_std)] use core::fmt::{self, Write}; -use std_shims::string::ToString; +use std_shims::{ + vec, + string::{String, ToString}, +}; use zeroize::Zeroize; diff --git a/coins/monero/wallet/seed/src/lib.rs b/coins/monero/wallet/seed/src/lib.rs index 600632b50..5c8cbe348 100644 --- a/coins/monero/wallet/seed/src/lib.rs +++ b/coins/monero/wallet/seed/src/lib.rs @@ -6,6 +6,7 @@ use core::{ops::Deref, fmt}; use std_shims::{ sync::OnceLock, + vec, vec::Vec, string::{String, ToString}, collections::HashMap, diff --git a/coins/monero/wallet/src/extra.rs b/coins/monero/wallet/src/extra.rs index b67a4c707..20cd3c8f0 100644 --- a/coins/monero/wallet/src/extra.rs +++ b/coins/monero/wallet/src/extra.rs @@ -1,5 +1,6 @@ use core::ops::BitXor; use std_shims::{ + vec, vec::Vec, io::{self, Read, BufRead, Write}, }; diff --git a/coins/monero/wallet/src/lib.rs b/coins/monero/wallet/src/lib.rs index 2fa2e8048..133be188b 100644 --- a/coins/monero/wallet/src/lib.rs +++ b/coins/monero/wallet/src/lib.rs @@ -3,6 +3,8 @@ #![deny(missing_docs)] #![cfg_attr(not(feature = "std"), no_std)] +use std_shims::vec::Vec; + use zeroize::{Zeroize, Zeroizing}; use curve25519_dalek::{Scalar, EdwardsPoint}; diff --git a/coins/monero/wallet/src/output.rs b/coins/monero/wallet/src/output.rs index 2ff4ad835..247194781 100644 --- a/coins/monero/wallet/src/output.rs +++ b/coins/monero/wallet/src/output.rs @@ -1,6 +1,7 @@ use std_shims::{ - io::{self, Read, Write}, + vec, vec::Vec, + io::{self, Read, Write}, }; use zeroize::{Zeroize, ZeroizeOnDrop}; diff --git a/coins/monero/wallet/src/scan.rs b/coins/monero/wallet/src/scan.rs index 2453f94d2..51be96052 100644 --- a/coins/monero/wallet/src/scan.rs +++ b/coins/monero/wallet/src/scan.rs @@ -1,5 +1,5 @@ use core::ops::Deref; -use std_shims::{vec::Vec, string::ToString, collections::HashMap}; +use std_shims::{alloc::format, vec, vec::Vec, string::ToString, collections::HashMap}; use zeroize::{Zeroize, ZeroizeOnDrop, Zeroizing}; diff --git a/coins/monero/wallet/src/send/eventuality.rs b/coins/monero/wallet/src/send/eventuality.rs index 031de1e1e..ff93c1ac6 100644 --- a/coins/monero/wallet/src/send/eventuality.rs +++ b/coins/monero/wallet/src/send/eventuality.rs @@ -1,4 +1,4 @@ -use std_shims::io; +use std_shims::{vec::Vec, io}; use zeroize::Zeroize; diff --git a/coins/monero/wallet/src/send/mod.rs b/coins/monero/wallet/src/send/mod.rs index b3b255051..b7c8712af 100644 --- a/coins/monero/wallet/src/send/mod.rs +++ b/coins/monero/wallet/src/send/mod.rs @@ -1,5 +1,9 @@ use core::{ops::Deref, fmt}; -use std_shims::io; +use std_shims::{ + io, vec, + vec::Vec, + string::{String, ToString}, +}; use zeroize::{Zeroize, Zeroizing}; diff --git a/coins/monero/wallet/src/send/tx.rs b/coins/monero/wallet/src/send/tx.rs index 7d50c1982..299c17b6a 100644 --- a/coins/monero/wallet/src/send/tx.rs +++ b/coins/monero/wallet/src/send/tx.rs @@ -1,3 +1,5 @@ +use std_shims::{vec, vec::Vec}; + use rand_core::SeedableRng; use rand_chacha::ChaCha20Rng; diff --git a/coins/monero/wallet/src/send/tx_keys.rs b/coins/monero/wallet/src/send/tx_keys.rs index b771ea5c2..db63affb3 100644 --- a/coins/monero/wallet/src/send/tx_keys.rs +++ b/coins/monero/wallet/src/send/tx_keys.rs @@ -1,4 +1,5 @@ use core::ops::Deref; +use std_shims::{vec, vec::Vec}; use zeroize::Zeroizing;