Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rename parity-scale-codec to codec #90

Merged
merged 3 commits into from
Apr 20, 2024
Merged

rename parity-scale-codec to codec #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd1fdca
rename parity-scale-codec to codec
Szegoo Apr 20, 2024
8e1d893
Merge remote-tracking branch 'origin/main' into rename-codec
Szegoo Apr 20, 2024
8bd5d35
fix
Szegoo Apr 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ clap = { version = "4.4.8" }
futures = { version = "0.3.29" }
jsonrpsee = { version = "0.16.3" }
color-print = "0.3.4"
parity-scale-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
hex-literal = { version = "0.4.1" }
log = { version = "0.4.20", default-features = false }
scale-info = { version = "2.9.0", default-features = false }
Expand Down Expand Up @@ -136,12 +136,12 @@ orml-asset-registry = { version = "0.7.0", default-features = false }
orml-traits = { version = "0.7.0", default-features = false }

# Polytope Labs
ismp = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
pallet-ismp = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
ismp-parachain = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
ismp-parachain-inherent = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
pallet-ismp-runtime-api = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
ismp-parachain-runtime-api = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
ismp = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-to-string", default-features = false }
pallet-ismp = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-to-string", default-features = false }
ismp-parachain = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-to-string", default-features = false }
ismp-parachain-inherent = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-to-string", default-features = false }
pallet-ismp-runtime-api = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-to-string", default-features = false }
ismp-parachain-runtime-api = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-to-string", default-features = false }

# Local
regionx-primitives = { path = "./runtime/primitives", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repository.workspace = true
[dependencies]
clap = { workspace = true, features = ["derive"]}
log = { workspace = true }
parity-scale-codec = { workspace = true }
codec = { workspace = true }
serde = { workspace = true, features = ["derive"]}
jsonrpsee = { workspace = true, features = ["server"] }
futures = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions runtime/primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ homepage.workspace = true
repository.workspace = true

[dependencies]
parity-scale-codec = { workspace = true }
codec = { workspace = true }
scale-info = { workspace = true }

sp-core = { workspace = true, default-features = false }
Expand All @@ -16,7 +16,7 @@ sp-runtime = { workspace = true, default-features = false }
[features]
default = ["std"]
std = [
"parity-scale-codec/std",
"codec/std",
"scale-info/std",
"sp-core/std",
"sp-runtime/std",
Expand Down
2 changes: 1 addition & 1 deletion runtime/primitives/src/assets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
use codec::{Decode, Encode, MaxEncodedLen};
use scale_info::TypeInfo;

#[derive(
Expand Down
4 changes: 2 additions & 2 deletions runtime/regionx/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
substrate-wasm-builder = { workspace = true }

[dependencies]
parity-scale-codec = { workspace = true }
codec = { workspace = true }
hex-literal = { workspace = true, optional = true }
log = { workspace = true }
scale-info = { workspace = true }
Expand Down Expand Up @@ -92,7 +92,7 @@ parachain-info = { workspace = true }
[features]
default = ["std"]
std = [
"parity-scale-codec/std",
"codec/std",
"cumulus-pallet-aura-ext/std",
"cumulus-pallet-dmp-queue/std",
"cumulus-pallet-parachain-system/std",
Expand Down
2 changes: 1 addition & 1 deletion runtime/regionx/src/impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::{AssetId, Runtime, RuntimeCall};
use codec::{Decode, Encode, MaxEncodedLen};
use frame_support::traits::InstanceFilter;
use orml_asset_registry::DefaultAssetMetadata;
use orml_traits::asset_registry::AssetProcessor;
use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
use scale_info::TypeInfo;
use sp_runtime::{DispatchError, RuntimeDebug};

Expand Down
2 changes: 1 addition & 1 deletion runtime/regionx/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ impl pallet_assets::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type Balance = Balance;
type AssetId = AssetId;
type AssetIdParameter = parity_scale_codec::Compact<AssetId>;
type AssetIdParameter = codec::Compact<AssetId>;
type Currency = Balances;
// TODO after https://github.com/RegionX-Labs/RegionX-Node/issues/72:
// Allow only TC to create an asset.
Expand Down
Loading