From 1c86503064dd316923f2edea0271fe1bb3b48399 Mon Sep 17 00:00:00 2001 From: loloicci Date: Mon, 7 Aug 2023 16:12:27 +0900 Subject: [PATCH] fix: fill Updated in legacy query ContractHistory --- x/wasm/keeper/legacy_querier.go | 4 ---- x/wasm/keeper/legacy_querier_test.go | 14 +++++++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/x/wasm/keeper/legacy_querier.go b/x/wasm/keeper/legacy_querier.go index 058338ac82..db331aa4a5 100644 --- a/x/wasm/keeper/legacy_querier.go +++ b/x/wasm/keeper/legacy_querier.go @@ -144,10 +144,6 @@ func queryCodeList(ctx sdk.Context, keeper types.ViewKeeper) ([]types.CodeInfoRe //nolint:unparam func queryContractHistory(ctx sdk.Context, contractAddr sdk.AccAddress, keeper types.ViewKeeper) ([]types.ContractCodeHistoryEntry, error) { history := keeper.GetContractHistory(ctx, contractAddr) - // redact response - for i := range history { - history[i].Updated = nil - } return history, nil } diff --git a/x/wasm/keeper/legacy_querier_test.go b/x/wasm/keeper/legacy_querier_test.go index 7e856b02a2..92cb539fc2 100644 --- a/x/wasm/keeper/legacy_querier_test.go +++ b/x/wasm/keeper/legacy_querier_test.go @@ -233,12 +233,13 @@ func TestLegacyQueryContractHistory(t *testing.T) { srcHistory: []types.ContractCodeHistoryEntry{{ Operation: types.ContractCodeHistoryOperationTypeGenesis, CodeID: firstCodeID, - Updated: types.NewAbsoluteTxPosition(ctx), + Updated: &types.AbsoluteTxPosition{BlockHeight: 1, TxIndex: 2}, Msg: []byte(`"init message"`), }}, expContent: []types.ContractCodeHistoryEntry{{ Operation: types.ContractCodeHistoryOperationTypeGenesis, CodeID: firstCodeID, + Updated: &types.AbsoluteTxPosition{BlockHeight: 1, TxIndex: 2}, Msg: []byte(`"init message"`), }}, }, @@ -246,30 +247,33 @@ func TestLegacyQueryContractHistory(t *testing.T) { srcHistory: []types.ContractCodeHistoryEntry{{ Operation: types.ContractCodeHistoryOperationTypeInit, CodeID: firstCodeID, - Updated: types.NewAbsoluteTxPosition(ctx), + Updated: &types.AbsoluteTxPosition{BlockHeight: 1, TxIndex: 2}, Msg: []byte(`"init message"`), }, { Operation: types.ContractCodeHistoryOperationTypeMigrate, CodeID: 2, - Updated: types.NewAbsoluteTxPosition(ctx), + Updated: &types.AbsoluteTxPosition{BlockHeight: 3, TxIndex: 4}, Msg: []byte(`"migrate message 1"`), }, { Operation: types.ContractCodeHistoryOperationTypeMigrate, CodeID: 3, - Updated: types.NewAbsoluteTxPosition(ctx), + Updated: &types.AbsoluteTxPosition{BlockHeight: 5, TxIndex: 6}, Msg: []byte(`"migrate message 2"`), }}, expContent: []types.ContractCodeHistoryEntry{{ Operation: types.ContractCodeHistoryOperationTypeInit, CodeID: firstCodeID, + Updated: &types.AbsoluteTxPosition{BlockHeight: 1, TxIndex: 2}, Msg: []byte(`"init message"`), }, { Operation: types.ContractCodeHistoryOperationTypeMigrate, CodeID: 2, + Updated: &types.AbsoluteTxPosition{BlockHeight: 3, TxIndex: 4}, Msg: []byte(`"migrate message 1"`), }, { Operation: types.ContractCodeHistoryOperationTypeMigrate, CodeID: 3, + Updated: &types.AbsoluteTxPosition{BlockHeight: 5, TxIndex: 6}, Msg: []byte(`"migrate message 2"`), }}, }, @@ -278,7 +282,7 @@ func TestLegacyQueryContractHistory(t *testing.T) { srcHistory: []types.ContractCodeHistoryEntry{{ Operation: types.ContractCodeHistoryOperationTypeGenesis, CodeID: firstCodeID, - Updated: types.NewAbsoluteTxPosition(ctx), + Updated: &types.AbsoluteTxPosition{BlockHeight: 1, TxIndex: 2}, Msg: []byte(`"init message"`), }}, expContent: []types.ContractCodeHistoryEntry{},