Skip to content

test-runtime: json_patch dep removed #3062

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

Merged
bkchr merged 1 commit into from
Jan 25, 2024
Merged

test-runtime: json_patch dep removed #3062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 1 addition & 12 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.

1 change: 1 addition & 0 deletions substrate/client/chain-spec/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ pub use self::{
GenesisBlockBuilder,
},
genesis_config_builder::GenesisConfigBuilderRuntimeCaller,
json_patch::merge as json_merge,
Copy link
Copy Markdown
Contributor Author

@michalkucharczyk michalkucharczyk Jan 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe not most elegant solution, but I don't want to add crate for this single tiny merge function. Let me know if it is ok.

};
pub use sc_chain_spec_derive::{ChainSpecExtension, ChainSpecGroup};

Expand Down
2 changes: 1 addition & 1 deletion substrate/test-utils/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ log = { version = "0.4.17", default-features = false }
[dev-dependencies]
futures = "0.3.21"
sc-block-builder = { path = "../../client/block-builder" }
sc-chain-spec = { path = "../../client/chain-spec" }
sc-executor = { path = "../../client/executor" }
sc-executor-common = { path = "../../client/executor/common" }
sp-consensus = { path = "../../primitives/consensus/common" }
substrate-test-runtime-client = { path = "client" }
sp-tracing = { path = "../../primitives/tracing" }
json-patch = { version = "1.0.0", default-features = false }
serde = { version = "1.0.195", features = ["alloc", "derive"], default-features = false }
serde_json = { version = "1.0.111", default-features = false, features = ["alloc"] }

Expand Down
2 changes: 1 addition & 1 deletion substrate/test-utils/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,7 @@ mod tests {
}
});

json_patch::merge(&mut default_config, &patch);
sc_chain_spec::json_merge(&mut default_config, patch);

// Build genesis config using custom json:
let mut t = BasicExternalities::new_empty();
Expand Down