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

Fix E2E tests in TokenExpiryInfoSuite #9686

Merged
merged 50 commits into from Nov 8, 2023
Merged

Fix E2E tests in TokenExpiryInfoSuite #9686

merged 50 commits into from Nov 8, 2023

Conversation

petreze
Copy link
Contributor

@petreze petreze commented Nov 6, 2023

Description:
This PR fixes TokenUpdatePrecompileSuite e2e test. Changes were needed in TokenExpiryCall overriding the execute method in order to handle the test case

Related issue(s):

Fixes #9567

Notes for reviewer:

Checklist

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

MiroslavGatsanoga and others added 30 commits October 26, 2023 16:40
@MiroslavGatsanoga
Fix TokenInfoHTSSuite tests
a369797 
Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech>
@MiroslavGatsanoga
Merge branch 'develop' into fix-token-info-hts-suite
98d5403
@MiroslavGatsanoga
Move fix for child records to AbstractNonRevertibleTokenViewCall
18f035b 
Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech>
@MiroslavGatsanoga
Remove unused mock
c884415 
Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech>
@MiroslavGatsanoga
Setup mock message frame with mock proxy updater
432b9c6 
Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech>
@MiroslavGatsanoga
Fix copy-paste error in DefaultKycStatusCallTest
378e035 
Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech>
@MiroslavGatsanoga
Merge branch 'develop' into fix-token-info-hts-suite
c379a62
@MiroslavGatsanoga
Enable a couple of tests in DefaultTokenStatusSuite
c750cb7 
Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech>
@MiroslavGatsanoga
Revert MessageFrame injections and make QuerySystemContractOperations
7547749 
method no-op

Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech>
@MiroslavGatsanoga
Fix failing unit test
d6c44e9 
Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech>
@petreze
Merge branch 'fix-token-info-hts-suite' into 09566-fix-token-update-s…
3372c04 
…uite
@MiroslavGatsanoga
Merge branch 'develop' into fix-token-info-hts-suite
04a9c7f
@petreze
fix UpdatePrecompileSuite tests and enhance child records behaviour
bf11d32
@petreze
apply spotless and fix minor typo
e1b260a
@petreze
Merge branch 'develop' into 09566-fix-token-update-suite
d5b274c
@petreze
apply spotless and fix minor typo
83dc553 
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@stoqnkpL @petreze
Populate evm function result on failing eth transaction (modulatized … (
6ab6e58 
#9569)

Signed-off-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech>
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@hendrikebbers @timo0 @petreze
old logging API moved to legacy package (#8459)
8f16eb3 
Signed-off-by: Hendrik Ebbers <hendrik.ebbers@web.de>
Signed-off-by: Timo Brandstätter <timo@swirldslabs.com>
Co-authored-by: Timo Brandstätter <timo@swirldslabs.com>
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@alittley @petreze
09449 Create data consistency validator (#9549)
8911e17 
Signed-off-by: Austin Littley <austin@swirldslabs.com>
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@tinker-michaelj @mhess-swl @petreze
Support fuzzy-matching record snapshots (#9513)
a185876 
Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>
Signed-off-by: Matt Hess <matt.hess@swirldslabs.com>
Co-authored-by: Matt Hess <matt.hess@swirldslabs.com>
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@imalygin @petreze
9559 Increased timeout in the assertions to prevent non-deterministic…
8ccf213 
… failures. (#9560)

Signed-off-by: Ivan Malygin <ivan@swirldslabs.com>
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@jsync-swirlds @petreze
Fix compile breakage in develop following package move of logging. (#…
f3eba22 
…9600)

Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com>
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@jjohannes @petreze
Cleanup Module patching (#8561)
0af2702 
Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@poulok @petreze
Make platform mainnet settings the default (#9341)
b6394f7 
Signed-off-by: Kelly Greco <kelly@swirldslabs.com>
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@cody-littley @petreze
Measure consensus metrics for all events. (#9604)
edd46bd 
Signed-off-by: Cody Littley <cody@swirldslabs.com>
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@lpetrovic05 @petreze
09543 d remove crypto class (#9544)
9a6072e 
Signed-off-by: Lazar Petrovic <lpetrovic05@gmail.com>
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@povolev15 @petreze
remove static from all the test in MiscCryptoSuite (#9619)
164ed6f 
Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@petreze
Merge remote-tracking branch 'origin/09566-fix-token-update-suite' in…
2eca0d3 
…to 09566-fix-token-update-suite
@petreze
fix UpdatePrecompileSuite tests and enhance child records behaviour
e442139 
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@petreze
Merge branch 'develop' into 09566-token-update-suite
49a469e 
# Conflicts:
#	hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/HandleSystemContractOperations.java
#	hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/scope/QuerySystemContractOperations.java
#	hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/AbstractNonRevertibleTokenViewCall.java
#	hedera-node/hedera-smart-contract-service-impl/src/test/java/com/hedera/node/app/service/contract/impl/test/exec/scope/QuerySystemContractOperationsTest.java
@petreze
Merge branch '09566-fix-token-update-suite' into 09567-fix-token-upda…
869ac22 
…te-expiry-e2e

# Conflicts:
#	hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/AbstractNonRevertibleTokenViewCall.java
#	hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/exec/systemcontracts/hts/tokenkey/TokenKeyCall.java
@petreze
fix misleading typo
dfc8a38 
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@petreze
apply spotless
f8aec8d 
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@petreze
apply spotless
297d899 
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
@petreze petreze self-assigned this Nov 6, 2023
@petreze petreze added the Limechain Work planned for the LimeChain team label Nov 6, 2023
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 6, 2023 •
edited

Node: Unit Test Results

    2 276 files  ±0      2 276 suites  ±0   1h 30m 37s ⏱️ - 1m 7s
118 363 tests ±0  118 329 ✔️ ±0  34 💤 ±0  0 ❌ ±0 
126 624 runs  ±0  126 590 ✔️ ±0  34 💤 ±0  0 ❌ ±0 

Results for commit de2caa0. ± Comparison against base commit 527b92a.

♻️ This comment has been updated with latest results.

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 6, 2023 •
edited

Node: E2E Test Results

    1 files      1 suites   21m 0s ⏱️
310 tests 310 ✔️ 0 💤 0 ❌
332 runs  332 ✔️ 0 💤 0 ❌

Results for commit de2caa0.

♻️ This comment has been updated with latest results.

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 6, 2023 •
edited

Node: Integration Test Results

280 tests  ±0   280 ✔️ ±0   28m 18s ⏱️ -21s
    5 suites ±0       0 💤 ±0 
    5 files   ±0       0 ❌ ±0 

Results for commit de2caa0. ± Comparison against base commit 527b92a.

♻️ This comment has been updated with latest results.

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 6, 2023 •
edited

Node: HAPI Test Results

1 242 tests   849 ✔️  1h 25m 26s ⏱️
   165 suites  393 💤
   165 files        0 ❌

Results for commit de2caa0.

♻️ This comment has been updated with latest results.

@petreze petreze marked this pull request as ready for review November 8, 2023 14:51
@petreze petreze requested review from a team and tinker-michaelj as code owners November 8, 2023 14:51
@codecov Codecov
Copy link

codecov bot commented Nov 8, 2023 •
edited

Codecov Report

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

Comparison is base (0806629) 65.44% compared to head (de2caa0) 65.43%.
Report is 7 commits behind head on develop.

Additional details and impacted files 
@@              Coverage Diff              @@
##             develop    #9686      +/-   ##
=============================================
- Coverage      65.44%   65.43%   -0.01%     
- Complexity     29983    29986       +3     
=============================================
  Files           3296     3296              
  Lines         125494   125575      +81     
  Branches       13017    13027      +10     
=============================================
+ Hits           82130    82176      +46     
- Misses         40238    40265      +27     
- Partials        3126     3134       +8
Files Coverage Δ
...edera/node/app/spi/validation/ExpiryValidator.java 0.00% <ø> (ø)
...sus/impl/handlers/ConsensusCreateTopicHandler.java 90.56% <100.00%> (+0.18%) ⬆️
...sus/impl/handlers/ConsensusUpdateTopicHandler.java 77.27% <100.00%> (ø)
.../service/file/impl/handlers/FileCreateHandler.java 90.00% <100.00%> (+0.20%) ⬆️
...n/impl/handlers/NetworkUncheckedSubmitHandler.java 85.71% <ø> (ø)
...mpl/exec/scope/HandleSystemContractOperations.java 100.00% <100.00%> (ø)
...impl/exec/scope/QuerySystemContractOperations.java 100.00% <ø> (ø)
.../impl/exec/systemcontracts/PrngSystemContract.java 97.87% <100.00%> (ø)
...tracts/hts/AbstractNonRevertibleTokenViewCall.java 100.00% <ø> (ø)
...contracts/hts/AbstractRevertibleTokenViewCall.java 100.00% <100.00%> (ø)
... and 13 more

... and 6 files with indirect coverage changes

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

tinker-michaelj
tinker-michaelj approved these changes Nov 8, 2023
View reviewed changes
Copy link
Collaborator

@tinker-michaelj tinker-michaelj left a comment

Choose a reason for hiding this comment

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

LGTM for now, ty @petreze!

We should start thinking about how to extract all these externalizeResult() calls into a single location in HtsSystemContract. 🤔

@petreze petreze merged commit 6f0c423 into develop Nov 8, 2023
16 of 17 checks passed
@petreze petreze deleted the 09567-fix-token-update-expiry-e2e branch November 8, 2023 18:40
Ivo-Yankov pushed a commit that referenced this pull request Nov 9, 2023
@petreze @MiroslavGatsanoga
@stoqnkpL @hendrikebbers @timo0 @alittley @tinker-michaelj @mhess-swl @imalygin @jsync-swirlds @jjohannes @poulok @cody-littley @lpetrovic05 @povolev15 @Ivo-Yankov
Fix E2E tests in TokenExpiryInfoSuite (#9686)
64f7aa6 
Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech>
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
Signed-off-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech>
Signed-off-by: Hendrik Ebbers <hendrik.ebbers@web.de>
Signed-off-by: Timo Brandstätter <timo@swirldslabs.com>
Signed-off-by: Austin Littley <austin@swirldslabs.com>
Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>
Signed-off-by: Matt Hess <matt.hess@swirldslabs.com>
Signed-off-by: Ivan Malygin <ivan@swirldslabs.com>
Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com>
Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
Signed-off-by: Kelly Greco <kelly@swirldslabs.com>
Signed-off-by: Cody Littley <cody@swirldslabs.com>
Signed-off-by: Lazar Petrovic <lpetrovic05@gmail.com>
Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>
Co-authored-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech>
Co-authored-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech>
Co-authored-by: Hendrik Ebbers <hendrik.ebbers@web.de>
Co-authored-by: Timo Brandstätter <timo@swirldslabs.com>
Co-authored-by: Austin Littley <102969658+alittley@users.noreply.github.com>
Co-authored-by: Michael Tinker <michael.tinker@swirldslabs.com>
Co-authored-by: Matt Hess <matt.hess@swirldslabs.com>
Co-authored-by: Ivan Malygin <ivan@swirldslabs.com>
Co-authored-by: Joseph Sinclair <121976561+jsync-swirlds@users.noreply.github.com>
Co-authored-by: Jendrik Johannes <jendrik.johannes@gmail.com>
Co-authored-by: Kelly Greco <82919061+poulok@users.noreply.github.com>
Co-authored-by: Cody Littley <56973212+cody-littley@users.noreply.github.com>
Co-authored-by: Lazar Petrovic <lpetrovic05@gmail.com>
Co-authored-by: Lev Povolotsky <16233475+povolev15@users.noreply.github.com>
Signed-off-by: Ivo Yankov <ivo@devlabs.bg>
nickpoorman pushed a commit that referenced this pull request Nov 22, 2023
@petreze @MiroslavGatsanoga
@stoqnkpL @hendrikebbers @timo0 @alittley @tinker-michaelj @mhess-swl @imalygin @jsync-swirlds @jjohannes @poulok @cody-littley @lpetrovic05 @povolev15 @nickpoorman
Fix E2E tests in TokenExpiryInfoSuite (#9686)
dfa339d 
Signed-off-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech>
Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
Signed-off-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech>
Signed-off-by: Hendrik Ebbers <hendrik.ebbers@web.de>
Signed-off-by: Timo Brandstätter <timo@swirldslabs.com>
Signed-off-by: Austin Littley <austin@swirldslabs.com>
Signed-off-by: Michael Tinker <michael.tinker@swirldslabs.com>
Signed-off-by: Matt Hess <matt.hess@swirldslabs.com>
Signed-off-by: Ivan Malygin <ivan@swirldslabs.com>
Signed-off-by: Joseph Sinclair <joseph.sinclair@swirldslabs.com>
Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
Signed-off-by: Kelly Greco <kelly@swirldslabs.com>
Signed-off-by: Cody Littley <cody@swirldslabs.com>
Signed-off-by: Lazar Petrovic <lpetrovic05@gmail.com>
Signed-off-by: Lev Povolotsky <lev@swirldslabs.com>
Co-authored-by: Miroslav Gatsanoga <miroslav.gatsanoga@limechain.tech>
Co-authored-by: Stoyan Panayotov <stoyan.panayotov@limechain.tech>
Co-authored-by: Hendrik Ebbers <hendrik.ebbers@web.de>
Co-authored-by: Timo Brandstätter <timo@swirldslabs.com>
Co-authored-by: Austin Littley <102969658+alittley@users.noreply.github.com>
Co-authored-by: Michael Tinker <michael.tinker@swirldslabs.com>
Co-authored-by: Matt Hess <matt.hess@swirldslabs.com>
Co-authored-by: Ivan Malygin <ivan@swirldslabs.com>
Co-authored-by: Joseph Sinclair <121976561+jsync-swirlds@users.noreply.github.com>
Co-authored-by: Jendrik Johannes <jendrik.johannes@gmail.com>
Co-authored-by: Kelly Greco <82919061+poulok@users.noreply.github.com>
Co-authored-by: Cody Littley <56973212+cody-littley@users.noreply.github.com>
Co-authored-by: Lazar Petrovic <lpetrovic05@gmail.com>
Co-authored-by: Lev Povolotsky <16233475+povolev15@users.noreply.github.com>
Signed-off-by: Nick Poorman <nick@swirldslabs.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tinker-michaelj tinker-michaelj tinker-michaelj approved these changes

@dikel dikel Awaiting requested review from dikel

@agadzhalov agadzhalov Awaiting requested review from agadzhalov

@iwsimon iwsimon Awaiting requested review from iwsimon iwsimon is a code owner automatically assigned from hashgraph/hedera-services

@acuarica acuarica Awaiting requested review from acuarica acuarica is a code owner automatically assigned from hashgraph/hedera-smart-contracts

Assignees

@petreze petreze

Labels
Limechain Work planned for the LimeChain team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fix E2E tests in TokenExpiryInfoSuite