Don't re-export items from the traits submodule in the storage module #751
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
james-chf
force-pushed
the
james/mainline/fix-storage-imports
branch
from
f1ee8b3 to
5d4fa05
Compare
This should get rid of merge conflicts in imports in the future regarding these items, as they will only be importable from one place.
james-chf
force-pushed
the
james/mainline/fix-storage-imports
branch
from
5d4fa05 to
b31c0b6
Compare
|
pls update wasm |
|
pls update wasm |
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.
This PR will be redone after #733
The motivation for this PR is to make it so that
Sha256HasherandStorageHasherare only importable in exactly one way outside of thecrate::ledger::storagemodule. Currently, these two types are importable directly fromcrate::ledger::storage::traitsbut also re-exported incrate::ledger::storageas well, meaning they are arbitrarily imported throughout the codebase in different ways which can lead to merge conflicts. i.e.namada/shared/src/ledger/storage/mod.rs
Line 27 in 6cbce4a
This PR is currently changing the imports to work like so:
Sha256Hashermoved fromcrate::ledger::storage::traitstocrate::ledger::storage(so now only importable viacrate::ledger::storage)StorageHasheris now only importable viacrate::ledger::storage::traits