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

refactor(rpc): support default port in URL (#1122)

Browse Source 
* refactor: support default port in URL

Update jsonrpsee to v0.20 to support the default port number in URLs.

* fix nit, revert web feature

* fix lightclient code
This commit is contained in:
Niklas Adolfsson
2023-08-15 10:53:26 +02:00
committed by GitHub
parent 751e738d8f
commit 8b4fea0b07
15 changed files with 112 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codegen/src/api/mod.rs
+5 -5
View File
@@ -18,7 +18,7 @@ use crate::error::CodegenError;
use crate::{
ir,
types::{CompositeDef, CompositeDefFields, TypeGenerator, TypeSubstitutes},
utils::{fetch_metadata_bytes_blocking, MetadataVersion, Uri},
utils::{fetch_metadata_bytes_blocking, MetadataVersion, Url},
CratePath,
};
use codec::Decode;
@@ -144,21 +144,21 @@ impl GenerateRuntimeApi {
/// # Warning
///
/// Not recommended to be used in production environments.
pub fn generate_from_url(self, url: &Uri) -> Result<TokenStream2, CodegenError> {
fn fetch_metadata(url: &Uri, version: MetadataVersion) -> Result<Metadata, CodegenError> {
pub fn generate_from_url(self, url: Url) -> Result<TokenStream2, CodegenError> {
fn fetch_metadata(url: Url, version: MetadataVersion) -> Result<Metadata, CodegenError> {
let bytes = fetch_metadata_bytes_blocking(url, version)?;
Ok(Metadata::decode(&mut &bytes[..])?)
}
let metadata = self
.unstable_metadata
.then(|| fetch_metadata(url, MetadataVersion::Unstable).ok())
.then(|| fetch_metadata(url.clone(), MetadataVersion::Unstable).ok())
.flatten();
let metadata = if let Some(unstable) = metadata {
unstable
} else {
match fetch_metadata(url, MetadataVersion::Version(15)) {
match fetch_metadata(url.clone(), MetadataVersion::Version(15)) {
Ok(metadata) => metadata,
Err(_) => fetch_metadata(url, MetadataVersion::Version(14))?,
}