-
Notifications
You must be signed in to change notification settings - Fork 7
queue multiple fcs #1
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
Conversation
…s with multiple reconfigurations
This reverts commit 1154b6d.
Queued FCs & JBController3_2 tests
…undingCyclesOf() in tests
… and not generally applicable
JBController3_2 Tests Refactor
@@ -465,9 +505,19 @@ contract JBFundingCycleStore is JBControllerUtility, IJBFundingCycleStore { | |||
// Get the necessary properties for the base funding cycle. | |||
JBFundingCycle memory _baseFundingCycle = _getStructFor(_projectId, _fundingCycle.basedOn); | |||
|
|||
// Find the base cycle that is not still queued. | |||
while (_baseFundingCycle.start > block.timestamp) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do-while loop?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
need a while (true) loop with a conditional here. i made the change.
while (_fundingCycle.number != 0) { | ||
// If the latest is expired, return an empty funding cycle. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do-while loop?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
works here. done.
JBBallotState _ballotState = _ballotStateOf(_projectId, _fundingCycle); | ||
|
||
// While the cycle has a ballot that isn't approved or if it hasn't yet started, get a reference to the funding cycle that the latest is based on, which has the latest approved configuration. | ||
while ( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do-while loop?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
doesnt work here
// Set the configuration. | ||
configuration = _baseFundingCycle.configuration; | ||
// Get the funding cycle for the configuration. | ||
_fundingCycle = _getStructFor(_projectId, configuration); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
configuration
and _fundingCycle
aren't needed in this loop, we can get these after we find the correct _baseFundingCycle
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't this the same as _fundingCycle = _baseFundingCycle;
?
No description provided.