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

Bring substrate-demo up to date #658

Merged
gavofyork merged 24 commits into from
Sep 10, 2018
Merged

Bring substrate-demo up to date #658

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ab710bf
Updating substrate-demo
arkpar Sep 4, 2018
a5604d6
Consenus fixes
arkpar Sep 4, 2018
d5a0270
Reverted toolchain change
arkpar Sep 4, 2018
6a5ea57
Merge branch 'master' of github.com:paritytech/substrate into a-demo
arkpar Sep 4, 2018
eab11ad
Adjusted timeout formula
arkpar Aug 23, 2018
04eb184
Simplfied proposal creation
arkpar Sep 4, 2018
91041c3
Merge branch 'master' of github.com:paritytech/substrate into a-demo
arkpar Sep 5, 2018
67107bf
Fixed tests
arkpar Sep 5, 2018
8b7a8bb
Merge branch 'master' of github.com:paritytech/substrate into a-demo
arkpar Sep 5, 2018
f3e9299
Fixed a few small issues
arkpar Sep 5, 2018
b3a96ad
Merge branch 'master' of github.com:paritytech/substrate into a-demo
arkpar Sep 5, 2018
dbf6d0c
2017->2018
arkpar Sep 6, 2018
3e61f36
Merge branch 'master' of github.com:paritytech/substrate into a-demo
arkpar Sep 6, 2018
7d8ef2c
Style
arkpar Sep 6, 2018
7353474
More style
arkpar Sep 6, 2018
946e5e4
Renamed demo executable to substrate
arkpar Sep 6, 2018
a02f2b7
Merge branch 'master' of github.com:paritytech/substrate into a-demo
arkpar Sep 6, 2018
9464a68
Merge branch 'master' of github.com:paritytech/substrate into a-demo
arkpar Sep 7, 2018
c17c8b4
Style
arkpar Sep 7, 2018
a599454
Merge branch 'master' of github.com:paritytech/substrate into a-demo
arkpar Sep 10, 2018
f882159
Fixed compilation after merge
arkpar Sep 10, 2018
544bb89
Merge branch 'master' of github.com:paritytech/substrate into a-demo
arkpar Sep 10, 2018
b3295d6
Style
arkpar Sep 10, 2018
18d67cb
Merge branch 'master' of github.com:paritytech/substrate into a-demo
arkpar Sep 10, 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
Next Next commit
Style
  • Loading branch information
@arkpar
arkpar committed Sep 10, 2018
commit b3295d6242ef8c2c57d80b11a3fc31001cd2d75a
4 changes: 2 additions & 2 deletions demo/executor/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,8 @@ mod tests {
assert_eq!(Balances::total_balance(&bob()), 78);
assert_eq!(System::events(), vec![
EventRecord {
phase: Phase::ApplyExtrinsic(0),
event: Event::system(system::Event::ExtrinsicSuccess)
phase: Phase::ApplyExtrinsic(0),
event: Event::system(system::Event::ExtrinsicSuccess)
},
EventRecord {
phase: Phase::ApplyExtrinsic(1),
Expand Down