-
Notifications
You must be signed in to change notification settings - Fork 80
Problem (Fix #1307): many unused features and code in merkle trie code dependency #1424
Conversation
71e0ddb
to
bdc6b8d
Compare
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.
looks ok -- changelog can be updated?
} | ||
|
||
fn get_rightmost_leaf(&self) -> Result<Option<(NodeKey, LeafNode)>> { | ||
unimplemented!("this feature is only used in merkle tree restore which we don't need yet"); |
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.
the normal "restore" (just brining up the last version number) is enough? when is this needed?
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.
I don't fully understand the purpose of the restore yet, but it seems like a way to set up a partial tree first(with root hash fixed), then adding accounts to it gradually.
I think you can simply insert the accounts into an empty tree, then verify the root hash.
/// Column for merkle trie storage | ||
pub const COL_TRIE_NODE: u32 = 9; | ||
/// Column for staled node key in merkle trie | ||
pub const COL_TRIE_STALED: u32 = 10; |
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.
this will already "break" backwards-compatibility in RocksDB, as older code would expect a different number of columns, I think -- would be good to add a changelog entry
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.
Done
Codecov Report
@@ Coverage Diff @@
## master #1424 +/- ##
==========================================
+ Coverage 64.24% 64.50% +0.25%
==========================================
Files 160 161 +1
Lines 21472 21685 +213
==========================================
+ Hits 13794 13987 +193
- Misses 7678 7698 +20
|
bors r+ |
Canceled. |
…e trie code dependency Solution: - Cleanup jellyfish library - Add the integration ground work for jellyfish, step1 of adr-003
bors r+ |
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.
lgtm
Build succeeded: |
Solution: