Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: 17868 Remove usage of MerkleStateRoot from swirlds-platform-core #17873

Closed
wants to merge 23 commits into from
Closed

refactor: 17868 Remove usage of MerkleStateRoot from swirlds-platform-core #17873

wants to merge 23 commits into from

Conversation

imalygin
Copy link
Contributor

Description:

TBD

Related issue(s):

Fixes #17868

Notes for reviewer:

Checklist

  • Documented (Code comments, README, etc.)
  • Tested (unit, integration, etc.)

imalygin and others added 15 commits February 11, 2025 17:17
@imalygin
refactor: 17357 Replace usages of PlatformMerleStateRoot with State
4f453c6 
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin
Clean up
2e0a07b 
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin
Merge branch 'main' into 17357-remove-platform-merke-state-root-3
f79be6e 
# Conflicts:
#	hedera-node/hedera-app/src/main/java/com/hedera/node/app/Hedera.java
#	hedera-node/hedera-app/src/main/java/com/hedera/node/app/HederaInjectionComponent.java
@imalygin @timo0
Update platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/p…
4c9f56e 
…latform/SwirldsPlatform.java

Co-authored-by: Timo Brandstätter <[email protected]>
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin @timo0
Update platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/p…
495acfb 
…latform/eventhandling/DefaultTransactionHandler.java

Co-authored-by: Timo Brandstätter <[email protected]>
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin @timo0
Update platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/p…
6d5827b 
…latform/state/SwirldStateManager.java

Co-authored-by: Timo Brandstätter <[email protected]>
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin @timo0
Update platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/p…
f7b4008 
…latform/util/BootstrapUtils.java

Co-authored-by: Timo Brandstätter <[email protected]>
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin @timo0
Update platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/p…
61d9ae7 
…latform/SignedStateFileReadWriteTest.java

Co-authored-by: Timo Brandstätter <[email protected]>
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin @timo0
Update platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/p…
f90763e 
…latform/state/snapshot/SavedStateMetadata.java

Co-authored-by: Timo Brandstätter <[email protected]>
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin @timo0
Update platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/p…
8fcd655 
…latform/state/signed/SignedState.java

Co-authored-by: Timo Brandstätter <[email protected]>
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin @timo0
Update platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/p…
64e58ec 
…latform/state/editor/StateEditor.java

Co-authored-by: Timo Brandstätter <[email protected]>
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin @timo0
Update platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/p…
938ce68 
…latform/state/editor/StateEditorSwap.java

Co-authored-by: Timo Brandstätter <[email protected]>
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin @timo0
Update platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/p…
1443ef1 
…latform/state/editor/StateEditorRm.java

Co-authored-by: Timo Brandstätter <[email protected]>
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin
Addressed review comments - removed deprecated code, used specific ty…
71cd947 
…pe instead of `var`

