Skip to content

Commit 704fff5

Browse files
mergify[bot]JayT106julienrbrt
authored
fix: exporting the blockParams regression (backport cosmos#13029) (cosmos#13037)
* fix: exporting the blockParams regression (cosmos#13029) ## Description Closes: cosmos#13024 --- ### 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... - [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [x] added `!` to the type prefix if API or client breaking change - [x] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting)) - [x] provided a link to the relevant issue or specification - [x] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/building-modules) - [x] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing) - [x] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [x] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### 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... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable) (cherry picked from commit e1999e4) # Conflicts: # CHANGELOG.md # server/export_test.go * fix conflicts Co-authored-by: JayT106 <JayT106@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr>
1 parent cb7bdca commit 704fff5

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
3737

3838
## [Unreleased]
3939

40+
### Bug Fixes
41+
42+
* (export) [#13029](https://github.com/cosmos/cosmos-sdk/pull/13029) Fix exporting the blockParams regression.
43+
4044
## [v0.46.1](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.46.1) - 2022-08-24
4145

4246
### Improvements

server/export.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ func ExportCmd(appExporter types.AppExporter, defaultNodeHome string) *cobra.Com
8282
doc.InitialHeight = exported.Height
8383
doc.ConsensusParams = &tmproto.ConsensusParams{
8484
Block: tmproto.BlockParams{
85-
MaxBytes: exported.ConsensusParams.Block.MaxBytes,
86-
MaxGas: exported.ConsensusParams.Block.MaxGas,
85+
MaxBytes: exported.ConsensusParams.Block.MaxBytes,
86+
MaxGas: exported.ConsensusParams.Block.MaxGas,
87+
TimeIotaMs: doc.ConsensusParams.Block.TimeIotaMs,
8788
},
8889
Evidence: tmproto.EvidenceParams{
8990
MaxAgeNumBlocks: exported.ConsensusParams.Evidence.MaxAgeNumBlocks,
@@ -104,6 +105,7 @@ func ExportCmd(appExporter types.AppExporter, defaultNodeHome string) *cobra.Com
104105
}
105106

106107
cmd.SetOut(cmd.OutOrStdout())
108+
cmd.SetErr(cmd.OutOrStderr())
107109
cmd.Println(string(sdk.MustSortJSON(encoded)))
108110
return nil
109111
},

server/export_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
func TestExportCmd_ConsensusParams(t *testing.T) {
3232
tempDir := t.TempDir()
3333

34-
_, ctx, _, cmd := setupApp(t, tempDir)
34+
_, ctx, genDoc, cmd := setupApp(t, tempDir)
3535

3636
output := &bytes.Buffer{}
3737
cmd.SetOut(output)
@@ -46,6 +46,7 @@ func TestExportCmd_ConsensusParams(t *testing.T) {
4646

4747
require.Equal(t, simapp.DefaultConsensusParams.Block.MaxBytes, exportedGenDoc.ConsensusParams.Block.MaxBytes)
4848
require.Equal(t, simapp.DefaultConsensusParams.Block.MaxGas, exportedGenDoc.ConsensusParams.Block.MaxGas)
49+
require.Equal(t, genDoc.ConsensusParams.Block.TimeIotaMs, exportedGenDoc.ConsensusParams.Block.TimeIotaMs)
4950

5051
require.Equal(t, simapp.DefaultConsensusParams.Evidence.MaxAgeDuration, exportedGenDoc.ConsensusParams.Evidence.MaxAgeDuration)
5152
require.Equal(t, simapp.DefaultConsensusParams.Evidence.MaxAgeNumBlocks, exportedGenDoc.ConsensusParams.Evidence.MaxAgeNumBlocks)

0 commit comments

Comments
 (0)