primitives/proc-macro: Generate crate access one module up

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
nathanwhit · Feb 2, 2023 · c33d3ca · c33d3ca
1 parent df770ec
commit c33d3ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/primitives/api/proc-macro/src/impl_runtime_apis.rs b/primitives/api/proc-macro/src/impl_runtime_apis.rs
@@ -637,7 +637,8 @@ fn impl_runtime_apis_impl_inner(api_impls: &[ItemImpl]) -> Result<TokenStream> {
 	let runtime_api_versions = generate_runtime_api_versions(api_impls)?;
 	let wasm_interface = generate_wasm_interface(api_impls)?;
 	let api_impls_for_runtime_api = generate_api_impl_for_runtime_api(api_impls)?;
-	let runtime_metadata = generate_runtime_metadata(api_impls)?;
+	let crate_ = generate_crate_access(HIDDEN_INCLUDES_ID);
+	let runtime_metadata = generate_runtime_metadata(api_impls, &crate_)?;
 
 	Ok(quote!(
 		#hidden_includes

diff --git a/primitives/api/proc-macro/src/runtime_metadata.rs b/primitives/api/proc-macro/src/runtime_metadata.rs
@@ -178,7 +178,7 @@ fn generate_trait_metadata(impl_: &ItemImpl, crate_: &TokenStream) -> Result<Tok
 }
 
 /// Generate the runtime metadata for the given traits.
-pub fn generate_runtime_metadata(impls: &[ItemImpl]) -> Result<TokenStream> {
+pub fn generate_runtime_metadata(impls: &[ItemImpl], crate_: &TokenStream) -> Result<TokenStream> {
 	if impls.is_empty() {
 		return Ok(quote!())
 	}
@@ -191,8 +191,6 @@ pub fn generate_runtime_metadata(impls: &[ItemImpl]) -> Result<TokenStream> {
 
 	let mut metadata = Vec::new();
 
-	let crate_ = generate_crate_access(HIDDEN_INCLUDES_ID);
-
 	for impl_ in impls {
 		metadata.push(generate_trait_metadata(impl_, &crate_)?);
 	}