Skip to content

Revert "feat(cheatcodes): Make expectCall only work for the next call's subcalls"#5027

Merged
mattsse merged 1 commit intomasterfrom
revert-4986-evalir/fix_expect_call
May 24, 2023
Merged

Revert "feat(cheatcodes): Make expectCall only work for the next call's subcalls"#5027
mattsse merged 1 commit intomasterfrom
revert-4986-evalir/fix_expect_call

Conversation

@mattsse
Copy link
Copy Markdown
Member

@mattsse mattsse commented May 24, 2023

Reverts #4986

this was blocked for 1.0 and should not have been merged yet.

Copy link
Copy Markdown
Member

@Evalir Evalir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For future reference—we will be merging this and other expect* changes into a feature branch

@mattsse mattsse merged commit 3764b55 into master May 24, 2023
@mattsse mattsse deleted the revert-4986-evalir/fix_expect_call branch May 24, 2023 17:11
@PaulRBerg
Copy link
Copy Markdown
Contributor

Could you please cut another release, @mattsse?

Our tests are failing now:

https://app.warp.dev/block/mLxbng37Ztgs9OxSko3PMf

@mattsse
Copy link
Copy Markdown
Member Author

mattsse commented May 24, 2023

already running, sorry about the inconvenience

@PaulRBerg
Copy link
Copy Markdown
Contributor

PaulRBerg commented May 24, 2023

TY @mattsse!

Also, FWIW, I don't think the implementation in #4986 works as expected.

Our tests already adhere to the rule of not counting calls made at the root test level, so it's strange that we started getting errors.

FWIW, the depth in our case is greater than usual, as we're routing the calls via delegatecall, specifically via the execute function in PRBProxy:

https://github.com/PaulRBerg/prb-proxy/blob/b5338c7e5a3a10468f584ea1f1caca08a510939a/src/PRBProxy.sol#L87

Lmk if you'd like access to the private repo @mattsse @Evalir for investigation. We have a CI run that failed:

https://github.com/sablier-labs/v2-periphery/actions/runs/5071179085/jobs/9107504005

@Evalir
Copy link
Copy Markdown
Member

Evalir commented May 24, 2023

Hey @PaulRBerg, gotcha, this is great feedback. We're gonna start merging these into a feature branch, so we can run extended QA on big repos that use foundry heavily and not break CIs—we'll integrate prb-math and prb-proxy into external integration tests for this as well.

Would love access to the private repo—that way I can run QA and debug what might not be working as expected!

@PaulRBerg
Copy link
Copy Markdown
Contributor

Can confirm that the latest release (3764b55 2023-05-24T17:24:24.100981000Z) works now, thanks guys.

@Evalir
Copy link
Copy Markdown
Member

Evalir commented May 24, 2023

Amazing, great to hear. Will probably be poking around really soon and testing with the new/upcoming changes!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants