fix(identity): resolve KycTier merge markers + style: cargo fmt --all#553
Merged
Conversation
… --all
- contracts/identity/lib.rs: pick main side of unresolved
conflict markers (lines 227-244) around the KycTier enum,
preserving both 5-variant CamelCase and 5-variant
underscored naming forms (Tier3Enhanced AND Tier3_Enhanced)
because callers (complete_kyc_verification, tests, etc.)
already use both styles.
- 20 additional files reformatted by `cargo fmt --all`.
NOTE: `cargo fmt --all -- --check` STILL exits 1 on this
tree. Structural bug in workspace layout: contracts/insurance/src/
declares `mod premium_engine;` inside `mod propchain_insurance
{ ... }`, but premium_engine.rs lives at the flat src/ level,
not at src/propchain_insurance/premium_engine.rs. Same issue in
contracts/tax-compliance/src/ for tax_engine / jurisdiction_presets
/ tax_strategies. Companion PR (or follow-up) needed for the file
moves before cargo fmt --check can pass.
Merged
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
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.
What
contracts/identity/lib.rs(theKycTierenum, lines 227-244) by picking themainside, preserving both 5-variant CamelCase naming (Tier3Enhanced) AND 5-variant underscored naming (Tier3_Enhanced). Both forms are already in active use throughout the rest of the file (complete_kyc_verificationmatches both, tests reference both,initialize_kyc_tiersinitializes as CamelCase).cargo fmt --allto the workspace (21 files, ~742 +/- 708).Why
KycTiercarried conflict markers from PR #547 (7b283b86) that was squash-merged intomain, which had been blocking the newsmoke.ymlcargo fmt --checkstep from running on main.Heads-up: cargo fmt --check is still red on this tree
I did not auto-merge this PR. A separate structural issue in the workspace layout prevents
cargo fmt --all -- --checkfrom exiting 0 even with this PR applied:contracts/insurance/src/lib.rsdeclaresmod premium_engine;inside#[ink::contract] mod propchain_insurance { ... }, so the compiler looks forsrc/propchain_insurance/premium_engine.rs. The.rsfile is currently at flatsrc/premium_engine.rs.contracts/tax-compliance/src/lib.rs:mod tax_engine;,mod jurisdiction_presets;,mod tax_strategies;declared insidemod tax_compliance { ... }, files at flatsrc/. Compiler looks forsrc/tax_compliance/{tax_engine,jurisdiction_presets,tax_strategies}.rs.Required follow-up (separate PR):
git mvthe four flat.rsfiles into the expected subdirectories, plus a handful of caller-path updates (payments.rsusescrate::tax_engine, which becomescrate::tax_compliance::tax_engineafter the move;compliance.rsandoptimization.rslikewise).Scope
contracts/identity/lib.rscargo fmt --allauto-format onlyBranch:
fix/cargo-fmt-post-smokeBase:
mainDiff stat: 21 files, +742/-708