Rename our SlotNo to SlotInEpoch #1887
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
rvl
approved these changes
Jul 8, 2020
https://github.com/input-output-hk/cardano-base/tree/master/slotting maybe? |
Anviking
force-pushed
the
anviking/1868/rename-slotNo
branch
from
9a19a63 to
48d3ccd
Compare
Let's not get ahead of ourselves 😄 but I'm hoping we can switch to that soon. Think we might end up with a few orphans in the wallet (e.g. for a |
|
bors r+ |
iohk-bors bot
added a commit
that referenced
this pull request
Jul 9, 2020
1887: Rename our SlotNo to SlotInEpoch r=Anviking a=Anviking # Issue Number #1868 <!-- Put here a reference to the issue this PR relates to and which requirements it tackles --> # Overview <!-- Detail in a few bullet points the work accomplished in this PR --> - [x] Renamed `SlotNo` to `SlotInEpoch` (for consistency with other components) # Comments - `W.SlotNo` == `Cardano.SlotInEpoch` /= `Cardano.SlotNo` ``` Epoch 0 1 2 3 4 SlotNo* 0 1 2 3 4 5 6 7 8 9 SlotInEpoch 0 1 0 1 0 1 0 1 0 1 ``` *) I.e. the one defined in cardano-base and used in ourobouros-consensus. <!-- Additional comments or screenshots to attach if any --> <!-- Don't forget to: ✓ Self-review your changes to make sure nothing unexpected slipped through ✓ Assign yourself to the PR ✓ Assign one or several reviewer(s) ✓ Once created, link this PR to its corresponding ticket ✓ Assign the PR to a corresponding milestone ✓ Acknowledge any changes required to the Wiki --> Co-authored-by: Johannes Lund <[email protected]>
Build failed |
|
bors r+ |
Anviking
added
the
IMPROVEMENT
iohk-bors bot
added a commit
that referenced
this pull request
Jul 9, 2020
1887: Rename our SlotNo to SlotInEpoch r=Anviking a=Anviking # Issue Number #1868 <!-- Put here a reference to the issue this PR relates to and which requirements it tackles --> # Overview <!-- Detail in a few bullet points the work accomplished in this PR --> - [x] Renamed `SlotNo` to `SlotInEpoch` (for consistency with other components) # Comments - `W.SlotNo` == `Cardano.SlotInEpoch` /= `Cardano.SlotNo` ``` Epoch 0 1 2 3 4 SlotNo* 0 1 2 3 4 5 6 7 8 9 SlotInEpoch 0 1 0 1 0 1 0 1 0 1 ``` *) I.e. the one defined in cardano-base and used in ourobouros-consensus. <!-- Additional comments or screenshots to attach if any --> <!-- Don't forget to: ✓ Self-review your changes to make sure nothing unexpected slipped through ✓ Assign yourself to the PR ✓ Assign one or several reviewer(s) ✓ Once created, link this PR to its corresponding ticket ✓ Assign the PR to a corresponding milestone ✓ Acknowledge any changes required to the Wiki --> Co-authored-by: Johannes Lund <[email protected]>
Build failed |
Anviking
force-pushed
the
anviking/1868/rename-slotNo
branch
from
48d3ccd to
8a85564
Compare
|
bors r+ |
iohk-bors bot
added a commit
that referenced
this pull request
Jul 9, 2020
1887: Rename our SlotNo to SlotInEpoch r=Anviking a=Anviking # Issue Number #1868 <!-- Put here a reference to the issue this PR relates to and which requirements it tackles --> # Overview <!-- Detail in a few bullet points the work accomplished in this PR --> - [x] Renamed `SlotNo` to `SlotInEpoch` (for consistency with other components) # Comments - `W.SlotNo` == `Cardano.SlotInEpoch` /= `Cardano.SlotNo` ``` Epoch 0 1 2 3 4 SlotNo* 0 1 2 3 4 5 6 7 8 9 SlotInEpoch 0 1 0 1 0 1 0 1 0 1 ``` *) I.e. the one defined in cardano-base and used in ourobouros-consensus. <!-- Additional comments or screenshots to attach if any --> <!-- Don't forget to: ✓ Self-review your changes to make sure nothing unexpected slipped through ✓ Assign yourself to the PR ✓ Assign one or several reviewer(s) ✓ Once created, link this PR to its corresponding ticket ✓ Assign the PR to a corresponding milestone ✓ Acknowledge any changes required to the Wiki --> Co-authored-by: Johannes Lund <[email protected]>
Build failed |
|
bors r+ |
iohk-bors bot
added a commit
that referenced
this pull request
Jul 10, 2020
1847: Track Stakepool Retirements in the DB r=jonathanknowles a=jonathanknowles # Related Issues #1815 #1816 #1817 #1819 #1880 # Overview This PR: - [x] Extends the pool DB schema to make it possible to store: - [x] retirement certificates. - [x] the _order_ of publication of certificates _within the same block_, for both registration and retirement certificates. This is necessary, as the intra-block order is _significant_.<br><br> - [x] Adds the `PoolLifeCycleStatus` type, which indicates the current lifecycle stage of a pool. There are currently _three_ possibilities: 1. `NotRegistered` (indicates that a pool has never been registered) 2. `Registered` (indicates that a pool has been registered but _not_ retired) (provides a registration certificate) 3. `RegisteredAndRetired` (indicates that a pool has been registered _and_ retired) (provides both a registration and a retirement certificate)<br><br> - [x] Adds the `readPoolLifeCycleStatus` function to the pool DB layer, making it possible to determine the current lifecycle status of a pool. - [x] Updates the `retirement` field of `ApiStakePool` with live information. # Property Tests This PR adds property tests to ensure that: - [x] the `determinePoolLifeCycleStatus` function respects the correct order of precedence for registration and retirement certificates: - for a given pool, a registration certificate always _supercedes_ a prior retirement certificate. - for a given pool, a retirement certificate always _augments_ the latest registration certificate. - [x] `readPoolLifeCycleStatus` queries work correctly in the presence of blocks containing multiple certificates for the same pool. - [x] database rollback works correctly in the presence of retirement certificates. # Future Work A **_future_** PR will add integration tests to ensure that: - retiring a pool eventually results in a correct update to the `retirement` field of `ApiStakePool`, when read through the `ListStakePools` operation. - retiring and then re-registering a pool clears the `retirement` field. See QA section of #1819. 1849: Diverse witnesses in shelley r=paweljakubas a=paweljakubas # Issue Number <!-- Put here a reference to the issue this PR relates to and which requirements it tackles --> #1844 # Overview <!-- Detail in a few bullet points the work accomplished in this PR --> - [x] I have added WitnessTag - [x] I have added impl of mkTx for Byron/Icarus wtinesses - [x] I have added unit tests verifying decodeTx for Byron/Icarus witnesses - [x] I have updated fee estimation - [x] I have added integration tests illustrating the case # Comments <!-- Additional comments or screenshots to attach if any --> <!-- Don't forget to: ✓ Self-review your changes to make sure nothing unexpected slipped through ✓ Assign yourself to the PR ✓ Assign one or several reviewer(s) ✓ Once created, link this PR to its corresponding ticket ✓ Assign the PR to a corresponding milestone ✓ Acknowledge any changes required to the Wiki --> 1887: Rename our SlotNo to SlotInEpoch r=Anviking a=Anviking # Issue Number #1868 <!-- Put here a reference to the issue this PR relates to and which requirements it tackles --> # Overview <!-- Detail in a few bullet points the work accomplished in this PR --> - [x] Renamed `SlotNo` to `SlotInEpoch` (for consistency with other components) # Comments - `W.SlotNo` == `Cardano.SlotInEpoch` /= `Cardano.SlotNo` ``` Epoch 0 1 2 3 4 SlotNo* 0 1 2 3 4 5 6 7 8 9 SlotInEpoch 0 1 0 1 0 1 0 1 0 1 ``` *) I.e. the one defined in cardano-base and used in ourobouros-consensus. <!-- Additional comments or screenshots to attach if any --> <!-- Don't forget to: ✓ Self-review your changes to make sure nothing unexpected slipped through ✓ Assign yourself to the PR ✓ Assign one or several reviewer(s) ✓ Once created, link this PR to its corresponding ticket ✓ Assign the PR to a corresponding milestone ✓ Acknowledge any changes required to the Wiki --> Co-authored-by: Jonathan Knowles <[email protected]> Co-authored-by: Pawel Jakubas <[email protected]> Co-authored-by: IOHK <[email protected]> Co-authored-by: KtorZ <[email protected]> Co-authored-by: Johannes Lund <[email protected]>
Build failed (retrying...) |
iohk-bors bot
added a commit
that referenced
this pull request
Jul 10, 2020
1849: Diverse witnesses in shelley r=paweljakubas a=paweljakubas # Issue Number <!-- Put here a reference to the issue this PR relates to and which requirements it tackles --> #1844 # Overview <!-- Detail in a few bullet points the work accomplished in this PR --> - [x] I have added WitnessTag - [x] I have added impl of mkTx for Byron/Icarus wtinesses - [x] I have added unit tests verifying decodeTx for Byron/Icarus witnesses - [x] I have updated fee estimation - [x] I have added integration tests illustrating the case # Comments <!-- Additional comments or screenshots to attach if any --> <!-- Don't forget to: ✓ Self-review your changes to make sure nothing unexpected slipped through ✓ Assign yourself to the PR ✓ Assign one or several reviewer(s) ✓ Once created, link this PR to its corresponding ticket ✓ Assign the PR to a corresponding milestone ✓ Acknowledge any changes required to the Wiki --> 1887: Rename our SlotNo to SlotInEpoch r=Anviking a=Anviking # Issue Number #1868 <!-- Put here a reference to the issue this PR relates to and which requirements it tackles --> # Overview <!-- Detail in a few bullet points the work accomplished in this PR --> - [x] Renamed `SlotNo` to `SlotInEpoch` (for consistency with other components) # Comments - `W.SlotNo` == `Cardano.SlotInEpoch` /= `Cardano.SlotNo` ``` Epoch 0 1 2 3 4 SlotNo* 0 1 2 3 4 5 6 7 8 9 SlotInEpoch 0 1 0 1 0 1 0 1 0 1 ``` *) I.e. the one defined in cardano-base and used in ourobouros-consensus. <!-- Additional comments or screenshots to attach if any --> <!-- Don't forget to: ✓ Self-review your changes to make sure nothing unexpected slipped through ✓ Assign yourself to the PR ✓ Assign one or several reviewer(s) ✓ Once created, link this PR to its corresponding ticket ✓ Assign the PR to a corresponding milestone ✓ Acknowledge any changes required to the Wiki --> Co-authored-by: Pawel Jakubas <[email protected]> Co-authored-by: IOHK <[email protected]> Co-authored-by: KtorZ <[email protected]> Co-authored-by: Johannes Lund <[email protected]>
Build failed (retrying...) |
iohk-bors bot
added a commit
that referenced
this pull request
Jul 10, 2020
1887: Rename our SlotNo to SlotInEpoch r=Anviking a=Anviking # Issue Number #1868 <!-- Put here a reference to the issue this PR relates to and which requirements it tackles --> # Overview <!-- Detail in a few bullet points the work accomplished in this PR --> - [x] Renamed `SlotNo` to `SlotInEpoch` (for consistency with other components) # Comments - `W.SlotNo` == `Cardano.SlotInEpoch` /= `Cardano.SlotNo` ``` Epoch 0 1 2 3 4 SlotNo* 0 1 2 3 4 5 6 7 8 9 SlotInEpoch 0 1 0 1 0 1 0 1 0 1 ``` *) I.e. the one defined in cardano-base and used in ourobouros-consensus. <!-- Additional comments or screenshots to attach if any --> <!-- Don't forget to: ✓ Self-review your changes to make sure nothing unexpected slipped through ✓ Assign yourself to the PR ✓ Assign one or several reviewer(s) ✓ Once created, link this PR to its corresponding ticket ✓ Assign the PR to a corresponding milestone ✓ Acknowledge any changes required to the Wiki --> Co-authored-by: Johannes Lund <[email protected]>
Build failed |
The SlotNo we use is different from the one in consensus. By renaming it to SlotInEpoch it will be less confusing, and easier for us to start adoping the actual SlotNo. With an epoch length of 2, this is how they differ: ``` Epoch 0 1 2 3 4 SlotNo* 0 1 2 3 4 5 6 7 8 9 SlotInEpoch 0 1 0 1 0 1 0 1 0 1 ``` *) I.e. the one defined in cardano-base and used in ourobouros-consensus.
KtorZ
force-pushed
the
anviking/1868/rename-slotNo
branch
from
8a85564 to
357bb22
Compare
|
bors r+ |
iohk-bors bot
added a commit
that referenced
this pull request
Jul 10, 2020
1887: Rename our SlotNo to SlotInEpoch r=KtorZ a=Anviking # Issue Number #1868 <!-- Put here a reference to the issue this PR relates to and which requirements it tackles --> # Overview <!-- Detail in a few bullet points the work accomplished in this PR --> - [x] Renamed `SlotNo` to `SlotInEpoch` (for consistency with other components) # Comments - `W.SlotNo` == `Cardano.SlotInEpoch` /= `Cardano.SlotNo` ``` Epoch 0 1 2 3 4 SlotNo* 0 1 2 3 4 5 6 7 8 9 SlotInEpoch 0 1 0 1 0 1 0 1 0 1 ``` *) I.e. the one defined in cardano-base and used in ourobouros-consensus. <!-- Additional comments or screenshots to attach if any --> <!-- Don't forget to: ✓ Self-review your changes to make sure nothing unexpected slipped through ✓ Assign yourself to the PR ✓ Assign one or several reviewer(s) ✓ Once created, link this PR to its corresponding ticket ✓ Assign the PR to a corresponding milestone ✓ Acknowledge any changes required to the Wiki --> Co-authored-by: Johannes Lund <[email protected]>
|
bors r- |
Canceled |
|
bors r+ |
iohk-bors bot
added a commit
that referenced
this pull request
Jul 10, 2020
1826: Add more debug-level chain-sync- and follow traces r=KtorZ a=Anviking # Issue Number Related to / was used to debug #1794 # Overview <!-- Detail in a few bullet points the work accomplished in this PR --> The chain-following code is complex. We usually log when the `follow` function asks us to roll forward or backward, but we don't have traces for the underlying logic. - [x] Trace when `follow` ignores (hopefully) idempotent rollbacks, and why - [x] Trace low-level chain-sync commands # Comments <!-- Additional comments or screenshots to attach if any --> <!-- Don't forget to: ✓ Self-review your changes to make sure nothing unexpected slipped through ✓ Assign yourself to the PR ✓ Assign one or several reviewer(s) ✓ Once created, link this PR to its corresponding ticket ✓ Assign the PR to a corresponding milestone ✓ Acknowledge any changes required to the Wiki --> 1887: Rename our SlotNo to SlotInEpoch r=KtorZ a=Anviking # Issue Number #1868 <!-- Put here a reference to the issue this PR relates to and which requirements it tackles --> # Overview <!-- Detail in a few bullet points the work accomplished in this PR --> - [x] Renamed `SlotNo` to `SlotInEpoch` (for consistency with other components) # Comments - `W.SlotNo` == `Cardano.SlotInEpoch` /= `Cardano.SlotNo` ``` Epoch 0 1 2 3 4 SlotNo* 0 1 2 3 4 5 6 7 8 9 SlotInEpoch 0 1 0 1 0 1 0 1 0 1 ``` *) I.e. the one defined in cardano-base and used in ourobouros-consensus. <!-- Additional comments or screenshots to attach if any --> <!-- Don't forget to: ✓ Self-review your changes to make sure nothing unexpected slipped through ✓ Assign yourself to the PR ✓ Assign one or several reviewer(s) ✓ Once created, link this PR to its corresponding ticket ✓ Assign the PR to a corresponding milestone ✓ Acknowledge any changes required to the Wiki --> 1895: hydra: Prevent caching of shelley integration test failures r=KtorZ a=rvl ### Issue Number Not sure. ### Overview This change causes integration tests to be re-run whenever the git revision changes, even if everything else is identical. Since these tests tend to fail a lot, we don't want to cache false failures. Also increase the minimum severity for integration test logging, because debug level produces quite a lot of output. Co-authored-by: Johannes Lund <[email protected]> Co-authored-by: Rodney Lorrimar <[email protected]>
Build failed (retrying...) |
Build succeeded |
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.
Issue Number
#1868
Overview
SlotNotoSlotInEpoch(for consistency with other components)Comments
W.SlotNo==Cardano.SlotInEpoch/=Cardano.SlotNo*) I.e. the one defined in cardano-base and used in ourobouros-consensus.