From efbf03a170437804269cfaa74c040c5fb5653d89 Mon Sep 17 00:00:00 2001 From: mfahampshire Date: Mon, 5 Jan 2026 15:25:44 +0000 Subject: [PATCH] rename contract imports + remove package --- .../cosmwasm-smart-contracts/mixnet-contract/Cargo.toml | 2 +- .../cosmwasm-smart-contracts/mixnet-contract/src/error.rs | 4 ++-- .../mixnet-contract/src/events.rs | 2 +- .../mixnet-contract/src/helpers.rs | 2 +- .../cosmwasm-smart-contracts/mixnet-contract/src/lib.rs | 2 +- .../cosmwasm-smart-contracts/mixnet-contract/src/msg.rs | 6 +++--- .../mixnet-contract/src/nym_node.rs | 2 +- .../mixnet-contract/src/rewarding/helpers.rs | 2 +- .../mixnet-contract/src/signing_types.rs | 4 ++-- .../cosmwasm-smart-contracts/mixnet-contract/src/types.rs | 2 +- .../nym-performance-contract/Cargo.toml | 2 +- .../cosmwasm-smart-contracts/vesting-contract/Cargo.toml | 4 ++-- .../vesting-contract/src/error.rs | 2 +- .../cosmwasm-smart-contracts/vesting-contract/src/lib.rs | 4 ++-- .../vesting-contract/src/messages.rs | 8 ++++---- .../vesting-contract/src/types.rs | 4 ++-- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml b/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml index 21586838ff..fb7143723d 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml @@ -22,7 +22,7 @@ semver = { workspace = true, features = ["serde"] } # we still have to preserve that import for `JsonSchema` for `Layer` type (since we can't use cw_serde macro due to custom serde impl) schemars = { workspace = true } thiserror = { workspace = true } -contracts-common = { path = "../contracts-common", package = "nym-contracts-common" } +nym-contracts-common = { workspace = true } humantime-serde = { workspace = true } utoipa = { workspace = true, optional = true } diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/error.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/error.rs index 9298b38523..1d27cd69d0 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/error.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/error.rs @@ -5,10 +5,10 @@ use crate::nym_node::Role; use crate::{ EpochEventId, EpochState, IntervalEventId, NodeId, OperatingCostRange, ProfitMarginRange, }; -use contracts_common::Percent; -use contracts_common::signing::verifier::ApiVerifierError; use cosmwasm_std::{Addr, Coin, Decimal, Uint128}; use cw_controllers::AdminError; +use nym_contracts_common::Percent; +use nym_contracts_common::signing::verifier::ApiVerifierError; use thiserror::Error; #[derive(Error, Debug, PartialEq)] diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs index a53c5dc1a9..572b8131a6 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs @@ -8,8 +8,8 @@ use crate::nym_node::Role; use crate::reward_params::{ActiveSetUpdate, IntervalRewardParams, IntervalRewardingParamsUpdate}; use crate::rewarding::RewardDistribution; use crate::{BlockHeight, ContractStateParamsUpdate, EpochId, IdentityKeyRef, Interval, NodeId}; -pub use contracts_common::events::*; use cosmwasm_std::{Addr, Coin, Decimal, Event, attr}; +pub use nym_contracts_common::events::*; use std::fmt::Display; pub const EVENT_VERSION_PREFIX: &str = "v2_"; diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/helpers.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/helpers.rs index b5032e64be..dc56386238 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/helpers.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/helpers.rs @@ -7,8 +7,8 @@ use crate::{ EpochEventId, IntervalEventId, MixNodeBond, MixNodeDetails, NodeId, NodeRewarding, NymNodeBond, NymNodeDetails, PendingNodeChanges, }; -use contracts_common::IdentityKeyRef; use cosmwasm_std::{Coin, Decimal, StdError, StdResult, Uint128}; +use nym_contracts_common::IdentityKeyRef; #[track_caller] pub fn compare_decimals(a: Decimal, b: Decimal, epsilon: Option) { diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/lib.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/lib.rs index eb1d533270..3c6f4b6b08 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/lib.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/lib.rs @@ -21,7 +21,6 @@ pub mod types; pub use config_score::*; pub use constants::*; -pub use contracts_common::types::*; pub use cosmwasm_std::{Addr, Coin, Decimal, Fraction}; pub use delegation::{ Delegation, PagedAllDelegationsResponse, PagedDelegatorDelegationsResponse, @@ -41,6 +40,7 @@ pub use mixnode::{ NodeRewarding, PagedMixnodeBondsResponse, UnbondedMixnode, }; pub use msg::*; +pub use nym_contracts_common::types::*; pub use nym_node::{NymNode, NymNodeBond, NymNodeDetails, PendingNodeChanges}; pub use pending_events::{ EpochEventId, IntervalEventId, NumberOfPendingEventsResponse, PendingEpochEvent, diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs index a85d86fedf..4b0d31016d 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs @@ -18,9 +18,9 @@ use crate::{ VersionScoreFormulaParams, }; use crate::{OperatingCostRange, ProfitMarginRange}; -use contracts_common::{IdentityKey, Percent, signing::MessageSignature}; use cosmwasm_schema::cw_serde; use cosmwasm_std::{Coin, Decimal}; +use nym_contracts_common::{IdentityKey, Percent, signing::MessageSignature}; use std::time::Duration; #[cfg(feature = "schema")] @@ -55,9 +55,9 @@ use crate::{ types::{ContractState, ContractStateParams}, }; #[cfg(feature = "schema")] -use contracts_common::{ContractBuildInformation, signing::Nonce}; -#[cfg(feature = "schema")] use cosmwasm_schema::QueryResponses; +#[cfg(feature = "schema")] +use nym_contracts_common::{ContractBuildInformation, signing::Nonce}; #[cw_serde] pub struct InstantiateMsg { diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/nym_node.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/nym_node.rs index 6fc172db09..d82ca38907 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/nym_node.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/nym_node.rs @@ -3,10 +3,10 @@ use crate::error::MixnetContractError; use crate::{EpochEventId, EpochId, Gateway, IntervalEventId, MixNode, NodeId, NodeRewarding}; -use contracts_common::IdentityKey; use cosmwasm_schema::cw_serde; use cosmwasm_std::{Addr, Coin, Decimal, StdError, StdResult}; use cw_storage_plus::{IntKey, Key, KeyDeserialize, PrimaryKey}; +use nym_contracts_common::IdentityKey; use std::fmt::{Display, Formatter}; #[cw_serde] diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/rewarding/helpers.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/rewarding/helpers.rs index 4d9ca75459..f128a9c2c6 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/rewarding/helpers.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/rewarding/helpers.rs @@ -1,8 +1,8 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use contracts_common::truncate_decimal; use cosmwasm_std::{Coin, Decimal, Uint128}; +use nym_contracts_common::truncate_decimal; /// Truncates all decimal points so that the reward would fit in a `Coin` and so that we would /// never attempt to reward more than the owner is due diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/signing_types.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/signing_types.rs index 00130d52d8..6cd247d18c 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/signing_types.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/signing_types.rs @@ -3,11 +3,11 @@ use crate::nym_node::NymNode; use crate::{Gateway, MixNode, NodeCostParams}; -use contracts_common::signing::{ +use cosmwasm_std::{Addr, Coin}; +use nym_contracts_common::signing::{ ContractMessageContent, LegacyContractMessageContent, MessageType, Nonce, SignableMessage, SigningPurpose, }; -use cosmwasm_std::{Addr, Coin}; use serde::Serialize; pub type SignableMixNodeBondingMsg = SignableMessage>; diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/types.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/types.rs index ebe198186d..1b0590df1f 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/src/types.rs +++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/types.rs @@ -5,10 +5,10 @@ use crate::EpochId; use crate::config_score::{ConfigScoreParams, OutdatedVersionWeights, VersionScoreFormulaParams}; use crate::nym_node::Role; use crate::reward_params::RewardedSetParams; -use contracts_common::Percent; use cosmwasm_schema::cw_serde; use cosmwasm_std::Coin; use cosmwasm_std::{Addr, Uint128}; +use nym_contracts_common::Percent; use std::fmt::{Display, Formatter}; // type aliases for better reasoning about available data diff --git a/common/cosmwasm-smart-contracts/nym-performance-contract/Cargo.toml b/common/cosmwasm-smart-contracts/nym-performance-contract/Cargo.toml index 356434ac77..5c7ebce9c4 100644 --- a/common/cosmwasm-smart-contracts/nym-performance-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/nym-performance-contract/Cargo.toml @@ -19,7 +19,7 @@ cosmwasm-std = { workspace = true } cosmwasm-schema = { workspace = true } cw-controllers = { workspace = true } -nym-contracts-common = { path = "../contracts-common" } +nym-contracts-common = { workspace = true } [features] diff --git a/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml b/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml index 9fdc5d9db7..cc29aebe12 100644 --- a/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml @@ -11,8 +11,8 @@ repository = { workspace = true } cosmwasm-std = { workspace = true } cosmwasm-schema = { workspace = true } cw2 = { workspace = true, optional = true } -mixnet-contract-common = { path = "../mixnet-contract", package = "nym-mixnet-contract-common" } -contracts-common = { path = "../contracts-common", package = "nym-contracts-common" } +nym-mixnet-contract-common = { workspace = true } +nym-contracts-common = { workspace = true } serde = { workspace = true, features = ["derive"] } thiserror = { workspace = true } # without this feature, cargo clippy emits a ton of incompatibility warnings diff --git a/common/cosmwasm-smart-contracts/vesting-contract/src/error.rs b/common/cosmwasm-smart-contracts/vesting-contract/src/error.rs index c8b1c03594..996a666f37 100644 --- a/common/cosmwasm-smart-contracts/vesting-contract/src/error.rs +++ b/common/cosmwasm-smart-contracts/vesting-contract/src/error.rs @@ -3,7 +3,7 @@ use crate::account::VestingAccountStorageKey; use cosmwasm_std::{Addr, Coin, OverflowError, StdError, Uint128}; -use mixnet_contract_common::NodeId; +use nym_mixnet_contract_common::NodeId; use thiserror::Error; #[derive(Error, Debug, PartialEq)] diff --git a/common/cosmwasm-smart-contracts/vesting-contract/src/lib.rs b/common/cosmwasm-smart-contracts/vesting-contract/src/lib.rs index 741fde4f7b..8e462fb4bc 100644 --- a/common/cosmwasm-smart-contracts/vesting-contract/src/lib.rs +++ b/common/cosmwasm-smart-contracts/vesting-contract/src/lib.rs @@ -6,7 +6,7 @@ use cosmwasm_schema::cw_serde; use cosmwasm_std::{Addr, Coin}; -use mixnet_contract_common::NodeId; +use nym_mixnet_contract_common::NodeId; pub mod account; pub mod error; @@ -126,8 +126,8 @@ pub struct AccountsResponse { #[cfg(test)] mod test { - use contracts_common::Percent; use cosmwasm_std::Uint128; + use nym_contracts_common::Percent; use std::str::FromStr; use crate::PledgeCap; diff --git a/common/cosmwasm-smart-contracts/vesting-contract/src/messages.rs b/common/cosmwasm-smart-contracts/vesting-contract/src/messages.rs index 9b2d4aa6e9..cade5dec81 100644 --- a/common/cosmwasm-smart-contracts/vesting-contract/src/messages.rs +++ b/common/cosmwasm-smart-contracts/vesting-contract/src/messages.rs @@ -2,19 +2,19 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{PledgeCap, VestingSpecification}; -use contracts_common::signing::MessageSignature; use cosmwasm_schema::cw_serde; use cosmwasm_std::{Coin, Timestamp}; -use mixnet_contract_common::{ +use nym_contracts_common::signing::MessageSignature; +use nym_mixnet_contract_common::{ Gateway, MixNode, NodeId, gateway::GatewayConfigUpdate, mixnode::{MixNodeConfigUpdate, NodeCostParams}, }; -#[cfg(feature = "schema")] -use contracts_common::ContractBuildInformation; #[cfg(feature = "schema")] use cosmwasm_schema::QueryResponses; +#[cfg(feature = "schema")] +use nym_contracts_common::ContractBuildInformation; #[cfg(feature = "schema")] use crate::{ diff --git a/common/cosmwasm-smart-contracts/vesting-contract/src/types.rs b/common/cosmwasm-smart-contracts/vesting-contract/src/types.rs index 0b15346804..35ba50a97f 100644 --- a/common/cosmwasm-smart-contracts/vesting-contract/src/types.rs +++ b/common/cosmwasm-smart-contracts/vesting-contract/src/types.rs @@ -1,10 +1,10 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use contracts_common::Percent; use cosmwasm_schema::cw_serde; use cosmwasm_std::{Coin, Timestamp, Uint128}; -use mixnet_contract_common::NodeId; +use nym_contracts_common::Percent; +use nym_mixnet_contract_common::NodeId; use std::str::FromStr; #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]