forked from paritytech/polkadot-sdk
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds instance support for composite enums (paritytech#1857)
Fixes paritytech#1839 Currently, `composite_enum`s do not support pallet instances. This PR allows the following: ```rust #[pallet::composite_enum] pub enum HoldReason<I: 'static = ()> { SomeHoldReason } ``` ### Todo - [x] UI Test
- Loading branch information
Showing
11 changed files
with
264 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
substrate/frame/support/procedural/src/construct_runtime/expand/composite_helper.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
// This file is part of Substrate. | ||
|
||
// Copyright (C) Parity Technologies (UK) Ltd. | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License | ||
|
||
use crate::construct_runtime::parse::PalletPath; | ||
use proc_macro2::{Ident, TokenStream}; | ||
use quote::quote; | ||
|
||
pub(crate) fn expand_conversion_fn( | ||
composite_name: &str, | ||
path: &PalletPath, | ||
instance: Option<&Ident>, | ||
variant_name: &Ident, | ||
) -> TokenStream { | ||
let composite_name = quote::format_ident!("{}", composite_name); | ||
let runtime_composite_name = quote::format_ident!("Runtime{}", composite_name); | ||
|
||
if let Some(inst) = instance { | ||
quote! { | ||
impl From<#path::#composite_name<#path::#inst>> for #runtime_composite_name { | ||
fn from(hr: #path::#composite_name<#path::#inst>) -> Self { | ||
#runtime_composite_name::#variant_name(hr) | ||
} | ||
} | ||
} | ||
} else { | ||
quote! { | ||
impl From<#path::#composite_name> for #runtime_composite_name { | ||
fn from(hr: #path::#composite_name) -> Self { | ||
#runtime_composite_name::#variant_name(hr) | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
pub(crate) fn expand_variant( | ||
composite_name: &str, | ||
index: u8, | ||
path: &PalletPath, | ||
instance: Option<&Ident>, | ||
variant_name: &Ident, | ||
) -> TokenStream { | ||
let composite_name = quote::format_ident!("{}", composite_name); | ||
|
||
if let Some(inst) = instance { | ||
quote! { | ||
#[codec(index = #index)] | ||
#variant_name(#path::#composite_name<#path::#inst>), | ||
} | ||
} else { | ||
quote! { | ||
#[codec(index = #index)] | ||
#variant_name(#path::#composite_name), | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.