Onboarding middleware conflict resolve #25
Merged
Conversation
This file contains 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
…ecovery-module feat: remove recovery module
feat: CI/CD workflow and Cosmos-sdk simulation
dongsam
requested changes
Aug 2, 2023
|
It seems simulation for coinswap module has some issues. |
…leware-conflict-resolve # Conflicts: # app/app.go # x/recovery/keeper/ibc_callbacks.go # x/recovery/keeper/ibc_callbacks_integration_suite_test.go (cherry picked from commit 4d45df7)
…re-conflict-resolve # Conflicts: # app/app.go # app/app_test.go # app/test_helpers.go (cherry picked from commit ec76588)
(cherry picked from commit 5ac28de)
(cherry picked from commit ca2307f)
(cherry picked from commit ba5685f)
dongsam
force-pushed
the
onboarding-middleware-conflict-resolve
branch
from
ba5685f to
6626290
Compare
…ng-middleware-conflict-resolve * commit 'd780d52648475e8887cacce73acec93ae59fb34b': chore: add branches rule for workflow fix: simulation seed randomness was removed to make the ci/cd result deterministic fix: remove recovery from storeKeysPrefixes add placeholder for ICS4wrapper in transferKeeper init remove recovery imports in app.go remove recovery proto remove x/recovery fix: update simulation target modules, refactor duplicated struct fix: removing unused keeper from handler options fix: simulation workflow, update sims.yml, add GOPATH on makefile fix: simulation errors fix: seperate antehandler for simulation feat: add workflow to build, test, codecov for ci/cd # Conflicts: # app/app.go # app/test_helpers.go # proto/canto/onboarding/v1/query.proto # x/onboarding/client/cli/query.go # x/onboarding/genesis.go # x/onboarding/genesis_test.go # x/onboarding/ibc_middleware.go # x/onboarding/keeper/grpc_query.go # x/onboarding/keeper/grpc_query_test.go # x/onboarding/keeper/keeper.go # x/onboarding/keeper/keeper_test.go # x/onboarding/keeper/params.go # x/onboarding/keeper/utils_test.go # x/onboarding/module.go # x/onboarding/types/errors.go # x/onboarding/types/genesis.go # x/onboarding/types/genesis.pb.go # x/onboarding/types/genesis_test.go # x/onboarding/types/keys.go # x/onboarding/types/params_test.go # x/onboarding/types/query.pb.go # x/onboarding/types/query.pb.gw.go
dongsam
approved these changes
Aug 4, 2023
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.
Description
Conflict resolve
Canto-Network#110
Author Checklist
All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.
I have...
Reviewers Checklist
All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.
I have...