pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-15 10:21:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the module index used to create a encoded func (#47)

Browse Source 
* Fix the module index used to create a encoded func

Same as Events, modules with no calls should be ignored when calculating
the module index.

* Update substrate
This commit is contained in:
Yuanchao Sun
2019-11-28 20:46:39 +08:00
committed by Andrew Jones
parent a6439500eb
commit 5108bce467
5 changed files with 158 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc.rs
+9 -9
View File
@@ -65,7 +65,7 @@ use substrate_rpc_primitives::{
list::ListOrValue,
number::NumberOrHex,
};
use txpool::watcher::Status;
use txpool_api::TransactionStatus;
use crate::{
error::Error,
@@ -194,8 +194,8 @@ impl<T: System + Balances + 'static> Rpc<T> {
&self,
) -> impl Future<Item = MapStream<StorageChangeSet<<T as System>::Hash>>, Error = Error>
{
let events_key = b"System Events";
let storage_key = twox_128(events_key);
let mut storage_key = twox_128(b"System").to_vec();
storage_key.extend(twox_128(b"Events").to_vec());
log::debug!("Events storage key {:?}", storage_key);
let closure: MapClosure<StorageChangeSet<<T as System>::Hash>> =
@@ -204,7 +204,7 @@ impl<T: System + Balances + 'static> Rpc<T> {
event
});
self.state
.subscribe_storage(Some(vec![StorageKey(storage_key.to_vec())]))
.subscribe_storage(Some(vec![StorageKey(storage_key)]))
.map(|stream: TypedSubscriptionStream<_>| stream.map(closure))
.map_err(Into::into)
}
@@ -274,15 +274,15 @@ impl<T: System + Balances + 'static> Rpc<T> {
log::info!("received status {:?}", status);
match status {
// ignore in progress extrinsic for now
Status::Future | Status::Ready | Status::Broadcast(_) => {
TransactionStatus::Future | TransactionStatus::Ready | TransactionStatus::Broadcast(_) => {
None
}
Status::Finalized(block_hash) => Some(Ok(block_hash)),
Status::Usurped(_) => {
TransactionStatus::Finalized(block_hash) => Some(Ok(block_hash)),
TransactionStatus::Usurped(_) => {
Some(Err("Extrinsic Usurped".into()))
}
Status::Dropped => Some(Err("Extrinsic Dropped".into())),
Status::Invalid => Some(Err("Extrinsic Invalid".into())),
TransactionStatus::Dropped => Some(Err("Extrinsic Dropped".into())),
TransactionStatus::Invalid => Some(Err("Extrinsic Invalid".into())),
}
})
.into_future()