Configurable CC Sector Expiration #6803
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
placer14
force-pushed
the
mg/feat/configurable-sector-expirations
branch
from
e7d9b33
to
a647722
Compare
placer14
commented
Jul 20, 2021
magik6k
reviewed
Jul 21, 2021
placer14
changed the title
placer14
force-pushed
the
mg/feat/configurable-sector-expirations
branch
from
f47bdb2
to
0085fc0
Compare
|
Rebased onto latest |
2 tasks
placer14
force-pushed
the
mg/feat/configurable-sector-expirations
branch
from
0085fc0
to
973653f
Compare
placer14
force-pushed
the
mg/feat/configurable-sector-expirations
branch
from
5e617c5
to
9e08b46
Compare
placer14
force-pushed
the
mg/feat/configurable-sector-expirations
branch
from
9e08b46
to
3829d6b
Compare
placer14
commented
Jul 22, 2021
placer14
commented
Jul 22, 2021
| // as set just before returning within Expiration() | ||
| expected += miner.WPoStProvingPeriod - (expected % miner.WPoStProvingPeriod) + pBoundary - 1 | ||
| assert.Equal(t, int(expected), int(exp)) | ||
| } |
There was a problem hiding this comment.
The math is a little obtuse here so I put literal expecteds for both paths (zero config for CC and non-CC sectors) as well as show how the custom value is applied. I kept the later units with literals in the assert and simply updated the values.
placer14
commented
Jul 22, 2021
placer14
commented
Jul 22, 2021
placer14
commented
Jul 22, 2021
| expected := h + customLifetimeEpochs - (pBuffer * 2) | ||
| // as set just before returning within Expiration() | ||
| expected += miner.WPoStProvingPeriod - (expected % miner.WPoStProvingPeriod) + pBoundary - 1 | ||
| assert.Equal(t, int(expected), int(exp)) |
There was a problem hiding this comment.
I'm pretty sure this math is unchanged, but please double-check this against the impl. 🙇
placer14
changed the title
magik6k
reviewed
Jul 23, 2021
…ions
* origin/master: (47 commits)
Fix links in issue templates
Update issue templates and add templates for M1
config: Add newlines consistently
config: Add note on codegen to types.go
fix lint
cli docsgen
config: Bring some docs from filecoin-docs
add comment about the necessity of FileIO
improve README
config doc gen: generate formatted code
config: Fix doc finding logic
Nicer lotus-miner config commands
Move doc-comment logic to the config pkg
config: doc struct codegen
lotus daemon config utils
adjust compaction test with badger to hit the db
add splitstore compaction test with badger markset
update README with configuration options
tweak badger options
some tweaks in badger markset
...
Conflicts:
node/config/def.go
|
@magik6k This should be ready to merge, despite some testground PRs which are hanging. I've kicked them off again to see if they'll resolve. |
2 tasks
arajasek
approved these changes
Jul 28, 2021
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(fixes #6836)
Adds config:
Related #4760