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.

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

[Dynamic Protocol State] Sync master to feature/dynamic-protocol-state #5190

Conversation

durkmurder
Copy link
Member

Context

This PR syncs latest master to feature branch to bring changes related to usage of golang.org/x/exp/slices.
Pretty heavy conflicts wise, list of conflicted files:

both modified:   cmd/access/node_builder/access_node_builder.go
both modified:   cmd/bootstrap/cmd/finalize.go
both modified:   cmd/bootstrap/cmd/keys.go
both modified:   cmd/bootstrap/cmd/seal.go
both modified:   cmd/bootstrap/run/cluster_qc.go
both modified:   cmd/bootstrap/run/qc_test.go
both modified:   cmd/scaffold.go
both modified:   consensus/hotstuff/committees/static.go
both modified:   consensus/hotstuff/signature/block_signer_decoder_test.go
both modified:   consensus/hotstuff/timeoutcollector/timeout_processor_test.go
both modified:   consensus/integration/epoch_test.go
both modified:   consensus/integration/nodes_test.go
both modified:   engine/access/ingestion/engine.go
both modified:   engine/access/rpc/backend/backend_events.go
both modified:   engine/access/rpc/backend/backend_test.go
both modified:   engine/execution/execution_test.go
both modified:   go.mod
both modified:   go.sum
both modified:   insecure/go.mod
both modified:   insecure/go.sum
both modified:   integration/go.mod
both modified:   integration/go.sum
both modified:   integration/testnet/network.go
both modified:   model/bootstrap/node_info.go
both modified:   model/bootstrap/node_info_test.go
both modified:   model/convert/service_event.go
both modified:   model/flow/assignment/sort.go
both modified:   model/flow/factory/cluster_list.go
both modified:   model/flow/identity.go
both modified:   model/flow/identity_test.go
deleted by them: model/flow/order/identity.go
deleted by them: model/flow/order/identity_test.go
both modified:   model/verification/chunkDataPackRequest_test.go
both modified:   module/metrics/labels.go
both modified:   module/signature/signer_indices_test.go
both modified:   network/test/cohort2/unicast_authorization_test.go
both modified:   state/protocol/badger/mutator_test.go
both modified:   state/protocol/badger/snapshot.go
both modified:   state/protocol/badger/validity.go
deleted by us:   state/protocol/mock/cluster_events.go
deleted by us:   state/protocol/mock/cluster_id_update_consumer.go
both modified:   state/protocol/snapshot.go
deleted by us:   storage/mock/epoch_states.go
both modified:   utils/unittest/cluster.go
both modified:   utils/unittest/fixtures.go

peterargue and others added 30 commits December 11, 2023 20:26
…otocol-snapshot-from-any-block-endpoint

[Access] Get protocol snapshot by block id and block height
[Storehouse] Improve InMemoryRegisterStore's IsBlockExecuted method
Co-authored-by: Gregor G. <75445744+sideninja@users.noreply.github.com>
Co-authored-by: Peter Argue <89119817+peterargue@users.noreply.github.com>
Co-authored-by: Khalil Claybon <khalil.claybon@dapperlabs.com>
@codecov-commenter
Copy link

codecov-commenter commented Jan 2, 2024

Codecov Report

Attention: 74 lines in your changes are missing coverage. Please review.

Comparison is base (2fd4fe8) 56.51% compared to head (b49265d) 58.18%.

Files Patch % Lines
cmd/execution_builder.go 0.00% 40 Missing ⚠️
cmd/scaffold.go 0.00% 26 Missing ⚠️
cmd/bootstrap/cmd/finalize.go 40.00% 3 Missing ⚠️
cmd/bootstrap/cmd/keys.go 0.00% 1 Missing ⚠️
cmd/bootstrap/run/cluster_qc.go 0.00% 0 Missing and 1 partial ⚠️
cmd/execution_config.go 0.00% 1 Missing ⚠️
cmd/util/ledger/reporters/atree_reporter.go 0.00% 1 Missing ⚠️
consensus/hotstuff/committees/static.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@                        Coverage Diff                         @@
##           feature/dynamic-protocol-state    #5190      +/-   ##
==================================================================
+ Coverage                           56.51%   58.18%   +1.67%     
==================================================================
  Files                                 989      816     -173     
  Lines                               92656    78901   -13755     
==================================================================
- Hits                                52362    45912    -6450     
+ Misses                              36433    29560    -6873     
+ Partials                             3861     3429     -432     
Flag Coverage Δ
unittests 58.18% <8.64%> (+1.67%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@AlexHentschel AlexHentschel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚢

@durkmurder durkmurder merged commit 4ab0406 into feature/dynamic-protocol-state Jan 9, 2024
51 checks passed
@durkmurder durkmurder deleted the yurii/sync-master-to-dynamic-protocol-state branch January 9, 2024 10:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.