Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Fix sp-session typo #4273

Merged
merged 3 commits into from
Dec 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .maintain/rename-crates-for-2.0.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function rename() {
rename_gitlabci $old $new
# and it appears, we have the same syntax in rust files
rust_rename $old $new

# but generally we have the snail case syntax in rust files
old=$(echo $old | sed s/-/_/g );
new=$(echo $new | sed s/-/_/g );
Expand Down Expand Up @@ -57,7 +57,7 @@ TO_RENAME=(
"substrate-runtime-interface-proc-macro sp-runtime-interface-proc-macro"
"substrate-runtime-interface-test-wasm sp-runtime-interface-test-wasm"
"substrate-serializer sp-serializer"
"substrate-session sp-sesssion"
"substrate-session sp-session"
"sr-api sp-api"
"sr-api-proc-macro sp-api-proc-macro"
"sr-api-test sp-api-test"
Expand Down Expand Up @@ -103,10 +103,10 @@ TO_RENAME=(
"substrate-state-db sc-state-db"
"substrate-telemetry sc-telemetry"
"substrate-tracing sc-tracing"

);

for rule in "${TO_RENAME[@]}"
do
rename "$rule";
done
done
12 changes: 6 additions & 6 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions bin/node-template/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ safe-mix = { version = "1.0.0", default-features = false }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
sp-api = { path = "../../../primitives/sr-api", default-features = false }
sp-runtime = { path = "../../../primitives/sr-primitives", default-features = false }
sp-sesssion = { path = "../../../primitives/session", default-features = false }
sp-session = { path = "../../../primitives/session", default-features = false }
sudo = { package = "pallet-sudo", path = "../../../frame/sudo", default-features = false }
support = { package = "frame-support", path = "../../../frame/support", default-features = false }
system = { package = "frame-system", path = "../../../frame/system", default-features = false }
Expand Down Expand Up @@ -56,7 +56,7 @@ std = [
"serde",
"sp-api/std",
"sp-runtime/std",
"sp-sesssion/std",
"sp-session/std",
"sudo/std",
"support/std",
"system/std",
Expand Down
2 changes: 1 addition & 1 deletion bin/node-template/runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ impl_runtime_apis! {
}
}

impl sp_sesssion::SessionKeys<Block> for Runtime {
impl sp_session::SessionKeys<Block> for Runtime {
fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
opaque::SessionKeys::generate(seed)
}
Expand Down
4 changes: 2 additions & 2 deletions bin/node/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ sp-api = { path = "../../../primitives/sr-api", default-features = false }
sp-runtime = { path = "../../../primitives/sr-primitives", default-features = false }
sp-staking = { path = "../../../primitives/sr-staking-primitives", default-features = false }
sp-keyring = { path = "../../../primitives/keyring", optional = true }
sp-sesssion = { path = "../../../primitives/session", default-features = false }
sp-session = { path = "../../../primitives/session", default-features = false }
txpool-runtime-api = { package = "sp-transaction-pool-runtime-api", path = "../../../primitives/transaction-pool/runtime-api", default-features = false }
version = { package = "sp-version", path = "../../../primitives/sr-version", default-features = false }

Expand Down Expand Up @@ -107,7 +107,7 @@ std = [
"sp-staking/std",
"staking/std",
"sp-keyring",
"sp-sesssion/std",
"sp-session/std",
"sudo/std",
"support/std",
"system-rpc-runtime-api/std",
Expand Down
2 changes: 1 addition & 1 deletion bin/node/runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ impl_runtime_apis! {
}
}

impl sp_sesssion::SessionKeys<Block> for Runtime {
impl sp_session::SessionKeys<Block> for Runtime {
fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
SessionKeys::generate(seed)
}
Expand Down
2 changes: 1 addition & 1 deletion client/rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ primitives = { package = "sp-core", path = "../../primitives/core" }
rpc = { package = "jsonrpc-core", version = "14.0.3" }
runtime_version = { package = "sp-version", path = "../../primitives/sr-version" }
serde_json = "1.0.41"
session = { package = "sp-sesssion", path = "../../primitives/session" }
session = { package = "sp-session", path = "../../primitives/session" }
sp-runtime = { path = "../../primitives/sr-primitives" }
rpc-primitives = { package = "sp-rpc", path = "../../primitives/rpc" }
state_machine = { package = "sp-state-machine", path = "../../primitives/state-machine" }
Expand Down
2 changes: 1 addition & 1 deletion client/service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ sp-io = { path = "../../primitives/sr-io" }
sp-runtime = { path = "../../primitives/sr-primitives" }
sp-blockchain = { path = "../../primitives/blockchain" }
primitives = { package = "sp-core", path = "../../primitives/core" }
session = { package = "sp-sesssion", path = "../../primitives/session" }
session = { package = "sp-session", path = "../../primitives/session" }
app-crypto = { package = "sc-application-crypto", path = "../../primitives/application-crypto" }
consensus_common = { package = "sp-consensus", path = "../../primitives/consensus/common" }
network = { package = "sc-network", path = "../network" }
Expand Down
2 changes: 1 addition & 1 deletion primitives/session/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "sp-sesssion"
name = "sp-session"
version = "2.0.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion test/utils/runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ runtime_io = { package = "sp-io", path = "../../../primitives/sr-io", default-fe
runtime_support = { package = "frame-support", path = "../../../frame/support", default-features = false }
runtime_version = { package = "sp-version", path = "../../../primitives/sr-version", default-features = false }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
session = { package = "sp-sesssion", path = "../../../primitives/session", default-features = false }
session = { package = "sp-session", path = "../../../primitives/session", default-features = false }
sp-api = { path = "../../../primitives/sr-api", default-features = false }
sp-runtime = { path = "../../../primitives/sr-primitives", default-features = false }
pallet-babe = { path = "../../../frame/babe", default-features = false }
Expand Down