pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-19 17:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Latest substrate updates (#70)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
src/lib.rs
+11 -29
View File
@@ -311,7 +311,7 @@ impl<T: System + Balances + Sync + Send + 'static, S: 'static> Client<T, S> {
let account_id = S::Signer::from(signer.public()).into_account();
let nonce = match nonce {
Some(nonce) => nonce,
None => self.account_nonce(account_id).await?,
None => self.account(account_id).await?.0,
};
let genesis_hash = self.genesis_hash;
@@ -491,15 +491,11 @@ mod tests {
use super::*;
use crate::{
frame::balances::{
Balances,
BalancesStore,
},
frame::balances::Balances,
DefaultNodeRuntime as Runtime,
Error,
};
type Index = <Runtime as System>::Index;
type AccountId = <Runtime as System>::AccountId;
type Address = <Runtime as System>::Address;
type Balance = <Runtime as Balances>::Balance;
@@ -565,7 +561,7 @@ mod tests {
let result: Result<_, Error> = async_std::task::block_on(async move {
let account = AccountKeyring::Alice.to_account_id();
let client = test_client().await;
let balance = client.free_balance(account.into()).await?;
let balance = client.account(account.into()).await?.1.free;
Ok(balance)
});
@@ -614,32 +610,18 @@ mod tests {
let call2 = balances.call("transfer", subxt_transfer.args).unwrap();
assert_eq!(call.encode().to_vec(), call2.0);
let free_balance =
<pallet_balances::FreeBalance<node_runtime::Runtime>>::hashed_key_for(&dest);
let free_balance_key = StorageKey(free_balance);
let free_balance_key2 = client
.metadata()
.module("Balances")
.unwrap()
.storage("FreeBalance")
.unwrap()
.get_map::<AccountId, Balance>()
.unwrap()
.key(dest.clone());
assert_eq!(free_balance_key, free_balance_key2);
let account_nonce =
<frame_system::AccountNonce<node_runtime::Runtime>>::hashed_key_for(&dest);
let account_nonce_key = StorageKey(account_nonce);
let account_nonce_key2 = client
let account_key =
<frame_system::Account<node_runtime::Runtime>>::hashed_key_for(&dest);
let account_key_substrate = StorageKey(account_key);
let account_key_from_meta = client
.metadata()
.module("System")
.unwrap()
.storage("AccountNonce")
.storage("Account")
.unwrap()
.get_map::<AccountId, Index>()
.get_map::<AccountId, pallet_balances::AccountData<Balance>>()
.unwrap()
.key(dest);
assert_eq!(account_nonce_key, account_nonce_key2);
.key(dest.clone());
assert_eq!(account_key_substrate, account_key_from_meta);
}
}