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

Fix SQL migration conflict and coverage gaps #1401

Merged
merged 2 commits into from
Sep 18, 2023

Conversation

nguyer
Copy link
Contributor

@nguyer nguyer commented Sep 14, 2023

We had two PRs get merged separately that used the same migration number. This PR also fixes two small gaps in unit test coverage.

@nguyer nguyer requested a review from a team as a code owner September 14, 2023 20:04
@codecov-commenter
Copy link

codecov-commenter commented Sep 14, 2023

Codecov Report

Merging #1401 (dfc3b17) into main (56af59b) will increase coverage by 0.01%.
Report is 8 commits behind head on main.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #1401      +/-   ##
==========================================
+ Coverage   99.96%   99.98%   +0.01%     
==========================================
  Files         316      316              
  Lines       22147    22147              
==========================================
+ Hits        22139    22143       +4     
+ Misses          4        2       -2     
+ Partials        4        2       -2     
Files Changed Coverage Δ
pkg/core/tokenpool.go 100.00% <ø> (ø)
internal/assets/token_approval.go 100.00% <100.00%> (ø)
internal/assets/token_transfer.go 100.00% <100.00%> (ø)
internal/database/sqlcommon/contractapis_sql.go 100.00% <100.00%> (ø)
internal/database/sqlcommon/tokenpool_sql.go 100.00% <100.00%> (ø)
internal/definitions/handler_contracts.go 100.00% <100.00%> (ø)
internal/definitions/handler_tokenpool.go 100.00% <100.00%> (ø)
internal/definitions/sender_tokenpool.go 97.05% <100.00%> (ø)
internal/events/token_pool_created.go 100.00% <100.00%> (ø)
internal/orchestrator/txn_status.go 100.00% <100.00%> (ø)
... and 1 more

... and 2 files with indirect coverage changes

test/e2e/e2e.log Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't think this was supposed to be checked in?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

🧹

@@ -163,8 +163,8 @@ func (suite *FabricContractTestSuite) TestE2EContractEvents() {
assert.NoError(suite.T(), err)
assert.Equal(suite.T(), assetName, res.(map[string]interface{})["name"])

suite.testState.client1.DeleteContractListener(suite.T(), subs[0].ID)
subs = suite.testState.client1.GetContractListeners(suite.T(), suite.testState.startTime)
assert.Equal(suite.T(), 0, len(subs))
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you mean to leave this commented out?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No 🤦

Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
Copy link
Member

@shorsher shorsher left a comment

Choose a reason for hiding this comment

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

🚀

@nguyer nguyer merged commit 8a362af into hyperledger:main Sep 18, 2023
14 checks passed
@nguyer nguyer deleted the fix-build branch September 18, 2023 15:00
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.

None yet

4 participants