Skip to content

Commit

Permalink
renamed crates
Browse files Browse the repository at this point in the history
  • Loading branch information
KitHat committed Nov 12, 2024
1 parent beac8aa commit a09ca28
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions evm-template/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ serde_json = "1.0.121"
smallvec = "1.11.0"

# TODO: update to release
openzeppelin-polkadot-wrappers = { git = "https://github.com/OpenZeppelin/openzeppelin-pallet-abstractions", branch = "main", default-features = false }
openzeppelin-polkadot-wrappers-proc = { git = "https://github.com/OpenZeppelin/openzeppelin-pallet-abstractions", branch = "main", default-features = false }
openzeppelin-pallet-abstractions = { git = "https://github.com/OpenZeppelin/openzeppelin-pallet-abstractions", branch = "main", default-features = false }
openzeppelin-pallet-abstractions-proc = { git = "https://github.com/OpenZeppelin/openzeppelin-pallet-abstractions", branch = "main", default-features = false }

# Substrate
frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" }
Expand Down
6 changes: 3 additions & 3 deletions evm-template/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ parity-scale-codec = { workspace = true, features = [ "derive" ] }
scale-info = { workspace = true, features = [ "derive" ] }
smallvec = { workspace = true }

openzeppelin-polkadot-wrappers = { workspace = true }
openzeppelin-polkadot-wrappers-proc = { workspace = true }
openzeppelin-pallet-abstractions = { workspace = true }
openzeppelin-pallet-abstractions-proc = { workspace = true }

