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 Report Merge Conflicts #160

Merged
merged 2 commits into from
Sep 2, 2022
Merged

Conversation

trajan0x
Copy link
Contributor

@trajan0x trajan0x commented Sep 2, 2022

Description

Fix merge conflicts in solidity test files, regenerate go abigen files for use in #104 .

@trajan0x trajan0x marked this pull request as ready for review September 2, 2022 16:26
@trajan0x trajan0x mentioned this pull request Sep 2, 2022
3 tasks
@github-actions github-actions bot added 2-reviewers C-Protocol-Critical PRs that modify protocol-critical code. go Pull requests that update Go code M-contracts Module: Contracts labels Sep 2, 2022
@trajan0x trajan0x changed the title fix merge conflict Fix Report Merge Conflicts Sep 2, 2022
@codecov
Copy link

codecov bot commented Sep 2, 2022

Codecov Report

Merging #160 (d63a3c9) into feat/reports (81444d8) will increase coverage by 0.91607%.
The diff coverage is 64.73430%.

❗ Current head d63a3c9 differs from pull request most recent head d1789be. Consider uploading reports for the commit d1789be to get more accurate results

@@                  Coverage Diff                   @@
##           feat/reports        #160         +/-   ##
======================================================
+ Coverage      51.22239%   52.13846%   +0.91607%     
======================================================
  Files               142         144          +2     
  Lines              5931        6009         +78     
  Branches             79          82          +3     
======================================================
+ Hits               3038        3133         +95     
+ Misses             2600        2581         -19     
- Partials            293         295          +2     
Impacted Files Coverage Δ
agents/testutil/contracttype.go 36.36364% <ø> (+1.58102%) ⬆️
agents/testutil/deployers.go 72.09302% <ø> (-2.37508%) ⬇️
agents/testutil/typecast.go 100.00000% <ø> (+8.69565%) ⬆️
...es/contracts/test/harnesses/DestinationHarness.sol 100.00000% <ø> (ø)
...ackages/contracts/test/harnesses/OriginHarness.sol 75.00000% <ø> (ø)
...racts/test/harnesses/libs/SystemMessageHarness.sol 0.00000% <0.00000%> (ø)
services/scribe/config/chain.go 75.00000% <ø> (ø)
services/scribe/config/config.go 74.28571% <ø> (ø)
services/scribe/db/datastore/sql/base/log.go 0.00000% <ø> (ø)
services/scribe/db/datastore/sql/base/model.go 100.00000% <ø> (ø)
... and 20 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@ChiTimesChi ChiTimesChi merged commit e1f828b into feat/reports Sep 2, 2022
@trajan0x trajan0x deleted the feat/reports-merge-fix branch September 2, 2022 16:55
@trajan0x trajan0x restored the feat/reports-merge-fix branch September 2, 2022 16:56
@trajan0x trajan0x deleted the feat/reports-merge-fix branch March 28, 2023 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2-reviewers C-Protocol-Critical PRs that modify protocol-critical code. go Pull requests that update Go code M-contracts Module: Contracts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants