Skip to content
This repository was archived by the owner on Jul 4, 2022. It is now read-only.

Chore/bt 127 merge substrate #70

Closed
roy-powerfinance wants to merge 10 commits into from
Closed

Chore/bt 127 merge substrate #70

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
613e545
Chores/merge upstream (#66)
hoani Feb 19, 2020
eaff5f7
Merge remote-tracking branch 'substrate/master' into develop
roy-powerfinance Feb 25, 2020
d2319b9
Uncouple emptying gas_meter from updating the gas spent for the block…
Feb 26, 2020
ec4b38d
Merge remote-tracking branch 'substrate/master' into chore/bt_127_mer…
roy-powerfinance Feb 26, 2020
79c767b
Corrected the block hash to fix a test fail
roy-powerfinance Feb 27, 2020
48ceaab
Renamed the node spawned as "plug" from "substrate"
roy-powerfinance Feb 27, 2020
bd3c7c0
Cherry picked changelist: a64dd527fb280c3feac4b0326e7483b4874efd6e
roy-powerfinance Feb 27, 2020
dcb159a
Fixed some code that causes some tests to fail:
roy-powerfinance Feb 27, 2020
8742ccb
Merge remote-tracking branch 'origin/develop' into chore/bt_127_merge…
roy-powerfinance Feb 27, 2020
d6f02db
Fixed a build error
roy-powerfinance Feb 27, 2020
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
Corrected the block hash to fix a test fail
  • Loading branch information
@roy-powerfinance
roy-powerfinance committed Feb 27, 2020
commit 79c767bc393db95d6f4122532bbce8712b91e61b
2 changes: 1 addition & 1 deletion frame/executive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ mod tests {
header: Header {
parent_hash: [69u8; 32].into(),
number: 1,
state_root: hex!("96797237079b6d6ffab7a47f90ee257a439a0e8268bdab3fe2f1e52572b101de").into(),
state_root: hex!("17caebd966d10cc6dc9659edf7fa3196511593f6c39f80f9b97cdbc3b0855cf3").into(),
extrinsics_root: hex!("03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314").into(),
digest: Digest { logs: vec![], },
},
Expand Down