Convert coordinator/substrate/db to use create_db macro #436
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
kayabaNerve
reviewed
Nov 17, 2023
coordinator/src/substrate/db.rs
Outdated
| LatestCosignedBlock: () -> u64, | ||
| CosignTransactions: (network: NetworkId) -> Vec<(Session, u64, [u8; 32])>, | ||
| BlockDb: () -> u64, | ||
| EventDb: (id: &[u8], index: u32) -> [u8; 0], |
coordinator/src/substrate/mod.rs
Outdated
| @@ -568,25 +568,25 @@ async fn handle_new_blocks<D: Db, Pro: Processors>( | |||
| ) | |||
| .await?; | |||
| *next_block += 1; | |||
| db.set_next_block(*next_block); | |||
| let mut txn = db.txn(); // TODO: this line belongs to a removed method, remove SubstrateDb | |||
There was a problem hiding this comment.
This TODO doesn't seem still needed.
There was a problem hiding this comment.
I was thinking about making it a helper but decided against it. I’ll investigate tonight. But I think you’re correct, the comment is old and can be removed if you have a moment.
kayabaNerve
force-pushed
the
create-db-substrate-v2
branch
from
4dbacf9 to
7e74785
Compare
kayabaNerve
force-pushed
the
create-db-substrate-v2
branch
from
91fe3b9 to
4b1a2b4
Compare
These may be rebase artifacts.
|
👍 Will merge once CI passes. Thanks :) |
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.
Description
This is a continuation of pr #408.
SubstrateDbwas split intoBlockDb,EventDb,SessionDb, andBatchDb, some helper methods to convert to/from the expected type were removed as they're covered by the macro.Considerations
handledwas renamed tois_unhandled. Calling code was largely in the formif !SubstrateDb::handled(...) { ... }, removing the negation and changing the name helps align the code with the intent.handle_eventcould be refactored into a simple set method, I noticed that the calling code often performs the necessary checks however I didn't feel comfortable making this change due to someasyncstatements that could break the previous assertions.