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

Problem: test_tx_inclusion is flaky when nodes halt due to different gas_wanted #1657

Merged
merged 3 commits into from
Oct 23, 2024

Conversation

mmsqe
Copy link
Collaborator

@mmsqe mmsqe commented Oct 23, 2024

👮🏻👮🏻👮🏻 !!!! REFERENCE THE PROBLEM YOUR ARE SOLVING IN THE PR TITLE AND DESCRIBE YOUR SOLUTION HERE !!!! DO NOT FORGET !!!! 👮🏻👮🏻👮🏻

Closes: #1656

PR Checklist:

  • Have you read the CONTRIBUTING.md?
  • Does your PR follow the C4 patch requirements?
  • Have you rebased your work on top of the latest master?
  • Have you checked your code compiles? (make)
  • Have you included tests for any non-trivial functionality?
  • Have you checked your code passes the unit tests? (make test)
  • Have you checked your code formatting is correct? (go fmt)
  • Have you checked your basic code style is fine? (golangci-lint run)
  • If you added any dependencies, have you checked they do not contain any known vulnerabilities? (go list -json -m all | nancy sleuth)
  • If your changes affect the client infrastructure, have you run the integration test?
  • If your changes affect public APIs, does your PR follow the C4 evolution of public contracts?
  • If your code changes public APIs, have you incremented the crate version numbers and documented your changes in the CHANGELOG.md?
  • If you are contributing for the first time, please read the agreement in CONTRIBUTING.md now and add a comment to this pull request stating that your PR is in accordance with the Developer's Certificate of Origin.

Thank you for your code, it's appreciated! :)

Summary by CodeRabbit

  • New Features
    • Introduced new test functions to enhance transaction testing capabilities, including handling for batch transactions and gas management.
  • Bug Fixes
    • Improved error handling in transaction tests to ensure exceptions are raised appropriately during contract interactions.
  • Chores
    • Updated utility functions for better control over timeouts and error handling, including a new timeout parameter for waiting functions.
    • Minor code formatting improvements for better readability.

mmsqe added 2 commits October 23, 2024 09:37
…gas_wanted

wait longer to avoid nodes start with different max_gas_wanted
@mmsqe mmsqe requested a review from a team as a code owner October 23, 2024 01:41
@mmsqe mmsqe requested review from JayT106 and leejw51crypto and removed request for a team October 23, 2024 01:41
Copy link
Contributor

coderabbitai bot commented Oct 23, 2024

Walkthrough

The pull request introduces modifications to the integration_tests/test_basic.py and integration_tests/utils.py files. It adds new test cases for transaction inclusion and enhances existing tests to improve error handling and synchronization. Additionally, the utility functions are updated to include a timeout parameter for better control during block waiting operations. These changes aim to enhance the robustness and reliability of transaction testing, particularly in scenarios involving gas management and batch transactions.

Changes

File Change Summary
integration_tests/test_basic.py - Added test_tx_inclusion to evaluate heavy transaction inclusion under varying max_gas_wanted configurations.
- Enhanced test_failed_transfer_tx to verify inclusion of failed transfer transactions in batch transactions.
- Minor synchronization improvements with added sleep statements.
- Refined error handling in test_exception and test_refund_unused_gas_when_contract_tx_reverted.
integration_tests/utils.py - Updated wait_for_new_blocks to include a timeout parameter for maximum wait time.
- Improved error handling in wait_for_block to capture and print AssertionError exceptions.
- Minor formatting changes for improved readability.

Assessment against linked issues

