Reduce macro usage in tests #2028
Conversation
|
To be clear, the line counts here are rustfmt on the entire crate being shoved into one file, so not only is it the usual rustfmt vertical code, but it's got three extra indentations on the front so everything is split across tons of lines. |
TheBlueMatt
force-pushed
the
2023-02-macros-for-wilmer
branch
from
0558c31 to
12136e8
Compare
|
Just looks like the type safety is getting us now with the test |
TheBlueMatt
force-pushed
the
2023-02-macros-for-wilmer
branch
from
12136e8 to
d215969
Compare
|
Oops, right, thanks. |
| /// Gets an RAA and CS which were sent in response to a commitment update | ||
| /// | ||
| /// Should only be used directly when the `$node` is not actually a [`Node`]. | ||
| macro_rules! do_get_revoke_commit_msgs { |
There was a problem hiding this comment.
Does this commit still make sense? It's now a macro that calls a function that calls a macro. Is the LoC reduced documented in the commit message still accurate?
There was a problem hiding this comment.
I didnt rerun the commit message, but it should be? The outer macro gets called all over the place, which compiles down to one function. That function body happens to be implemented with a macro, but its still only done once.
TheBlueMatt
force-pushed
the
2023-02-macros-for-wilmer
branch
from
d215969 to
6def325
Compare
|
I'll rerun the tests and correct the LoC counters in the commit messages before we land. |
Codecov ReportPatch coverage:
📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more Additional details and impacted files@@ Coverage Diff @@
## main #2028 +/- ##
==========================================
+ Coverage 87.21% 87.33% +0.12%
==========================================
Files 100 101 +1
Lines 44516 44440 -76
Branches 44516 44440 -76
==========================================
- Hits 38825 38813 -12
+ Misses 5691 5627 -64
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
|
CI is sad, but otherwise LGTM |
TheBlueMatt
force-pushed
the
2023-02-macros-for-wilmer
branch
3 times, most recently
from
ed41b1b to
3675b3d
Compare
|
CI failures were a silent rebase conflict. I went ahead and rebased and squashed the fixups. Also went ahead and updated the line counts in the commits. |
|
With the changes in #1497, this takes my |
|
Needs rebase :/ |
The `check_added_monitors!()` macro has no reason to be a macro so here we move its logic to a function and leave the macro in place to avoid touching every line of code in the tests. This reduces the `--profile=test --lib` `Zpretty=expanded` code size from 338,710 LoC to 329,119 LoC.
The `get_payment_preimage_hash!()` macro has no reason to be a macro so here we move its logic to a function and leave the macro in place to avoid touching every line of code in the tests. This reduces the `--profile=test --lib` `Zpretty=expanded` code size from 329,119 LoC to 326,588 LoC.
The `get_route!()` macro has no reason to be a macro so here we move its logic to a function and leave the macro in place to avoid touching every line of code in the tests. This reduces the `--profile=test --lib` `Zpretty=expanded` code size from 326,588 LoC to 324,763 LoC.
The `get_revoke_commit_msgs!()` macro has no reason to be a macro so here we move its logic to a function and leave the macro in place to avoid touching every line of code in the tests. This reduces the `--profile=test --lib` `Zpretty=expanded` code size from 324,763 LoC to 322,183 LoC.
The `get_err_msg!()` macro has no reason to be a macro so here we move its logic to a function and leave the macro in place to avoid touching every line of code in the tests. This reduces the `--profile=test --lib` `Zpretty=expanded` code size from 322,183 LoC to 321,985 LoC.
The `get_htlc_update_msgs!()` macro has no reason to be a macro so here we move its logic to a function and leave the macro in place to avoid touching every line of code in the tests. This reduces the `--profile=test --lib` `Zpretty=expanded` code size from 321,985 LoC to 316,856 LoC.
While we cannot move the entire `check_spends` macro into a function, we can move parts of it out, which we do here. This reduces the `--profile=test --lib` `Zpretty=expanded` code size from 316,856 LoC to 313,312 LoC.
The `check_closed_broadcast!()` macro has no reason to be a macro so here we move its logic to a function and leave the macro in place to avoid touching every line of code in the tests. This reduces the `--profile=test --lib` `Zpretty=expanded` code size from 313,312 LoC to 309,522 LoC.
The `check_closed_event!()` macro has no reason to be a macro so here we move its logic to a function and leave the macro in place to avoid touching every line of code in the tests. This reduces the `--profile=test --lib` `Zpretty=expanded` code size from 309,522 LoC to 301,915 LoC.
The `expect_pending_htlcs_forwardable*` macros don't need to be macros so here we move much of the logic in them to a function and leave the macro in place to avoid touching every line of code in the tests. This reduces the `--profile=test --lib` `Zpretty=expanded` code size from 301,915 LoC to 295,294 LoC.
TheBlueMatt
force-pushed
the
2023-02-macros-for-wilmer
branch
from
3675b3d to
0512260
Compare
|
Rebased again. |
In total, this reduces the
--profile=test --libZpretty=expandedcode size from 334,247 LoC to 290,689 LoC.