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

Moves polkadot/keystore to substrate #221

Merged
merged 3 commits into from
Jun 19, 2018
Merged

Moves polkadot/keystore to substrate #221

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c17e14
Moves polkadot/keystore to substrate
0x7CFE Jun 18, 2018
39104ef
Fixes email
0x7CFE Jun 18, 2018
c3581c9
Fixes header comment
0x7CFE Jun 18, 2018
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
34 changes: 17 additions & 17 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.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ members = [
"polkadot/collator",
"polkadot/consensus",
"polkadot/executor",
"polkadot/keystore",
"polkadot/parachain",
"polkadot/primitives",
"polkadot/runtime",
Expand Down Expand Up @@ -55,6 +54,7 @@ members = [
"substrate/serializer",
"substrate/state-machine",
"substrate/test-runtime",
"substrate/keystore",

"demo/cli",
"demo/executor",
Expand Down
2 changes: 1 addition & 1 deletion polkadot/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ polkadot-consensus = { path = "../consensus" }
polkadot-executor = { path = "../executor" }
polkadot-api = { path = "../api" }
polkadot-transaction-pool = { path = "../transaction-pool" }
polkadot-keystore = { path = "../keystore" }
substrate-keystore = { path = "../../substrate/keystore" }
substrate-runtime-io = { path = "../../substrate/runtime-io" }
substrate-primitives = { path = "../../substrate/primitives" }
substrate-network = { path = "../../substrate/network" }
Expand Down
2 changes: 1 addition & 1 deletion polkadot/service/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extern crate polkadot_executor;
extern crate polkadot_api;
extern crate polkadot_consensus as consensus;
extern crate polkadot_transaction_pool as transaction_pool;
extern crate polkadot_keystore as keystore;
extern crate substrate_keystore as keystore;
extern crate substrate_runtime_io as runtime_io;
extern crate substrate_primitives as primitives;
extern crate substrate_network as network;
Expand Down
4 changes: 2 additions & 2 deletions polkadot/keystore/Cargo.toml → substrate/keystore/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "polkadot-keystore"
name = "substrate-keystore"
version = "0.1.0"
authors = ["Parity Technologies <robert@parity.io>"]
Copy link
Contributor

Choose a reason for hiding this comment

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

this one is my bad, sorry -- but we should fix the email to admin@parity.io


[dependencies]
ethcore-crypto = { git = "https://github.com/paritytech/parity.git", default_features = false }
ed25519 = { path = "../../substrate/ed25519" }
ed25519 = { path = "../ed25519" }
error-chain = "0.11"
hex = "0.3"
rand = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion polkadot/keystore/src/lib.rs → substrate/keystore/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
Copy link
Contributor

Choose a reason for hiding this comment

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

update doc comment

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Could you please clarify, what needs to be updated?

Copy link
Contributor

@rphmeier rphmeier Jun 18, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

it says Polkadot instead of substrate, that's all

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well, currently there are a ton of sources in the substrate that mention Polkadot in their headers. So, they simply weren't refactored yet?

Copy link
Contributor

Choose a reason for hiding this comment

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

yep, substrate headers should say Substrate


//! Keystore (and session key management) for polkadot.
//! Keystore (and session key management) for ed25519 based chains like Polkadot.

extern crate ethcore_crypto as crypto;
extern crate subtle;
Expand Down