Skip to content

Commit

Permalink
chainSpec: Stabilize chainSpec methods to V1
Browse files Browse the repository at this point in the history
Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
  • Loading branch information
lexnv committed Aug 28, 2023
1 parent 5c59a64 commit fd6509b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions substrate/client/rpc-spec-v2/src/chain_spec/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ pub trait ChainSpecApi {
/// # Unstable
///
/// This method is unstable and subject to change in the future.
#[method(name = "chainSpec_unstable_chainName")]
fn chain_spec_unstable_chain_name(&self) -> RpcResult<String>;
#[method(name = "chainSpec_v1_chainName")]
fn chain_spec_v1_chain_name(&self) -> RpcResult<String>;

/// Get the chain's genesis hash.
///
/// # Unstable
///
/// This method is unstable and subject to change in the future.
#[method(name = "chainSpec_unstable_genesisHash")]
fn chain_spec_unstable_genesis_hash(&self) -> RpcResult<String>;
#[method(name = "chainSpec_v1_genesisHash")]
fn chain_spec_v1_genesis_hash(&self) -> RpcResult<String>;

/// Get the properties of the chain, as present in the chain specification.
///
Expand All @@ -48,6 +48,6 @@ pub trait ChainSpecApi {
/// # Unstable
///
/// This method is unstable and subject to change in the future.
#[method(name = "chainSpec_unstable_properties")]
fn chain_spec_unstable_properties(&self) -> RpcResult<Properties>;
#[method(name = "chainSpec_v1_properties")]
fn chain_spec_v1_properties(&self) -> RpcResult<Properties>;
}
6 changes: 3 additions & 3 deletions substrate/client/rpc-spec-v2/src/chain_spec/chain_spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ impl ChainSpec {
}

impl ChainSpecApiServer for ChainSpec {
fn chain_spec_unstable_chain_name(&self) -> RpcResult<String> {
fn chain_spec_v1_chain_name(&self) -> RpcResult<String> {
Ok(self.name.clone())
}

fn chain_spec_unstable_genesis_hash(&self) -> RpcResult<String> {
fn chain_spec_v1_genesis_hash(&self) -> RpcResult<String> {
Ok(self.genesis_hash.clone())
}

fn chain_spec_unstable_properties(&self) -> RpcResult<Properties> {
fn chain_spec_v1_properties(&self) -> RpcResult<Properties> {
Ok(self.properties.clone())
}
}
6 changes: 3 additions & 3 deletions substrate/client/rpc-spec-v2/src/chain_spec/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fn api() -> RpcModule<ChainSpec> {
#[tokio::test]
async fn chain_spec_chain_name_works() {
let name = api()
.call::<_, String>("chainSpec_unstable_chainName", EmptyParams::new())
.call::<_, String>("chainSpec_v1_chainName", EmptyParams::new())
.await
.unwrap();
assert_eq!(name, CHAIN_NAME);
Expand All @@ -45,7 +45,7 @@ async fn chain_spec_chain_name_works() {
#[tokio::test]
async fn chain_spec_genesis_hash_works() {
let genesis = api()
.call::<_, String>("chainSpec_unstable_genesisHash", EmptyParams::new())
.call::<_, String>("chainSpec_v1_genesisHash", EmptyParams::new())
.await
.unwrap();
assert_eq!(genesis, format!("0x{}", hex::encode(CHAIN_GENESIS)));
Expand All @@ -54,7 +54,7 @@ async fn chain_spec_genesis_hash_works() {
#[tokio::test]
async fn chain_spec_properties_works() {
let properties = api()
.call::<_, Properties>("chainSpec_unstable_properties", EmptyParams::new())
.call::<_, Properties>("chainSpec_v1_properties", EmptyParams::new())
.await
.unwrap();
assert_eq!(properties, serde_json::from_str(CHAIN_PROPERTIES).unwrap());
Expand Down

0 comments on commit fd6509b

Please sign in to comment.