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

Catchpoint: Fix broken merge between #4818 and #4835 #4840

Merged

Conversation

michaeldiamant
Copy link
Contributor

Fixes broken merge between #4818 and #4835.

Prior to the PR, master fails compilation with: ledger/catchpointwriter_test.go:585:22: undefined: MakeMerkleCommitter.

@michaeldiamant michaeldiamant changed the title Fix broken merge between #4818 and #4835 Catchpoint: Fix broken merge between #4818 and #4835 Nov 30, 2022
@michaeldiamant michaeldiamant marked this pull request as ready for review November 30, 2022 14:50
@codecov
Copy link

codecov bot commented Nov 30, 2022

Codecov Report

Merging #4840 (e8af397) into master (8327fc7) will increase coverage by 0.03%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #4840      +/-   ##
==========================================
+ Coverage   53.52%   53.56%   +0.03%     
==========================================
  Files         422      422              
  Lines       53852    53852              
==========================================
+ Hits        28826    28845      +19     
+ Misses      22704    22685      -19     
  Partials     2322     2322              
Impacted Files Coverage Δ
ledger/accountdb.go 68.51% <ø> (ø)
network/wsPeer.go 67.06% <0.00%> (-2.39%) ⬇️
catchup/service.go 68.71% <0.00%> (-0.74%) ⬇️
ledger/testing/randomAccounts.go 56.61% <0.00%> (-0.62%) ⬇️
ledger/acctupdates.go 69.34% <0.00%> (-0.25%) ⬇️
network/wsNetwork.go 64.92% <0.00%> (+0.17%) ⬆️
ledger/catchpointtracker.go 59.83% <0.00%> (+0.47%) ⬆️
ledger/acctonline.go 78.81% <0.00%> (+0.51%) ⬆️
cmd/tealdbg/debugger.go 73.49% <0.00%> (+0.80%) ⬆️
crypto/merkletrie/node.go 93.48% <0.00%> (+1.86%) ⬆️
... and 4 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@michaeldiamant michaeldiamant merged commit d19f2aa into algorand:master Nov 30, 2022
@michaeldiamant michaeldiamant deleted the fix_MakeMerkleCommitter branch November 30, 2022 14:57
winder pushed a commit to winder/go-algorand that referenced this pull request Dec 2, 2022
algolucky pushed a commit to algolucky/go-algorand that referenced this pull request Dec 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants