Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: correct spec docs of fswap module (backport #1419) #1429

Merged
merged 2 commits into from
Jun 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 24, 2024

Description

closes: #XXXX

Motivation and context

How has this been tested?

Screenshots (if appropriate):

Checklist:

  • I followed the contributing guidelines and code of conduct.
  • I have added a relevant changelog to CHANGELOG.md
  • I have added tests to cover my changes.
  • I have updated the documentation accordingly.
  • I have updated API documentation client/docs/swagger-ui/swagger.yaml

This is an automatic backport of pull request #1419 done by [Mergify](https://mergify.com).

* docs: correct spec docs of fswap module

Signed-off-by: 170210 <[email protected]>

* chore: correct comment of storeKey

Signed-off-by: 170210 <[email protected]>

* chore: update CHANGLOG.md

Signed-off-by: 170210 <[email protected]>

* fix: fix for comment

Signed-off-by: 170210 <[email protected]>

* chore: fix format

Signed-off-by: 170210 <[email protected]>

* fix: fix for comment

Signed-off-by: 170210 <[email protected]>

* fixup: fix for comment

Signed-off-by: 170210 <[email protected]>

* fixup: fix for comment

Signed-off-by: 170210 <[email protected]>

* fixup: fix for comment

Signed-off-by: 170210 <[email protected]>

* fixup: fix for comment

Signed-off-by: 170210 <[email protected]>

---------

Signed-off-by: 170210 <[email protected]>
(cherry picked from commit 7bd6c82)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Jun 24, 2024
@mergify mergify bot requested a review from tkxkd0159 as a code owner June 24, 2024 07:45
Copy link
Contributor Author

mergify bot commented Jun 24, 2024

Cherry-pick of 7bd6c82 has failed:

On branch mergify/bp/release/v0.49.x/pr-1419
Your branch is up to date with 'origin/release/v0.49.x'.

You are currently cherry-picking commit 7bd6c8244.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   x/fswap/keeper/keys.go
	new file:   x/fswap/spec/01_concepts.md
	new file:   x/fswap/spec/02_state.md
	new file:   x/fswap/spec/03_events.md
	deleted:    x/fswap/spec/README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link

codecov bot commented Jun 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.75%. Comparing base (cc37bdb) to head (a8e6a70).
Report is 2 commits behind head on release/v0.49.x.

Additional details and impacted files

Impacted file tree graph

@@                 Coverage Diff                 @@
##           release/v0.49.x    #1429      +/-   ##
===================================================
+ Coverage            68.08%   68.75%   +0.66%     
===================================================
  Files                  770      754      -16     
  Lines                77606    75837    -1769     
===================================================
- Hits                 52840    52139     -701     
+ Misses               22097    21042    -1055     
+ Partials              2669     2656      -13     
Files Coverage Δ
x/fswap/keeper/keys.go 81.25% <ø> (ø)

... and 84 files with indirect coverage changes

Signed-off-by: 170210 <[email protected]>
@0Tech 0Tech removed the conflicts label Jun 24, 2024
@zemyblue zemyblue merged commit 8c5ab7e into release/v0.49.x Jun 24, 2024
28 checks passed
@zemyblue zemyblue deleted the mergify/bp/release/v0.49.x/pr-1419 branch June 24, 2024 08:56
zemyblue pushed a commit to zemyblue/finschia-sdk that referenced this pull request Jun 24, 2024
…schia#1429)

* docs: correct spec docs of fswap module (Finschia#1419)

* docs: correct spec docs of fswap module

Signed-off-by: 170210 <[email protected]>

* chore: correct comment of storeKey

Signed-off-by: 170210 <[email protected]>

* chore: update CHANGLOG.md

Signed-off-by: 170210 <[email protected]>

* fix: fix for comment

Signed-off-by: 170210 <[email protected]>

* chore: fix format

Signed-off-by: 170210 <[email protected]>

* fix: fix for comment

Signed-off-by: 170210 <[email protected]>

* fixup: fix for comment

Signed-off-by: 170210 <[email protected]>

* fixup: fix for comment

Signed-off-by: 170210 <[email protected]>

* fixup: fix for comment

Signed-off-by: 170210 <[email protected]>

* fixup: fix for comment

Signed-off-by: 170210 <[email protected]>

---------

Signed-off-by: 170210 <[email protected]>
(cherry picked from commit 7bd6c82)

# Conflicts:
#	CHANGELOG.md

* fix: fix conflict

Signed-off-by: 170210 <[email protected]>

---------

Signed-off-by: 170210 <[email protected]>
Co-authored-by: Ki <[email protected]>
Co-authored-by: 170210 <[email protected]>
(cherry picked from commit 8c5ab7e)
zemyblue added a commit to zemyblue/finschia-sdk that referenced this pull request Jun 24, 2024
zemyblue added a commit that referenced this pull request Jun 24, 2024
* chore: update release changelog for v0.49.1

* docs: correct spec docs of fswap module (backport #1419) (#1429)

* docs: correct spec docs of fswap module (#1419)

* docs: correct spec docs of fswap module

Signed-off-by: 170210 <[email protected]>

* chore: correct comment of storeKey

Signed-off-by: 170210 <[email protected]>

* chore: update CHANGLOG.md

Signed-off-by: 170210 <[email protected]>

* fix: fix for comment

Signed-off-by: 170210 <[email protected]>

* chore: fix format

Signed-off-by: 170210 <[email protected]>

* fix: fix for comment

Signed-off-by: 170210 <[email protected]>

* fixup: fix for comment

Signed-off-by: 170210 <[email protected]>

* fixup: fix for comment

Signed-off-by: 170210 <[email protected]>

* fixup: fix for comment

Signed-off-by: 170210 <[email protected]>

* fixup: fix for comment

Signed-off-by: 170210 <[email protected]>

---------

Signed-off-by: 170210 <[email protected]>
(cherry picked from commit 7bd6c82)

# Conflicts:
#	CHANGELOG.md

* fix: fix conflict

Signed-off-by: 170210 <[email protected]>

---------

Signed-off-by: 170210 <[email protected]>
Co-authored-by: Ki <[email protected]>
Co-authored-by: 170210 <[email protected]>
(cherry picked from commit 8c5ab7e)

* chore: apply the changes of #1429

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants