Latest substrate updates (#70)

* Fix compilation errors with latest substrate

* System::Account replaces FreeBalance and Nonce

* System::Account replaces FreeBalance and Nonce

* Remove Balances FreeBalance, replaced with System Account

* Update system event, fix instantiate

* reorder deps
This commit is contained in:
Andrew Jones
2020-02-20 13:09:11 +00:00
committed by GitHub
parent 399ac68cb1
commit b7565ff435
7 changed files with 76 additions and 122 deletions
+7 -3
View File
@@ -340,9 +340,13 @@ impl<T: System + Balances + 'static> Rpc<T> {
}
}
}
TransactionStatus::Invalid => return Err("Extrinsic Invalid".into()),
TransactionStatus::Usurped(_) => return Err("Extrinsic Usurped".into()),
TransactionStatus::Dropped => return Err("Extrinsic Dropped".into()),
TransactionStatus::Invalid => return Err("Extrinsic Invalid".into()),
TransactionStatus::Retracted(_) => return Err("Extrinsic Retracted".into()),
// should have made it `InBlock` before either of these
TransactionStatus::Finalized(_) => return Err("Extrinsic Finalized".into()),
TransactionStatus::FinalityTimeout(_) => return Err("Extrinsic FinalityTimeout".into()),
}
}
unreachable!()
@@ -357,7 +361,7 @@ pub struct ExtrinsicSuccess<T: System> {
/// Extrinsic hash.
pub extrinsic: T::Hash,
/// Raw runtime events, can be decoded by the caller.
pub events: Vec<RuntimeEvent>,
pub events: Vec<RuntimeEvent<T>>,
}
impl<T: System> ExtrinsicSuccess<T> {
@@ -377,7 +381,7 @@ impl<T: System> ExtrinsicSuccess<T> {
}
/// Returns all System Events
pub fn system_events(&self) -> Vec<&SystemEvent> {
pub fn system_events(&self) -> Vec<&SystemEvent<T>> {
self.events
.iter()
.filter_map(|evt| {