Fix CI: resolve unmerged conflicts in factory/farming-pool crates - #107
Merged
Merged
Conversation
…an crates main was left in a broken state where multiple PRs' merge conflicts were never actually resolved: both sides of several conflicts were concatenated instead of reconciled. This produced duplicate Cargo.toml dependency keys, duplicate/spliced function bodies referencing undefined variables, duplicate error enum discriminants, a duplicate require_auth() causing Error(Auth, ExistingValue), orphan statement fragments with no receiver, and call sites left out of sync with signature changes (missing global_multiplier/min_stake_amount args). Also fixes a genuine gap uncovered while getting tests green: Factory::create_pool deployed and initialized pools without ever passing min_stake_amount through to the pool's initialize, even though farming-pool's initialize had gained that required parameter — causing a hard MismatchingParameterLen VM error on every real create_pool call. create_pool now takes min_stake_amount and forwards it. Regenerated the stale checked-in factory/tests/fixtures/farming_pool.wasm integration-test fixture to match the current farming-pool source, per the regeneration instructions already documented in factory_pool_integration.rs. cargo fmt --check, cargo clippy --workspace --all-targets -D warnings, and cargo test --workspace (173 tests) all pass locally, matching CI's exact steps.
✅ Deploy Preview for sdcontracts ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
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
1 participant
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
main's CI has been red because several previously-merged PRs left their merge conflicts unresolved — both sides of the conflict were concatenated into the source instead of reconciled. This surfaced as a long chain of compile errors and test failures across thefactoryandfarming-poolSoroban contract crates:Cargo.tomldependency keyspos,rate)FactoryError/PoolErrordiscriminantsrequire_auth()call causingError(Auth, ExistingValue)at runtimeglobal_multiplier/min_stake_amountargs)While getting the suite green, also found and fixed a genuine (non-merge-artifact) bug:
Factory::create_pooldeployed and initialized new pools without ever passingmin_stake_amountthrough to the pool'sinitialize, even thoughfarming-pool::initializehad gained that as a required parameter — every realcreate_poolcall was hitting a hardMismatchingParameterLenVM error.create_poolnow acceptsmin_stake_amountand forwards it.Also regenerated the stale checked-in
factory/tests/fixtures/farming_pool.wasmintegration-test fixture to match currentfarming-poolsource, per the regeneration steps already documented at the top offactory_pool_integration.rs.Test plan
cargo build --workspace --target wasm32v1-none --release— passescargo fmt --all -- --check— cleancargo clippy --workspace --all-targets -- -D warnings— zero warningscargo test --workspace— 173/173 passing (48 factory unit + 5 factory integration + 100 farming-pool + 20 vesting-wallet)These are the exact steps
.github/workflows/ci.ymlruns.