Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve(SpokePool): Remove Testable/Timer base contract #237

Merged
merged 4 commits into from
Feb 21, 2023
Merged

Conversation

nicholaspai
Copy link
Member

This base contract adds unneccessary gas costs to getCurrentTime calls and setCurrentTime is never used in production. This PR replaces those base contracts with a getCurrentTime implementation directly in the SpokePool contract.

Tests then use MockSpokePool which extends the getCurrentTime functionality and also adds a setCurrentTime call

This base contract adds unneccessary gas costs to `getCurrentTime` calls and `setCurrentTime` is never used in production. This PR replaces those base contracts with a `getCurrentTime` implementation directly in the `SpokePool` contract.

Tests then use `MockSpokePool` which extends the `getCurrentTime` functionality and also adds a `setCurrentTime` call
@nicholaspai nicholaspai requested review from mrice32 and pxrl February 17, 2023 17:47
Copy link
Contributor

@pxrl pxrl left a comment

Choose a reason for hiding this comment

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

Nice to clean this up. Not sure about the change to deployments.json, but otherwise LGTM 👍

@@ -1,7 +1,6 @@
{
"1": {
"AcrossConfigStore": { "address": "0x3B03509645713718B78951126E0A6de6f10043f5", "blockNumber": 14717196 },
"AcrossMerkleDistributor": { "address": "0xE50b2cEAC4f60E840Ae513924033E753e2366487", "blockNumber": 15976846 },
Copy link
Contributor

Choose a reason for hiding this comment

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

Could this be an unintentional change?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oops yeah

Copy link
Contributor

@mrice32 mrice32 left a comment

Choose a reason for hiding this comment

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

LGTM!

@mrice32 mrice32 merged commit 7ce6ed3 into master Feb 21, 2023
@mrice32 mrice32 deleted the testable branch February 21, 2023 10:23
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