Signed-off-by: Ivan Malygin <[email protected]>
@imalygin
Spotless
f1e4492 
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin imalygin requested review from a team as code owners February 12, 2025 20:23
@imalygin imalygin changed the title refactor: 17868 Remove usage of MerkleStateRoot from `swirlds-platform-core refactor: 17868 Remove usage of MerkleStateRoot from `swirlds-platform-coreё Feb 12, 2025
@imalygin imalygin changed the title refactor: 17868 Remove usage of MerkleStateRoot from `swirlds-platform-coreё refactor: 17868 Remove usage of MerkleStateRoot from swirlds-platform-core Feb 12, 2025
@codacy-production Codacy Production
Copy link

codacy-production bot commented Feb 12, 2025 •
edited
Loading

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation Diff coverage
✅ -0.01% (target: -1.00%) ✅ 54.68%
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (222f269) 99448 72523 72.93%
Head commit (5a79275) 99447 (-1) 72517 (-6) 72.92% (-0.01%)

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details
Coverable lines Covered lines Diff coverage
Pull request (#17873) 267 146 54.68%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences

Codacy stopped sending the deprecated coverage status on June 5th, 2024. Learn more

@codecov Codecov
Copy link

codecov bot commented Feb 12, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 54.30712% with 122 lines in your changes missing coverage. Please review.

Project coverage is 69.01%. Comparing base (222f269) to head (5a79275).
Report is 3 commits behind head on main.

Files with missing lines Patch % Lines
...com/swirlds/platform/state/editor/StateEditor.java 0.00% 15 Missing ⚠️
...rc/main/java/com/hedera/node/app/ServicesMain.java 7.14% 13 Missing ⚠️
...irlds/platform/recovery/EventRecoveryWorkflow.java 0.00% 9 Missing ⚠️
...irlds/platform/state/signed/StartupStateUtils.java 33.33% 8 Missing ⚠️
...n/java/com/hedera/node/app/state/WrappedState.java 0.00% 6 Missing ⚠️
...app/workflows/handle/stack/SavepointStackImpl.java 0.00% 6 Missing ⚠️
...swirlds/platform/state/editor/StateEditorSwap.java 0.00% 6 Missing ⚠️
...java/com/swirlds/demo/iss/ISSTestingToolState.java 16.66% 5 Missing ⚠️
...com/swirlds/platform/cli/CompareStatesCommand.java 0.00% 4 Missing ⚠️
...m/swirlds/platform/state/editor/StateEditorRm.java 0.00% 4 Missing ⚠️
... and 30 more
Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##               main   #17873      +/-   ##
============================================
- Coverage     69.01%   69.01%   -0.01%     
+ Complexity    23044    23036       -8     
============================================
  Files          2655     2654       -1     
  Lines         99665    99664       -1     
  Branches      10285    10286       +1     
============================================
- Hits          68782    68781       -1     
- Misses        26981    26986       +5     
+ Partials       3902     3897       -5
Files with missing lines Coverage Δ
...-app/src/main/java/com/hedera/node/app/Hedera.java 50.85% <100.00%> (-0.13%) ⬇️
...a/node/app/blocks/impl/BlockStreamManagerImpl.java 95.59% <ø> (+1.35%) ⬆️
.../hedera/node/app/platform/PlatformStateModule.java 100.00% <ø> (ø)
...com/hedera/node/app/state/StateLifecyclesImpl.java 86.66% <ø> (ø)
...ra/node/app/state/merkle/MerkleSchemaRegistry.java 85.03% <ø> (ø)
.../node/app/workflows/handle/record/SystemSetup.java 90.26% <ø> (ø)
.../demo/addressbook/AddressBookTestingToolState.java 56.41% <100.00%> (ø)
.../demo/consistency/ConsistencyTestingToolState.java 68.49% <100.00%> (ø)
...rlds/demo/migration/MigrationTestingToolState.java 10.86% <100.00%> (ø)
...wirlds/demo/platform/PlatformTestingToolState.java 8.97% <ø> (-1.16%) ⬇️
... and 71 more

... and 15 files with indirect coverage changes

Impacted file tree graph

mhess-swl
mhess-swl previously approved these changes Feb 12, 2025
View reviewed changes
@imalygin imalygin self-assigned this Feb 12, 2025
@imalygin imalygin added this to the v0.60 milestone Feb 12, 2025
imalygin and others added 5 commits February 13, 2025 16:42
@imalygin
Addressed Artem's review comment -Introduced MerkleNodeState interf…
e6f3ca5 
…ace to make sure that there is a compile time validation. Got rid of `cast` method in `State` interface.

Signed-off-by: Ivan Malygin <[email protected]>
@imalygin
Addressed Artem's review comments
aa55e4a 
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin @timo0
Update platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/p…
dba1bcb 
…latform/state/signed/SignedState.java

Co-authored-by: Timo Brandstätter <[email protected]>
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin
Merge branch 'main' into 17357-remove-platform-merke-state-root-3
ebc1183
@imalygin
Fixed HederaStateRoot and TestMerkleStateRoot class registration.
7102465 
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin imalygin requested review from a team as code owners February 14, 2025 02:00
@imalygin
Spotless
0146d18 
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin
refactor: 17868
993debb 
Signed-off-by: Ivan Malygin <[email protected]>
@imalygin imalygin closed this Feb 18, 2025
@imalygin imalygin deleted the 17868 branch February 18, 2025 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edward-swirldslabs edward-swirldslabs edward-swirldslabs approved these changes

@mhess-swl mhess-swl mhess-swl left review comments

@rbarker-dev rbarker-dev Awaiting requested review from rbarker-dev rbarker-dev was automatically assigned from hashgraph/platform-ci

@timfn-hg timfn-hg Awaiting requested review from timfn-hg timfn-hg was automatically assigned from hashgraph/platform-base

@artemananiev artemananiev Awaiting requested review from artemananiev artemananiev was automatically assigned from hashgraph/platform-data

@rbair23 rbair23 Awaiting requested review from rbair23 rbair23 was automatically assigned from hashgraph/platform-architects

@povolev15 povolev15 Awaiting requested review from povolev15 povolev15 was automatically assigned from hashgraph/hedera-services

Assignees

@imalygin imalygin

Labels
None yet
Projects
None yet
Milestone
v0.60
Development

Successfully merging this pull request may close these issues.

Get rid of using MerkleStateRoot features on initialization in platform-core code
3 participants
@imalygin @mhess-swl @edward-swirldslabs