Refactor `construct_runtime` to procedural #3810

alexeuler · 2019-10-12T16:08:15Z

Description
Refactor construct_runtime macro from declarative to procedural. Reference issue #1897.

…truct-runtime-proc-macro # Conflicts: # srml/support/src/runtime.rs

bkchr

Thank you again for all your work. I reviewed it, mostly it looks good, but I think that we still can improve and reduce the amount of code :)

paint/support/procedural/src/lib.rs

paint/support/procedural/src/construct_runtime/mod.rs

paint/support/procedural/src/construct_runtime/parse.rs

paint/support/procedural/src/construct_runtime/mod.rs

bkchr · 2019-11-18T15:35:15Z

paint/support/procedural/src/construct_runtime/mod.rs

+                let transformed_generics: Vec<_> = generics[0]
+                    .params
+                    .iter()
+                    .map(|param| quote!(<#param>))


This can be just a map() on the value from above.

I'm not sure what you mean here. The thing is that in case of 2 params decl macros accept something like <T> <I> instead of <T, I> - that's what this code does.

Where do we accept <T><I>?

And what I wanted is, you should not call collect in line 188. Use find and then you just get an Option that you can map directly.

Where do we accept <T><I>?

substrate/primitives/sr-primitives/src/lib.rs

Lines 523 to 529 in ba72d75

macro_rules! impl_outer_config {

(

pub struct $main:ident for $concrete:ident {

$( $config:ident =>

$snake:ident $( $instance:ident )? $( <$generic:ident> )*, )*

}

) => {

As far as I can see it accepts <T>, <I> vs <T, I>

And what I wanted is, you should not call collect in line 188

I see, I made the fix to make the code shorter

paint/support/procedural/src/construct_runtime/mod.rs

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>

alexeuler · 2019-11-19T11:10:48Z

bin/node-template/runtime/src/lib.rs

@@ -243,7 +243,7 @@ construct_runtime!(
 		Timestamp: timestamp::{Module, Call, Storage, Inherent},
 		Aura: aura::{Module, Config<T>, Inherent(Timestamp)},
 		Grandpa: grandpa::{Module, Call, Storage, Config, Event},
-		Indices: indices::{default, Config<T>},


@bkchr Note that I had to fix it, since now construct_runtime errors on this

bkchr · 2019-11-19T11:15:25Z

@alleycat-at-git ready for review again?

alexeuler · 2019-11-19T11:34:28Z

@alleycat-at-git ready for review again?

@bkchr Yes

gavofyork · 2019-11-22T12:14:47Z

conflicts need resolving @alleycat-at-git and need to do a final review @bkchr @thiolliere .

…truct-runtime-proc-macro

…truct-runtime-proc-macro # Conflicts: # bin/node/runtime/src/lib.rs # frame/support/src/lib.rs # frame/support/src/runtime.rs

alexeuler · 2019-11-23T14:17:43Z

conflicts need resolving @alleycat-at-git and need to do a final review @bkchr @thiolliere .

@gavofyork @bkchr @thiolliere - fixed conflicts

bkchr

One last thing that needs to be done before merging, please convert your files to use tabs and not spaces.

alexeuler · 2019-11-25T16:12:46Z

One last thing that needs to be done before merging, please convert your files to use tabs and not spaces.

@bkchr fixed

alexeuler added 30 commits October 6, 2019 14:41

interim

6acf008

interim

306e41e

interim

adfac6c

first working section

a8ab096

cleanup

d295ad5

finished parsing

8f023cb

cleanup

121839d

added system module search

ffc2d9b

added clone and find_entry

fb3f1db

generic find_module_entry

b5056ae

interim

bd5d777

working event

9d6c842

added generic event with no instance error

fdbf044

cleanup

470e09d

added decl origin

7cc022b

cleanup

b3b9e74

added all modules

ff765c8

added outer dispatch

0b532b7

added modules expansion

69879c3

refactored transformations

b679b77

updated error message

9198116

added resolve mechanics

3b996a1

added metadata

b6ff42f

finished config

4f6eac1

finished inherents

2ee1464

added validate_unsigned

b0dc494

added compares

193c273

cleanup

2b438ba

cleanup

a06dc86

Merge commit 'e9db00f87b643c8506e70d0fdce3bae58026e469' into alex-cos…

8840177

…truct-runtime-proc-macro # Conflicts: # srml/support/src/runtime.rs

bkchr suggested changes Nov 18, 2019

View reviewed changes

bkchr reviewed Nov 18, 2019

View reviewed changes

paint/support/procedural/src/construct_runtime/mod.rs Outdated Show resolved Hide resolved

alexeuler and others added 15 commits November 19, 2019 09:37

Update paint/support/procedural/src/lib.rs

1b9bbc6

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>

Update paint/support/procedural/src/lib.rs

cf94e93

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>

Update paint/support/procedural/src/construct_runtime/parse.rs

b54cc35

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>

interim

1b6526f

refactored seen_keys

8b3b0f3

refactored hash_set

0d9c366

Update paint/support/procedural/src/construct_runtime/mod.rs

667402b

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>

refactored find

ff7e881

fix

16ba8af

fixed all_modules

293712f

added double declaration check

d5330a6

small fix

23ff59e

fmt

bc41d44

fix

86e6215

fix default

83a3cd3

alexeuler commented Nov 19, 2019

View reviewed changes

gavofyork requested review from gui1117 and bkchr November 22, 2019 12:14

alexeuler added 2 commits November 23, 2019 16:54

Merge commit '904acd5af48387ab0f14f51dda7ee17d773c47d0' into alex-cos…

fbfa34f

…truct-runtime-proc-macro

Merge commit '1f26179aead7c5aee95862b2f2e7d9cbbdcdb798' into alex-cos…

19668ee

…truct-runtime-proc-macro # Conflicts: # bin/node/runtime/src/lib.rs # frame/support/src/lib.rs # frame/support/src/runtime.rs

bkchr approved these changes Nov 25, 2019

View reviewed changes

format

cbf0dce

bkchr merged commit 298b632 into paritytech:master Nov 25, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor `construct_runtime` to procedural #3810

Refactor `construct_runtime` to procedural #3810

alexeuler commented Oct 12, 2019

bkchr left a comment

bkchr Nov 18, 2019

alexeuler Nov 19, 2019

bkchr Nov 19, 2019

alexeuler Nov 19, 2019 •

edited

Loading

alexeuler Nov 19, 2019 •

edited

Loading

alexeuler Nov 19, 2019

bkchr commented Nov 19, 2019

alexeuler commented Nov 19, 2019

gavofyork commented Nov 22, 2019

alexeuler commented Nov 23, 2019

bkchr left a comment

alexeuler commented Nov 25, 2019

	macro_rules! impl_outer_config {
	(
	pub struct $main:ident for $concrete:ident {
	$( $config:ident =>
	$snake:ident $( $instance:ident )? $( <$generic:ident> ), )
	}
	) => {

Refactor construct_runtime to procedural #3810

Refactor construct_runtime to procedural #3810

Conversation

alexeuler commented Oct 12, 2019

bkchr left a comment

Choose a reason for hiding this comment

bkchr Nov 18, 2019

Choose a reason for hiding this comment

alexeuler Nov 19, 2019

Choose a reason for hiding this comment

bkchr Nov 19, 2019

Choose a reason for hiding this comment

alexeuler Nov 19, 2019 • edited Loading

Choose a reason for hiding this comment

alexeuler Nov 19, 2019 • edited Loading

Choose a reason for hiding this comment

alexeuler Nov 19, 2019

Choose a reason for hiding this comment

bkchr commented Nov 19, 2019

alexeuler commented Nov 19, 2019

gavofyork commented Nov 22, 2019

alexeuler commented Nov 23, 2019

bkchr left a comment

Choose a reason for hiding this comment

alexeuler commented Nov 25, 2019

Refactor `construct_runtime` to procedural #3810

Refactor `construct_runtime` to procedural #3810

alexeuler Nov 19, 2019 •

edited

Loading

alexeuler Nov 19, 2019 •

edited

Loading