Objective Addressed Explanation
Test test_tx_inclusion for flakiness related to transaction inclusion (#1656)
Enhance error handling in transaction tests (#1656)

Possibly related PRs

Suggested reviewers

  • devashishdxt
  • calvinaco

🐇 In the meadow, where bunnies play,
New tests hop in, brightening the day.
With gas limits set, and errors caught,
Our code is stronger, as we’ve sought!
So let’s celebrate, with a joyful cheer,
For robust testing is finally here! 🥳


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (5)
integration_tests/utils.py (1)

125-132: LGTM! Consider enhancing the timeout error message.

The timeout implementation is well-structured and consistent with other timeout handling in the codebase. The default timeout value of 240 seconds aligns with other similar functions.

Consider making the timeout error message more descriptive by including the current height:

-            raise TimeoutError(f"wait for block {begin_height + n} timeout")
+            raise TimeoutError(f"wait for block {begin_height + n} timeout (current height: {cur_height})")
integration_tests/test_basic.py (4)

Line range hint 875-876: Avoid using hard-coded sleep intervals; use explicit synchronization instead

Using time.sleep(2) can lead to flaky tests due to variable execution times. Consider waiting for the service to become available by polling or using explicit synchronization methods to ensure reliability.


Line range hint 883-883: Rename variable sended_hash_set to sent_hash_set

The variable name sended_hash_set is grammatically incorrect. The correct past tense of "send" is "sent".

Apply this diff to correct the variable name:

-    _, sended_hash_set = send_txs(w3, cli, to, list(KEYS.values())[0:4], params)
+    _, sent_hash_set = send_txs(w3, cli, to, list(KEYS.values())[0:4], params)

Line range hint 872-876: Avoid using global variables; encapsulate origin_cmd within the test function

Using global variables like origin_cmd can lead to unintended side effects, especially when tests are run concurrently. Consider refactoring to manage origin_cmd within the function scope or by using a fixture for better test isolation.


Line range hint 870-906: Ensure division by zero is avoided in max_tx_in_block calculation

When calculating max_tx_in_block, there is a potential for division by zero if max_gas_wanted is zero. Although current parameters avoid zero, adding a check can prevent future errors.

Apply this diff to add a safeguard:

+    if max_gas_wanted == 0:
+        raise ValueError("max_gas_wanted must be greater than zero")
     max_tx_in_block = block_gas_limit // min(max_gas_wanted, tx_gas_limit)
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 8a50b30 and 0adc55e.

📒 Files selected for processing (2)
  • integration_tests/test_basic.py (1 hunks)
  • integration_tests/utils.py (1 hunks)
🧰 Additional context used
🔇 Additional comments (1)
integration_tests/test_basic.py (1)

Line range hint 782-817: Test test_failed_transfer_tx correctly verifies inclusion of failed transactions

The test effectively demonstrates that a failed transfer transaction within a batch is still included in the block. Assertions and checks are properly implemented to validate the behavior.

Copy link

codecov bot commented Oct 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 16.64%. Comparing base (8a50b30) to head (cc5f7d9).
Report is 1 commits behind head on main.

❗ There is a different number of reports uploaded between BASE (8a50b30) and HEAD (cc5f7d9). Click for more details.

HEAD has 12 uploads less than BASE
Flag BASE (8a50b30) HEAD (cc5f7d9)
integration_tests 20 10
2 0
Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##             main    #1657       +/-   ##
===========================================
- Coverage   34.94%   16.64%   -18.30%     
===========================================
  Files         123       72       -51     
  Lines       11803     6212     -5591     
===========================================
- Hits         4124     1034     -3090     
+ Misses       7265     5055     -2210     
+ Partials      414      123      -291     

see 69 files with indirect coverage changes

@mmsqe mmsqe enabled auto-merge October 23, 2024 02:04
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (2)
integration_tests/test_basic.py (2)

869-874: Synchronization improvements look good, but consider adding error handling.

The added synchronization logic helps address the flakiness issue by ensuring proper timing between operations. However, consider adding error handling for the port wait operation.

Consider adding a timeout and error handling:

-    wait_for_port(ports.evmrpc_port(cronos.base_port(0)))
+    try:
+        wait_for_port(ports.evmrpc_port(cronos.base_port(0)), timeout=30)
+    except TimeoutError:
+        raise TimeoutError("EVM RPC port not available after supervisor update")

Line range hint 832-838: Consider enhancing test documentation.

While the test implementation is solid, the docstring could be more descriptive about the test's purpose and the significance of the max_gas_wanted parameter.

Consider expanding the docstring:

 def test_tx_inclusion(cronos, max_gas_wanted):
     """
-    - send multiple heavy transactions at the same time.
-    - check they are included in consecutively blocks without failure.
-
-    test against different max-gas-wanted configuration.
+    Test transaction inclusion behavior with different max-gas-wanted configurations.
+
+    Args:
+        cronos: The Cronos test fixture
+        max_gas_wanted: Maximum gas wanted per transaction. This parameter affects
+                       how many transactions can be included in a single block.
+
+    The test:
+    1. Sends multiple heavy transactions concurrently
+    2. Verifies they are included in consecutive blocks without failure
+    3. Validates block inclusion patterns based on max-gas-wanted limits
     """
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 0adc55e and cc5f7d9.

📒 Files selected for processing (1)
  • integration_tests/test_basic.py (1 hunks)
🧰 Additional context used

@mmsqe mmsqe added this pull request to the merge queue Oct 23, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 23, 2024
@mmsqe mmsqe added this pull request to the merge queue Oct 23, 2024
Merged via the queue into crypto-org-chain:main with commit 572aae7 Oct 23, 2024
42 of 43 checks passed
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.

Problem: wrong Block.Header.LastResultsHash occurs in prevote step
2 participants