fix(platform): point PLATFORM_V15 at query versions V2 after v4.2 merge - #5212
PastaPastaPasta wants to merge 1 commit into
Conversation
…v4.2 merge The v4.2-dev forward-merge (704307e) left v4.3-dev failing to compile: error[E0432]: unresolved import `crate::version::drive_abci_versions::drive_abci_query_versions::v3` --> packages/rs-platform-version/src/version/v15.rs:19 #5043 (v4.3) defined PLATFORM_V15 as a copy of PLATFORM_V14 using DRIVE_ABCI_QUERY_VERSIONS_V3. #5057 (v4.2) folded V3 into V2 and deleted v3.rs, and git merged both without a conflict. Point v15 at V2. Its component tables then match PLATFORM_V14 exactly again, as #5043 intends. Also clean up the dpns.rs import block from the same merge: drop the IdentityGettersV0 import, unused since #4764 (and flagged as an unused-import warning), and the doubled blank lines the conflict resolution left. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
|
@QuantumExplorer, this is the follow-up to your 🤖 Posted autonomously by Codex on behalf of pasta. |
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository: dashpay/platform/.coderabbit.yaml Review profile: CHILL Plan: Advanced Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
✅ Final review complete — no blockers (commit 69627bf) · triage: low |
thepastaclaw
left a comment
There was a problem hiding this comment.
Final validation — Phase 1 + Phase 2
The merge repair correctly selects the existing V2 query table, which preserves the deleted V3 table's values and makes PLATFORM_V15's component selections match PLATFORM_V14 apart from protocol_version. The wallet change removes only an unused import and redundant whitespace; independent validation passed all 23 platform-version tests, all 1185 platform-wallet tests, and formatting checks for both changed files. No in-scope findings remain.
Review provenance
Source: reviewer 1: glm-5.3-flash (agent: phase1-reviewer, role: general); reviewer 2: glm-5.3-flash (agent: phase1-reviewer, role: architecture-layering); reviewer 3: glm-5.3-flash (agent: phase1-reviewer, role: platform-versioning); reviewer 4: glm-5.3-flash (agent: phase1-reviewer, role: rust-quality); reviewer 5: gpt-6.1-sol (agent: phase2-reviewer, role: general); reviewer 6: gpt-6.1-sol (agent: phase2-reviewer, role: architecture-layering); reviewer 7: gpt-6.1-sol (agent: phase2-reviewer, role: platform-versioning); reviewer 8: gpt-6.1-sol (agent: phase2-reviewer, role: rust-quality); final verifier: gpt-6.1-sol (agent: sol-verifier, role: final-verifier)
- Triage:
lowbygpt-6.1-sol(effort low) — The diff is a small, readily verifiable build fix that points PLATFORM_V15 at the existing V2 query table and removes unused import/formatting artifacts, without introducing new consensus logic or other intricate behavior. - Phase 1 reviewers:
glm-5.3-flash— general (completed, effort high); agentphase1-reviewer,glm-5.3-flash— architecture-layering (completed, effort high); agentphase1-reviewer,glm-5.3-flash— platform-versioning (completed, effort high); agentphase1-reviewer,glm-5.3-flash— rust-quality (completed, effort high); agentphase1-reviewer - Phase 1 model:
glm-5.3-flash— zai quota: 5h 99% left, weekly 80% left; passed overgemini-3.8-flash-high(antigravity below 15% reserve: weekly 13% left, 5h 100% left) - Fresh verifier:
gpt-6.1-sol— final-verifier; agentsol-verifier - Phase 2 reviewers:
gpt-6.1-sol— general (completed, effort medium); agentphase2-reviewer,gpt-6.1-sol— architecture-layering (completed, effort medium); agentphase2-reviewer,gpt-6.1-sol— platform-versioning (completed, effort medium); agentphase2-reviewer,gpt-6.1-sol— rust-quality (completed, effort medium); agentphase2-reviewer
Out-of-scope follow-up suggestions (1)
These are valid observations, but they are outside this PR's scope and should be handled in separate issues or author/maintainer-requested PRs rather than blocking this review.
- The v15 == v14 table-parity invariant is pinned by no test, though this exact drift class broke the build — Out of scope — v15.rs already lacked a parity test when introduced in e38241d (#5043); this PR restores a missing table reference without introducing new behavior. Inspection of the fold in 5c8c4dd confirms that the deleted V3 and current V2 both select compute_aggregate_mode_and_check_limit = 2 and latest_versions_read = 1, with the remaining fields inherited identically. A normalized comparison also confirms that the current PV15 and PV14 initializers match except for protocol_version. The v14 tests cited by the finding pin specific feature activation boundaries, not blanket adjacent-version equality, and v15's existing documentation explicitly permits follow-ups to diverge its component selections. Adding a temporary full-parity guard is optional hardening of a pre-existing test gap, not necessary for this build repair.
- Follow-up: Consider creating a separate issue or author/maintainer-requested PR for this.
|
@coderabbitai review No review for |
Issue being fixed or feature implemented
v4.3-devdoesn't compile after thev4.2-devforward-merge (704307e):The cause: #5043 (v4.3) defined
PLATFORM_V15as a copy ofPLATFORM_V14pointing atDRIVE_ABCI_QUERY_VERSIONS_V3. Onv4.2-dev, #5057 folded V3 intoV2and deleteddrive_abci_query_versions/v3.rs. The two changes touch different files, so git merged them without a conflict. Every crate that depends onplatform-versionis broken onv4.3-devuntil this lands.What was done?
rs-platform-version/src/version/v15.rs: pointPLATFORM_V15atDRIVE_ABCI_QUERY_VERSIONS_V2. I checked thatPLATFORM_V15's component tables now matchPLATFORM_V14exactly, apart fromprotocol_version, as feat(platform): introduce protocol version 15 #5043 intends ("v15 == v14 until a follow-up bumps a table").rs-platform-wallet/src/wallet/identity/network/dpns.rs: tidy the import block from the same merge'sdpns.rsconflict. TheIdentityGettersV0import has been unused since fix(platform-wallet): select available signing keys across identity operations #4764 (it now triggers an unused-import warning), and the resolution left doubled blank lines thatrustfmtremoves.How Has This Been Tested?
Run at
v4.3-dev704307eafplus this commit:cargo check --tests -p platform-version -p platform-wallet -p platform-wallet-ffi -p dash-sdk -p rs-unified-sdk-jni -p drive -p drive-abci -p wasm-sdk: passes. Before the fix,platform-versionfailed withE0432.cargo clippy --tests -p platform-wallet -p platform-version: no warnings.cargo test --lib -p platform-version -p platform-wallet: 23 + 1185 passed.rustfmt --checkon both files: clean.This PR doesn't fix the two
drive structure::testsfailures onv4.3-dev(snapshot still at protocol 14). #5154 fixes those separately.Breaking Changes
None. PV15 is unchanged from what #5043 defined (identical to PV14).
Checklist:
structure.rs, regeneratedgrovedb-structure.json, and checked the structure viewer link posted on this pull requestFor repository code-owners and collaborators only
🤖 Generated with Claude Code