# Substrate
frame-benchmarking = { workspace = true, optional = true }
Expand Down Expand Up @@ -152,7 +152,7 @@ std = [
"frame-try-runtime?/std",
"log/std",
"nimbus-primitives/std",
"openzeppelin-polkadot-wrappers/std",
"openzeppelin-pallet-abstractions/std",
"orml-xtokens/std",
"pallet-asset-manager/std",
"pallet-assets/std",
Expand Down
6 changes: 3 additions & 3 deletions evm-template/runtime/src/configs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ use governance::{origins::Treasurer, tracks, Spender, WhitelistedCaller};
#[cfg(feature = "tanssi")]
use nimbus_primitives::NimbusId;
#[cfg(feature = "tanssi")]
use openzeppelin_polkadot_wrappers::impl_openzeppelin_tanssi;
use openzeppelin_polkadot_wrappers::{
use openzeppelin_pallet_abstractions::impl_openzeppelin_tanssi;
use openzeppelin_pallet_abstractions::{
impl_openzeppelin_assets, impl_openzeppelin_evm, impl_openzeppelin_governance,
impl_openzeppelin_system, impl_openzeppelin_xcm, AssetsConfig, EvmConfig, GovernanceConfig,
SystemConfig, XcmConfig,
};
#[cfg(not(feature = "tanssi"))]
use openzeppelin_polkadot_wrappers::{impl_openzeppelin_consensus, ConsensusConfig};
use openzeppelin_pallet_abstractions::{impl_openzeppelin_consensus, ConsensusConfig};
use pallet_ethereum::PostLogContent;
use pallet_evm::{EVMCurrencyAdapter, EnsureAccountId20, IdentityAddressMapping};
use parachains_common::message_queue::{NarrowOriginToSibling, ParaIdToSibling};
Expand Down
4 changes: 2 additions & 2 deletions evm-template/runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ pub fn native_version() -> NativeVersion {
NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
}

use openzeppelin_polkadot_wrappers_proc::openzeppelin_construct_runtime;
use openzeppelin_pallet_abstractions_proc::openzeppelin_construct_runtime;

#[cfg(not(feature = "tanssi"))]
#[openzeppelin_construct_runtime]
Expand Down Expand Up @@ -234,7 +234,7 @@ mod runtime {
struct EVM;
}

use openzeppelin_polkadot_wrappers_proc::openzeppelin_runtime_apis;
use openzeppelin_pallet_abstractions_proc::openzeppelin_runtime_apis;

#[cfg(not(feature = "tanssi"))]
#[openzeppelin_runtime_apis]
Expand Down
4 changes: 2 additions & 2 deletions generic-template/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ serde_json = "1.0.121"
smallvec = "1.11.0"

# TODO: update to release
openzeppelin-polkadot-wrappers = { git = "https://github.com/OpenZeppelin/openzeppelin-pallet-abstractions", branch = "main", default-features = false }
openzeppelin-polkadot-wrappers-proc = { git = "https://github.com/OpenZeppelin/openzeppelin-pallet-abstractions", branch = "main", default-features = false }
openzeppelin-pallet-abstractions = { git = "https://github.com/OpenZeppelin/openzeppelin-pallet-abstractions", branch = "main", default-features = false }
openzeppelin-pallet-abstractions-proc = { git = "https://github.com/OpenZeppelin/openzeppelin-pallet-abstractions", branch = "main", default-features = false }

# Substrate
frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" }
Expand Down
6 changes: 3 additions & 3 deletions generic-template/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ parity-scale-codec = { workspace = true, features = [ "derive" ] }
scale-info = { workspace = true, features = [ "derive" ] }
smallvec = { workspace = true }

openzeppelin-polkadot-wrappers = { workspace = true }
openzeppelin-polkadot-wrappers-proc = { workspace = true }
openzeppelin-pallet-abstractions = { workspace = true }
openzeppelin-pallet-abstractions-proc = { workspace = true }

# Substrate
frame-benchmarking = { workspace = true, optional = true }
Expand Down Expand Up @@ -133,7 +133,7 @@ std = [
"frame-try-runtime?/std",
"log/std",
"nimbus-primitives/std",
"openzeppelin-polkadot-wrappers/std",
"openzeppelin-pallet-abstractions/std",
"orml-xtokens/std",
"pallet-asset-manager/std",
"pallet-assets/std",
Expand Down
2 changes: 1 addition & 1 deletion generic-template/runtime/src/apis.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use openzeppelin_polkadot_wrappers_proc::openzeppelin_runtime_apis;
use openzeppelin_pallet_abstractions_proc::openzeppelin_runtime_apis;

#[cfg(all(not(feature = "async-backing"), not(feature = "tanssi")))]
use crate::Aura;
Expand Down
6 changes: 3 additions & 3 deletions generic-template/runtime/src/configs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ use frame_system::{
pub use governance::origins::pallet_custom_origins;
use governance::{origins::Treasurer, tracks, Spender, WhitelistedCaller};
#[cfg(feature = "tanssi")]
use openzeppelin_polkadot_wrappers::impl_openzeppelin_tanssi;
use openzeppelin_polkadot_wrappers::{
use openzeppelin_pallet_abstractions::impl_openzeppelin_tanssi;
use openzeppelin_pallet_abstractions::{
impl_openzeppelin_assets, impl_openzeppelin_governance, impl_openzeppelin_system,
impl_openzeppelin_xcm, AssetsConfig, GovernanceConfig, SystemConfig, XcmConfig,
};
#[cfg(not(feature = "tanssi"))]
use openzeppelin_polkadot_wrappers::{impl_openzeppelin_consensus, ConsensusConfig};
use openzeppelin_pallet_abstractions::{impl_openzeppelin_consensus, ConsensusConfig};
use parachains_common::message_queue::{NarrowOriginToSibling, ParaIdToSibling};
use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
#[cfg(not(feature = "tanssi"))]
Expand Down
2 changes: 1 addition & 1 deletion generic-template/runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ pub fn native_version() -> NativeVersion {
NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
}

use openzeppelin_polkadot_wrappers_proc::openzeppelin_construct_runtime;
use openzeppelin_pallet_abstractions_proc::openzeppelin_construct_runtime;

#[cfg(feature = "tanssi")]
#[openzeppelin_construct_runtime]
Expand Down

0 comments on commit a09ca28

Please sign in to comment.