Skip to content

Commit

Permalink
Merge pull request #188 from shamil-gadelshin/monorepo_external_modules
Browse files Browse the repository at this point in the history
External joystream modules migrated to the runtime monorepo.
  • Loading branch information
mnaamani authored Mar 10, 2020
2 parents 8050622 + d06c65a commit b8722f2
Show file tree
Hide file tree
Showing 37 changed files with 10,798 additions and 33 deletions.
6 changes: 0 additions & 6 deletions Cargo.lock

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

20 changes: 7 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
authors = ['Joystream']
authors = ['Joystream contributors']
edition = '2018'
name = 'joystream-node-runtime'
# Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1
Expand Down Expand Up @@ -269,26 +269,22 @@ version = '1.0.4'
[dependencies.forum]
default_features = false
package = 'substrate-forum-module'
git = 'https://github.com/joystream/substrate-forum-module'
tag = 'v1.1.1'
path = 'runtime-modules/forum'

[dependencies.minting]
default_features = false
package = 'substrate-token-mint-module'
git = 'https://github.com/joystream/substrate-token-minting-module/'
tag = 'v1.0.1'
path = 'runtime-modules/token-minting'

[dependencies.stake]
default_features = false
package = 'substrate-stake-module'
git = 'https://github.com/Joystream/substrate-stake-module/'
tag = 'v1.0.1'
path = 'runtime-modules/stake'

[dependencies.recurringrewards]
default_features = false
package = 'substrate-recurring-reward-module'
git = 'https://github.com/Joystream/substrate-recurring-reward-module'
tag = 'v1.0.1'
path = 'runtime-modules/recurring-reward'

[dependencies.hiring]
default_features = false
Expand All @@ -298,14 +294,12 @@ path = 'runtime-modules/hiring'
[dependencies.versioned_store]
default_features = false
package ='substrate-versioned-store'
git = 'https://github.com/joystream/substrate-versioned-store-module'
tag = 'v1.0.1'
path = 'runtime-modules/versioned-store'

[dependencies.versioned_store_permissions]
default_features = false
package = 'substrate-versioned-store-permissions-module'
git = 'https://github.com/joystream/substrate-versioned-store-permissions-module'
tag = 'v1.0.1'
path = 'runtime-modules/versioned-store-permissions'

[dependencies.common]
default_features = false
Expand Down
18 changes: 6 additions & 12 deletions runtime-modules/content-working-group/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,26 +69,22 @@ version = '1.0.0'
[dependencies.forum]
default_features = false
package = 'substrate-forum-module'
git = 'https://github.com/joystream/substrate-forum-module'
tag = 'v1.1.1'
path = '../forum'

[dependencies.minting]
default_features = false
package = 'substrate-token-mint-module'
git = 'https://github.com/joystream/substrate-token-minting-module/'
tag = 'v1.0.1'
path = '../token-minting'

[dependencies.stake]
default_features = false
package = 'substrate-stake-module'
git = 'https://github.com/Joystream/substrate-stake-module/'
tag = 'v1.0.1'
path = '../stake'

[dependencies.recurringrewards]
default_features = false
package = 'substrate-recurring-reward-module'
git = 'https://github.com/Joystream/substrate-recurring-reward-module'
tag = 'v1.0.1'
path = '../recurring-reward'

[dependencies.hiring]
default_features = false
Expand All @@ -98,14 +94,12 @@ path = '../hiring'
[dependencies.versioned_store]
default_features = false
package ='substrate-versioned-store'
git = 'https://github.com/joystream/substrate-versioned-store-module'
tag = 'v1.0.1'
path = '../versioned-store'

[dependencies.versioned_store_permissions]
default_features = false
package = 'substrate-versioned-store-permissions-module'
git = 'https://github.com/joystream/substrate-versioned-store-permissions-module'
tag = 'v1.0.1'
path = '../versioned-store-permissions'

[dependencies.membership]
default_features = false
Expand Down
50 changes: 50 additions & 0 deletions runtime-modules/forum/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[package]
name = 'substrate-forum-module'
version = '1.1.1'
authors = ['Joystream contributors']
edition = '2018'

[dependencies]
hex-literal = '0.1.0'
serde = { version = '1.0.101', optional = true}
serde_derive = { version = '1.0.101', optional = true }
rstd = { package = 'sr-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'}
runtime-primitives = { package = 'sr-primitives', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'}
srml-support = { package = 'srml-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'}
srml-support-procedural = { package = 'srml-support-procedural', git = 'https://github.com/paritytech/substrate.git', rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'}
system = { package = 'srml-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'}
balances = { package = 'srml-balances', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'}
codec = { package = 'parity-scale-codec', version = '1.0.0', default-features = false, features = ['derive'] }
# https://users.rust-lang.org/t/failure-derive-compilation-error/39062
quote = '<=1.0.2'

[dependencies.timestamp]
default_features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'srml-timestamp'
rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'

[dependencies.runtime-io]
default_features = false
git = 'https://github.com/paritytech/substrate.git'
package = 'sr-io'
rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'

[dev-dependencies]
runtime-io = { package = 'sr-io', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'}
primitives = { package = 'substrate-primitives', git = 'https://github.com/paritytech/substrate.git', rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'}

[features]
default = ['std']
std = [
'serde',
'serde_derive',
'codec/std',
'rstd/std',
'runtime-io/std',
'runtime-primitives/std',
'srml-support/std',
'system/std',
'balances/std',
'timestamp/std',
]
Loading

0 comments on commit b8722f2

Please sign in to comment.