refactor(metering): Use test-utils's TestHarness and move tests inline #346
+978
−1,082
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Replace custom NodeContext and setup_node() with TestHarness::with_launcher() from base-reth-test-utils. This eliminates duplicated node setup code and uses the shared test infrastructure. Changes: - Add metering_launcher to test_utils module for RPC module injection - Add signer_b256() helper to Account for TransactionBuilder compatibility - Refactor meter_rpc.rs to use TestHarness, ALICE, BOB from test-utils
Introduce MeteringTestContext to bundle the provider, header, and chain spec needed by meter_bundle() and meter_block() functions. This replaces the duplicated setup code in meter.rs and meter_block.rs. The context is metering-specific because it matches the function signatures of the metering API and provides the exact arguments needed for testing metering logic without a full node.
…tern Move meter_bundle and meter_block tests from tests/ directory to inline #[cfg(test)] modules in their respective source files. This follows the base-bundles pattern where unit tests live alongside the code they test. - Use #[cfg(any(test, feature = "test-utils"))] for test_utils module - Add test dependencies as dev-deps for #[cfg(test)] code access - Keep meter_rpc.rs as integration test (requires running node) - Keep self-reference dev-dep for integration test feature access
Move all RPC tests from tests/meter_rpc.rs to inline #[cfg(test)] module in src/rpc.rs. With all tests now inline, the tests/ directory and self-reference dev-dependency are no longer needed. All 18 metering tests now run as unit tests in a single test binary.
Collaborator
🟡 Heimdall Review Status
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
base-reth-test-utilsbase-bundlespattern with#[cfg(test)]modulesMeteringTestContextfor unit tests andmetering_launcherfor RPC module injectiontests/directory - all 18 tests now run as unit testsSupersedes #338.
Changes
Test Infrastructure:
signer_b256()method toAccountin test-utils for transaction signingMeteringTestContext- bundles provider, header, and chain_spec for metering function testsmetering_launcher- node launcher that injects the metering RPC moduleTest Organization (base-bundles pattern):
#[cfg(any(test, feature = "test-utils"))]fortest_utilsmodule[features](optional) and[dev-dependencies]#[cfg(test)]modulestests/directory entirelyFiles:
src/meter.rs- 3 tests formeter_bundle()src/block.rs- 6 tests formeter_block()src/rpc.rs- 9 tests for RPC endpointsTest plan
cargo test -p base-reth-meteringcargo test -p base-reth-metering --libcargo check -p base-reth-metering --features test-utils