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

Phase 1 of repo reorg #719

Merged
arkpar merged 24 commits into from
Sep 12, 2018
Merged

Phase 1 of repo reorg #719

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8552090
Remove unneeded script
gavofyork Sep 11, 2018
5e80b1a
Rename Substrate Demo -> Substrate
gavofyork Sep 11, 2018
4aa94ec
Rename demo -> node
gavofyork Sep 11, 2018
eb5cc9d
Build wasm from last rename.
gavofyork Sep 11, 2018
4147286
Merge ed25519 into substrate-primitives
gavofyork Sep 11, 2018
0ac78f9
Minor tweak
gavofyork Sep 11, 2018
804ad47
Rename substrate -> core
gavofyork Sep 11, 2018
f637a58
Move substrate-runtime-support to core/runtime/support
gavofyork Sep 11, 2018
bcab227
Rename/move substrate-runtime-version
gavofyork Sep 11, 2018
54330e4
Move codec up a level
gavofyork Sep 11, 2018
6b02eb5
Rename substrate-codec -> parity-codec
gavofyork Sep 11, 2018
6412d02
Move environmental up a level
gavofyork Sep 11, 2018
750c7ee
Move pwasm-* up to top, ready for removal
gavofyork Sep 11, 2018
9a3cd9f
Remove requirement of s-r-support from s-r-primitives
gavofyork Sep 11, 2018
2f47756
Move core/runtime/primitives into core/runtime-primitives
gavofyork Sep 11, 2018
bc8265c
Remove s-r-support dep from s-r-version
gavofyork Sep 11, 2018
b25b789
Remove dep of s-r-support from bft
gavofyork Sep 11, 2018
0fb1e94
Remove dep of s-r-support from node/consensus
gavofyork Sep 11, 2018
c70f16a
Sever all other core deps from s-r-support
gavofyork Sep 12, 2018
24e37a9
Forgot the no_std directive
gavofyork Sep 12, 2018
5103a69
Rename non-SRML modules to sr-* to avoid match clashes
gavofyork Sep 12, 2018
0840e3f
Move runtime/* to srml/*
gavofyork Sep 12, 2018
2a919d1
Rename substrate-runtime-* -> srml-*
gavofyork Sep 12, 2018
f7195cf
Move srml to top-level
gavofyork Sep 12, 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
Prev Previous commit
Move srml to top-level
  • Loading branch information
@gavofyork
gavofyork committed Sep 12, 2018
commit f7195cfae53d2e9ebfa6445449cb3d58d73c9281
26 changes: 13 additions & 13 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ members = [
"core/sr-sandbox",
"core/sr-std",
"core/sr-version",
"core/srml/support",
"core/srml/balances",
"core/srml/consensus",
"core/srml/contract",
"core/srml/council",
"core/srml/democracy",
"core/srml/example",
"core/srml/executive",
"srml/support",
"srml/balances",
"srml/consensus",
"srml/contract",
"srml/council",
"srml/democracy",
"srml/example",
"srml/executive",
"core/sr-primitives",
"core/srml/session",
"core/srml/staking",
"core/srml/system",
"core/srml/timestamp",
"core/srml/treasury",
"srml/session",
"srml/staking",
"srml/system",
"srml/timestamp",
"srml/treasury",
"core/serializer",
"core/service",
"core/state-db",
Expand Down
2 changes: 1 addition & 1 deletion core/test-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ parity-codec = { path = "../../codec" }
substrate-executor = { path = "../executor" }
substrate-keyring = { path = "../../core/keyring" }
substrate-primitives = { path = "../primitives" }
srml-support = { path = "../srml/support" }
srml-support = { path = "../../srml/support" }
substrate-test-runtime = { path = "../test-runtime" }
sr-primitives = { path = "../sr-primitives" }
hashdb = "0.2.1"
Expand Down
6 changes: 3 additions & 3 deletions core/test-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ log = { version = "0.3", optional = true }
hex-literal = { version = "0.1.0", optional = true }
serde = { version = "1.0", optional = true }
serde_derive = { version = "1.0", optional = true }
substrate-keyring = { path = "../keyring", optional = true }
parity-codec = { path = "../../codec", default-features = false }
parity-codec-derive = { path = "../../codec/derive", default-features = false }
substrate-keyring = { path = "../keyring", optional = true }
substrate-primitives = { path = "../primitives", default-features = false }
sr-std = { path = "../sr-std", default-features = false }
sr-io = { path = "../sr-io", default-features = false }
srml-support = { path = "../srml/support", default-features = false }
substrate-primitives = { path = "../primitives", default-features = false }
sr-primitives = { path = "../sr-primitives", default-features = false }
sr-version = { path = "../sr-version", default-features = false }
srml-support = { path = "../../srml/support", default-features = false }

[features]
default = ["std"]
Expand Down
30 changes: 15 additions & 15 deletions core/test-runtime/wasm/Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions core/test-runtime/wasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ log = { version = "0.3", optional = true }
hex-literal = { version = "0.1.0", optional = true }
parity-codec = { path = "../../../codec", default-features = false }
parity-codec-derive = { path = "../../../codec/derive", default-features = false }
substrate-primitives = { path = "../../primitives", default-features = false }
sr-std = { path = "../../sr-std", default-features = false }
sr-io = { path = "../../sr-io", default-features = false }
srml-support = { path = "../support", default-features = false }
sr-version = { path = "../../sr-version", default-features = false }
substrate-primitives = { path = "../../primitives", default-features = false }
sr-primitives = { path = "../../sr-primitives", default-features = false }
srml-support = { path = "../../../srml/support", default-features = false }

[features]
default = []
Expand Down
2 changes: 1 addition & 1 deletion doc/packages/substrate.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ include::../../core/rpc/README.adoc[]

include::../../core/rpc-servers/README.adoc[]

include::../../core/srml/README.adoc[]
include::../../srml/README.adoc[]

include::../../core/sr-io/README.adoc[]

Expand Down
16 changes: 8 additions & 8 deletions node/executor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ node-runtime = { path = "../runtime" }
[dev-dependencies]
substrate-keyring = { path = "../../core/keyring" }
sr-primitives = { path = "../../core/sr-primitives" }
srml-support = { path = "../../core/srml/support" }
srml-balances = { path = "../../core/srml/balances" }
srml-session = { path = "../../core/srml/session" }
srml-staking = { path = "../../core/srml/staking" }
srml-system = { path = "../../core/srml/system" }
srml-consensus = { path = "../../core/srml/consensus" }
srml-timestamp = { path = "../../core/srml/timestamp" }
srml-treasury = { path = "../../core/srml/treasury" }
srml-support = { path = "../../srml/support" }
srml-balances = { path = "../../srml/balances" }
srml-session = { path = "../../srml/session" }
srml-staking = { path = "../../srml/staking" }
srml-system = { path = "../../srml/system" }
srml-consensus = { path = "../../srml/consensus" }
srml-timestamp = { path = "../../srml/timestamp" }
srml-treasury = { path = "../../srml/treasury" }
24 changes: 12 additions & 12 deletions node/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ parity-codec = { path = "../../codec" }
parity-codec-derive = { path = "../../codec/derive" }
sr-std = { path = "../../core/sr-std" }
sr-io = { path = "../../core/sr-io" }
srml-support = { path = "../../core/srml/support" }
srml-support = { path = "../../srml/support" }
substrate-primitives = { path = "../../core/primitives" }
substrate-keyring = { path = "../../core/keyring" }
srml-balances = { path = "../../core/srml/balances" }
srml-consensus = { path = "../../core/srml/consensus" }
srml-contract = { path = "../../core/srml/contract" }
srml-council = { path = "../../core/srml/council" }
srml-democracy = { path = "../../core/srml/democracy" }
srml-executive = { path = "../../core/srml/executive" }
srml-balances = { path = "../../srml/balances" }
srml-consensus = { path = "../../srml/consensus" }
srml-contract = { path = "../../srml/contract" }
srml-council = { path = "../../srml/council" }
srml-democracy = { path = "../../srml/democracy" }
srml-executive = { path = "../../srml/executive" }
sr-primitives = { path = "../../core/sr-primitives" }
srml-session = { path = "../../core/srml/session" }
srml-staking = { path = "../../core/srml/staking" }
srml-system = { path = "../../core/srml/system" }
srml-timestamp = { path = "../../core/srml/timestamp" }
srml-treasury = { path = "../../core/srml/treasury" }
srml-session = { path = "../../srml/session" }
srml-staking = { path = "../../srml/staking" }
srml-system = { path = "../../srml/system" }
srml-timestamp = { path = "../../srml/timestamp" }
srml-treasury = { path = "../../srml/treasury" }
sr-version = { path = "../../core/sr-version" }
node-primitives = { path = "../primitives" }

Expand Down
Loading