pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-30 10:47:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to substrate rc4 release (#131)

Browse Source 
* Upgrade to substrate rc4 release

* Fix up test-node/service

* Fix up client node config

* Fix up remaining compilation errors

* Fmt

* Remove fixme

* Fix test

* Release v0.10.0
This commit is contained in:
Andrew Jones
2020-06-29 09:32:07 +01:00
committed by GitHub
parent 4ee7fb11ad
commit d3e9e3f757
12 changed files with 91 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc.rs
+6 -17
View File
@@ -37,7 +37,6 @@ use jsonrpsee::{
},
Client,
};
use num_traits::bounds::Bounded;
use sc_rpc_api::state::ReadProof;
use serde::Serialize;
use sp_core::{
@@ -83,23 +82,15 @@ pub type ChainBlock<T> =
/// Wrapper for NumberOrHex to allow custom From impls
#[derive(Serialize)]
#[serde(bound = "<T as System>::BlockNumber: Serialize")]
pub struct BlockNumber<T: System>(NumberOrHex<<T as System>::BlockNumber>);
pub struct BlockNumber(NumberOrHex);
impl<T> From<NumberOrHex<<T as System>::BlockNumber>> for BlockNumber<T>
where
T: System,
{
fn from(x: NumberOrHex<<T as System>::BlockNumber>) -> Self {
impl From<NumberOrHex> for BlockNumber {
fn from(x: NumberOrHex) -> Self {
BlockNumber(x)
}
}
impl<T> From<u32> for BlockNumber<T>
where
T: System,
<T as System>::BlockNumber: From<u32>,
{
impl From<u32> for BlockNumber {
fn from(x: u32) -> Self {
NumberOrHex::Number(x.into()).into()
}
@@ -160,9 +151,7 @@ impl<T: Runtime> Rpc<T> {
/// Fetch the genesis hash
pub async fn genesis_hash(&self) -> Result<T::Hash, Error> {
let block_zero = Some(ListOrValue::Value(NumberOrHex::Number(
T::BlockNumber::min_value(),
)));
let block_zero = Some(ListOrValue::Value(NumberOrHex::Number(0)));
let params = Params::Array(vec![to_json_value(block_zero)?]);
let list_or_value: ListOrValue<Option<T::Hash>> =
self.client.request("chain_getBlockHash", params).await?;
@@ -198,7 +187,7 @@ impl<T: Runtime> Rpc<T> {
/// Get a block hash, returns hash of latest block by default
pub async fn block_hash(
&self,
block_number: Option<BlockNumber<T>>,
block_number: Option<BlockNumber>,
) -> Result<Option<T::Hash>, Error> {
let block_number = block_number.map(ListOrValue::Value);
let params = Params::Array(vec![to_json_value(block_number)?]);