Merge remote-tracking branch 'origin/master' into gav-compat-629

This commit is contained in:
Gav
2018-08-30 12:42:59 +02:00
9 changed files with 118 additions and 70 deletions
+1 -1
View File
@@ -273,7 +273,7 @@ pub mod api {
apply_extrinsic => |extrinsic| super::Executive::apply_extrinsic(extrinsic),
execute_block => |block| super::Executive::execute_block(block),
finalise_block => |()| super::Executive::finalise_block(),
inherent_extrinsics => |inherent| super::inherent_extrinsics(inherent),
inherent_extrinsics => |(inherent, version)| super::inherent_extrinsics(inherent, version),
validator_count => |()| super::Session::validator_count(),
validators => |()| super::Session::validators()
);