Merge pull request #5268 from zajko/fixing_compilation_warnings

Fixing import macros to get rid of warning messages

Author: zajko

node/src/types/transaction/initiator_addr_and_secret_key.rs

@@ -23,7 +23,7 @@ pub(crate) enum InitiatorAddrAndSecretKey<'a> {
 
 impl InitiatorAddrAndSecretKey<'_> {
     /// The address of the initiator of a `TransactionV1`.
-    pub fn initiator_addr(&self) -> InitiatorAddr {
+    pub(crate) fn initiator_addr(&self) -> InitiatorAddr {
         match self {
             InitiatorAddrAndSecretKey::Both { initiator_addr, .. }
             | InitiatorAddrAndSecretKey::InitiatorAddr(initiator_addr) => initiator_addr.clone(),
@@ -34,7 +34,7 @@ impl InitiatorAddrAndSecretKey<'_> {
     }
 
     /// The secret key of the initiator of a `TransactionV1`.
-    pub fn secret_key(&self) -> Option<&SecretKey> {
+    pub(crate) fn secret_key(&self) -> Option<&SecretKey> {
         match self {
             InitiatorAddrAndSecretKey::Both { secret_key, .. }
             | InitiatorAddrAndSecretKey::SecretKey(secret_key) => Some(secret_key),

types/src/chainspec.rs

@@ -42,14 +42,14 @@ pub use accounts_config::{
 };
 pub use activation_point::ActivationPoint;
 pub use chainspec_raw_bytes::ChainspecRawBytes;
+#[cfg(any(all(feature = "std", feature = "testing"), test))]
+pub use core_config::DEFAULT_FEE_HANDLING;
 pub use core_config::{
     ConsensusProtocolName, CoreConfig, LegacyRequiredFinality, DEFAULT_GAS_HOLD_INTERVAL,
     DEFAULT_MINIMUM_BID_AMOUNT,
 };
 #[cfg(any(feature = "std", test))]
-pub use core_config::{
-    DEFAULT_BASELINE_MOTES_AMOUNT, DEFAULT_FEE_HANDLING, DEFAULT_REFUND_HANDLING,
-};
+pub use core_config::{DEFAULT_BASELINE_MOTES_AMOUNT, DEFAULT_REFUND_HANDLING};
 pub use fee_handling::FeeHandling;
 #[cfg(any(feature = "std", test))]
 pub use genesis_config::GenesisConfig;

types/src/transaction.rs

@@ -5,7 +5,7 @@ mod deploy;
 mod error;
 mod execution_info;
 mod initiator_addr;
-#[cfg(any(feature = "std", test, feature = "testing"))]
+#[cfg(any(test, feature = "testing"))]
 mod initiator_addr_and_secret_key;
 mod package_identifier;
 mod pricing_mode;
@@ -73,7 +73,7 @@ pub use deploy::{
 pub use error::InvalidTransaction;
 pub use execution_info::ExecutionInfo;
 pub use initiator_addr::InitiatorAddr;
-#[cfg(any(feature = "std", feature = "testing", test))]
+#[cfg(any(feature = "testing", test))]
 pub(crate) use initiator_addr_and_secret_key::InitiatorAddrAndSecretKey;
 pub use package_identifier::PackageIdentifier;
 pub use pricing_mode::{PricingMode, PricingModeError};
@@ -86,7 +86,7 @@ pub use transaction_scheduling::TransactionScheduling;
 pub use transaction_target::{TransactionRuntimeParams, TransactionTarget};
 #[cfg(feature = "json-schema")]
 pub(crate) use transaction_v1::arg_handling;
-#[cfg(any(feature = "std", feature = "testing", feature = "gens", test))]
+#[cfg(any(feature = "testing", feature = "gens", test))]
 pub(crate) use transaction_v1::fields_container::FieldsContainer;
 pub use transaction_v1::{
     InvalidTransactionV1, TransactionArgs, TransactionV1, TransactionV1DecodeFromJsonError,

types/src/transaction/deploy.rs

@@ -15,25 +15,10 @@ use core::{
 #[cfg(any(feature = "std", test))]
 use std::convert::TryFrom;
 
-#[cfg(feature = "datasize")]
-use datasize::DataSize;
 #[cfg(any(feature = "std", test))]
-use itertools::Itertools;
-#[cfg(feature = "json-schema")]
-use once_cell::sync::Lazy;
-#[cfg(any(feature = "once_cell", test))]
-use once_cell::sync::OnceCell;
+use super::{get_lane_for_non_install_wasm, PricingMode};
 #[cfg(any(all(feature = "std", feature = "testing"), test))]
-use rand::Rng;
-#[cfg(feature = "json-schema")]
-use schemars::JsonSchema;
-#[cfg(any(feature = "std", test))]
-use serde::{Deserialize, Serialize};
-#[cfg(any(all(feature = "std", feature = "testing"), test))]
-use tracing::{debug, warn};
-
-#[cfg(any(feature = "std", test))]
-use super::{get_lane_for_non_install_wasm, InitiatorAddr, InitiatorAddrAndSecretKey, PricingMode};
+use super::{InitiatorAddr, InitiatorAddrAndSecretKey};
 #[cfg(any(
     all(feature = "std", feature = "testing"),
     feature = "json-schema",
@@ -58,6 +43,22 @@ use crate::{
     transaction::{Approval, ApprovalsHash},
     Digest, DisplayIter, PublicKey, SecretKey, TimeDiff, Timestamp,
 };
+#[cfg(feature = "datasize")]
+use datasize::DataSize;
+#[cfg(any(all(feature = "std", feature = "testing"), test))]
+use itertools::Itertools;
+#[cfg(feature = "json-schema")]
+use once_cell::sync::Lazy;
+#[cfg(any(feature = "once_cell", test))]
+use once_cell::sync::OnceCell;
+#[cfg(any(all(feature = "std", feature = "testing"), test))]
+use rand::Rng;
+#[cfg(feature = "json-schema")]
+use schemars::JsonSchema;
+#[cfg(any(feature = "std", test))]
+use serde::{Deserialize, Serialize};
+#[cfg(any(all(feature = "std", feature = "testing"), test))]
+use tracing::{debug, warn};
 
 #[cfg(any(feature = "std", test))]
 use crate::{chainspec::PricingHandling, Chainspec, Phase, TransactionV1Config, MINT_LANE_ID};
@@ -197,7 +198,7 @@ impl Deploy {
         )
     }
 
-    #[cfg(any(feature = "std", test))]
+    #[cfg(any(all(feature = "std", feature = "testing"), test))]
     #[allow(clippy::too_many_arguments)]
     fn build(
         timestamp: Timestamp,

types/src/transaction/initiator_addr_and_secret_key.rs

@@ -23,7 +23,7 @@ pub(crate) enum InitiatorAddrAndSecretKey<'a> {
 
 impl InitiatorAddrAndSecretKey<'_> {
     /// The address of the initiator of a `TransactionV1`.
-    pub fn initiator_addr(&self) -> InitiatorAddr {
+    pub(crate) fn initiator_addr(&self) -> InitiatorAddr {
         match self {
             InitiatorAddrAndSecretKey::Both { initiator_addr, .. }
             | InitiatorAddrAndSecretKey::InitiatorAddr(initiator_addr) => initiator_addr.clone(),
@@ -34,7 +34,7 @@ impl InitiatorAddrAndSecretKey<'_> {
     }
 
     /// The secret key of the initiator of a `TransactionV1`.
-    pub fn secret_key(&self) -> Option<&SecretKey> {
+    pub(crate) fn secret_key(&self) -> Option<&SecretKey> {
         match self {
             InitiatorAddrAndSecretKey::Both { secret_key, .. }
             | InitiatorAddrAndSecretKey::SecretKey(secret_key) => Some(secret_key),

types/src/transaction/transaction_v1.rs

@@ -6,32 +6,34 @@ mod transaction_args;
 mod transaction_v1_hash;
 pub mod transaction_v1_payload;
 
-#[cfg(any(feature = "std", feature = "testing", test))]
+#[cfg(any(feature = "testing", test))]
 use super::InitiatorAddrAndSecretKey;
+#[cfg(any(feature = "testing", test))]
+use crate::testing::TestRng;
+#[cfg(any(all(feature = "std", feature = "testing"), test))]
+use crate::LARGE_WASM_LANE_ID;
 use crate::{
     bytesrepr::{self, Error, FromBytes, ToBytes},
     crypto,
 };
-#[cfg(any(all(feature = "std", feature = "testing"), test))]
-use crate::{testing::TestRng, TransactionConfig, LARGE_WASM_LANE_ID};
 #[cfg(any(feature = "std", test))]
 use crate::{
     TransactionEntryPoint, TransactionTarget, TransactionV1Config, AUCTION_LANE_ID,
     INSTALL_UPGRADE_LANE_ID, MINT_LANE_ID,
 };
-#[cfg(any(feature = "std", test, feature = "testing"))]
+#[cfg(any(test, feature = "testing"))]
 use alloc::collections::BTreeMap;
 use alloc::{collections::BTreeSet, vec::Vec};
 #[cfg(feature = "datasize")]
 use datasize::DataSize;
 use errors_v1::FieldDeserializationError;
-#[cfg(any(all(feature = "std", feature = "testing"), test))]
+#[cfg(any(feature = "testing", test))]
 use fields_container::FieldsContainer;
 #[cfg(any(all(feature = "std", feature = "testing"), test))]
 use fields_container::{ENTRY_POINT_MAP_KEY, TARGET_MAP_KEY};
 #[cfg(any(feature = "once_cell", test))]
 use once_cell::sync::OnceCell;
-#[cfg(any(all(feature = "std", feature = "testing"), test))]
+#[cfg(any(feature = "testing", test))]
 use rand::Rng;
 #[cfg(feature = "json-schema")]
 use schemars::JsonSchema;
@@ -48,7 +50,7 @@ use super::{
     serialization::{CalltableSerializationEnvelope, CalltableSerializationEnvelopeBuilder},
     Approval, ApprovalsHash, InitiatorAddr, PricingMode,
 };
-#[cfg(any(feature = "std", feature = "testing", test))]
+#[cfg(any(feature = "testing", test))]
 use crate::bytesrepr::Bytes;
 use crate::{Digest, DisplayIter, SecretKey, TimeDiff, Timestamp};
 
@@ -170,7 +172,7 @@ impl TransactionV1 {
         }
     }
 
-    #[cfg(any(feature = "std", test, feature = "testing"))]
+    #[cfg(any(test, feature = "testing"))]
     pub(crate) fn build(
         chain_name: String,
         timestamp: Timestamp,
@@ -282,10 +284,10 @@ impl TransactionV1 {
     }
 
     /// Returns a random, valid but possibly expired transaction.
-    #[cfg(any(all(feature = "std", feature = "testing"), test))]
+    #[cfg(any(feature = "testing", test))]
     pub fn random(rng: &mut TestRng) -> Self {
         let secret_key = SecretKey::random(rng);
-        let ttl_millis = rng.gen_range(60_000..TransactionConfig::default().max_ttl.millis());
+        let ttl_millis = rng.gen_range(60_000..TimeDiff::from_seconds(2 * 60 * 60).millis());
         let timestamp = Timestamp::random(rng);
         let container = FieldsContainer::random(rng);
         let initiator_addr_and_secret_key = InitiatorAddrAndSecretKey::SecretKey(&secret_key);
@@ -313,7 +315,7 @@ impl TransactionV1 {
         let secret_key = SecretKey::random(rng);
         let timestamp = maybe_timestamp.unwrap_or_else(Timestamp::now);
         let ttl_millis = ttl.map_or(
-            rng.gen_range(60_000..TransactionConfig::default().max_ttl.millis()),
+            rng.gen_range(60_000..TimeDiff::from_seconds(2 * 60 * 60).millis()),
             |ttl| ttl.millis(),
         );
         let container = FieldsContainer::random_of_lane(rng, lane);

types/src/transaction/transaction_v1/arg_handling.rs

@@ -4,39 +4,55 @@ use crate::TransferTarget;
 
 use crate::{bytesrepr::ToBytes, CLTyped, CLValueError, PublicKey, RuntimeArgs, URef, U512};
 
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const TRANSFER_ARG_AMOUNT: RequiredArg<U512> = RequiredArg::new("amount");
-
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const TRANSFER_ARG_SOURCE: OptionalArg<URef> = OptionalArg::new("source");
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const TRANSFER_ARG_TARGET: &str = "target";
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 // "id" for legacy reasons, if the argument is passed it is [Option]
 const TRANSFER_ARG_ID: OptionalArg<Option<u64>> = OptionalArg::new("id");
 
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const ADD_BID_ARG_PUBLIC_KEY: RequiredArg<PublicKey> = RequiredArg::new("public_key");
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const ADD_BID_ARG_DELEGATION_RATE: RequiredArg<u8> = RequiredArg::new("delegation_rate");
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const ADD_BID_ARG_AMOUNT: RequiredArg<U512> = RequiredArg::new("amount");
-
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const ADD_BID_ARG_MINIMUM_DELEGATION_AMOUNT: OptionalArg<u64> =
     OptionalArg::new("minimum_delegation_amount");
-
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const ADD_BID_ARG_MAXIMUM_DELEGATION_AMOUNT: OptionalArg<u64> =
     OptionalArg::new("maximum_delegation_amount");
-
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const ADD_BID_ARG_RESERVED_SLOTS: OptionalArg<u32> = OptionalArg::new("reserved_slots");
-
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const WITHDRAW_BID_ARG_PUBLIC_KEY: RequiredArg<PublicKey> = RequiredArg::new("public_key");
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const WITHDRAW_BID_ARG_AMOUNT: RequiredArg<U512> = RequiredArg::new("amount");
-
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const DELEGATE_ARG_DELEGATOR: RequiredArg<PublicKey> = RequiredArg::new("delegator");
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const DELEGATE_ARG_VALIDATOR: RequiredArg<PublicKey> = RequiredArg::new("validator");
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const DELEGATE_ARG_AMOUNT: RequiredArg<U512> = RequiredArg::new("amount");
 
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const UNDELEGATE_ARG_DELEGATOR: RequiredArg<PublicKey> = RequiredArg::new("delegator");
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const UNDELEGATE_ARG_VALIDATOR: RequiredArg<PublicKey> = RequiredArg::new("validator");
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const UNDELEGATE_ARG_AMOUNT: RequiredArg<U512> = RequiredArg::new("amount");
 
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const REDELEGATE_ARG_DELEGATOR: RequiredArg<PublicKey> = RequiredArg::new("delegator");
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const REDELEGATE_ARG_VALIDATOR: RequiredArg<PublicKey> = RequiredArg::new("validator");
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const REDELEGATE_ARG_AMOUNT: RequiredArg<U512> = RequiredArg::new("amount");
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 const REDELEGATE_ARG_NEW_VALIDATOR: RequiredArg<PublicKey> = RequiredArg::new("new_validator");
 
 struct RequiredArg<T> {
@@ -81,6 +97,7 @@ impl<T> OptionalArg<T> {
     }
 }
 
+#[cfg(any(feature = "json-schema", feature = "testing", test))]
 /// Creates a `RuntimeArgs` suitable for use in a transfer transaction.
 pub(crate) fn new_transfer_args<A: Into<U512>, T: Into<TransferTarget>>(
     amount: A,

types/src/transaction/transaction_v1/fields_container.rs

@@ -1,45 +1,44 @@
 #[cfg(any(feature = "testing", test))]
 use crate::testing::TestRng;
-#[cfg(any(feature = "std", feature = "testing", test))]
+#[cfg(any(feature = "testing", test))]
 use crate::{
     bytesrepr::{Bytes, ToBytes},
     transaction::transaction_v1::*,
     TransactionEntryPoint, TransactionScheduling, TransactionTarget,
 };
 #[cfg(any(feature = "testing", test))]
-use crate::{
-    PublicKey, RuntimeArgs, TransactionInvocationTarget, TransferTarget, AUCTION_LANE_ID,
-    INSTALL_UPGRADE_LANE_ID, MINT_LANE_ID,
-};
-#[cfg(any(feature = "std", feature = "testing", test))]
+use crate::{PublicKey, RuntimeArgs, TransactionInvocationTarget, TransferTarget};
+#[cfg(any(all(feature = "std", feature = "testing"), test))]
+use crate::{AUCTION_LANE_ID, INSTALL_UPGRADE_LANE_ID, MINT_LANE_ID};
+#[cfg(any(feature = "testing", test))]
 use alloc::collections::BTreeMap;
 #[cfg(any(feature = "testing", test))]
 use rand::{Rng, RngCore};
 
-#[cfg(any(feature = "std", feature = "testing", feature = "gens", test))]
+#[cfg(any(feature = "testing", feature = "gens", test))]
 pub(crate) const ARGS_MAP_KEY: u16 = 0;
-#[cfg(any(feature = "std", feature = "testing", feature = "gens", test))]
+#[cfg(any(feature = "testing", feature = "gens", test))]
 pub(crate) const TARGET_MAP_KEY: u16 = 1;
-#[cfg(any(feature = "std", feature = "testing", feature = "gens", test))]
+#[cfg(any(feature = "testing", feature = "gens", test))]
 pub(crate) const ENTRY_POINT_MAP_KEY: u16 = 2;
-#[cfg(any(feature = "std", feature = "testing", feature = "gens", test))]
+#[cfg(any(feature = "testing", feature = "gens", test))]
 pub(crate) const SCHEDULING_MAP_KEY: u16 = 3;
 
-#[cfg(any(feature = "std", feature = "testing", feature = "gens", test))]
+#[cfg(any(feature = "testing", feature = "gens", test))]
 #[derive(Clone, Eq, PartialEq, Debug)]
 pub(crate) enum FieldsContainerError {
     CouldNotSerializeField { field_index: u16 },
 }
 
-#[cfg(any(feature = "std", feature = "testing", feature = "gens", test))]
+#[cfg(any(feature = "testing", feature = "gens", test))]
 pub(crate) struct FieldsContainer {
     pub(super) args: TransactionArgs,
     pub(super) target: TransactionTarget,
     pub(super) entry_point: TransactionEntryPoint,
     pub(super) scheduling: TransactionScheduling,
 }
 
-#[cfg(any(feature = "std", feature = "testing", feature = "gens", test))]
+#[cfg(any(feature = "testing", feature = "gens", test))]
 impl FieldsContainer {
     pub(crate) fn new(
         args: TransactionArgs,
@@ -208,7 +207,7 @@ impl FieldsContainer {
     }
 
     /// Returns a random `FieldsContainer`.
-    #[cfg(any(feature = "testing", test))]
+    #[cfg(any(all(feature = "std", feature = "testing"), test))]
     pub fn random_of_lane(rng: &mut TestRng, lane_id: u8) -> Self {
         match lane_id {
             MINT_LANE_ID => Self::random_transfer(rng),
@@ -218,7 +217,7 @@ impl FieldsContainer {
         }
     }
 
-    #[cfg(any(feature = "testing", test))]
+    #[cfg(any(all(feature = "std", feature = "testing"), test))]
     fn random_transfer(rng: &mut TestRng) -> Self {
         let amount = rng.gen_range(2_500_000_000..=u64::MAX);
         let maybe_source = if rng.gen() { Some(rng.gen()) } else { None };
@@ -233,7 +232,7 @@ impl FieldsContainer {
         )
     }
 
-    #[cfg(any(feature = "testing", test))]
+    #[cfg(any(all(feature = "std", feature = "testing"), test))]
     fn random_install_upgrade(rng: &mut TestRng) -> Self {
         let target = TransactionTarget::Session {
             module_bytes: Bytes::from(rng.random_vec(0..100)),
@@ -248,7 +247,7 @@ impl FieldsContainer {
         )
     }
 
-    #[cfg(any(feature = "testing", test))]
+    #[cfg(any(all(feature = "std", feature = "testing"), test))]
     fn random_staking(rng: &mut TestRng) -> Self {
         let public_key = PublicKey::random(rng);
         let delegation_rate = rng.gen();