Skip to content

Commit ace2e2a

Browse files
authored
imp(api)!: remove header from update client event
1 parent cab3fcd commit ace2e2a

File tree

3 files changed

+1
-26
lines changed

3 files changed

+1
-26
lines changed

modules/core/02-client/keeper/client_test.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package keeper_test
22

33
import (
4-
"encoding/hex"
54
"fmt"
65
"time"
76

@@ -520,22 +519,6 @@ func (suite *KeeperTestSuite) TestUpdateClientEventEmission() {
520519
// first event type is "message", followed by 3 "tx" events in ante
521520
updateEvent := result.Events[4]
522521
suite.Require().Equal(clienttypes.EventTypeUpdateClient, updateEvent.Type)
523-
524-
// use a boolean to ensure the update event contains the header
525-
contains := false
526-
for _, attr := range updateEvent.Attributes {
527-
if attr.Key == clienttypes.AttributeKeyHeader {
528-
contains = true
529-
530-
bz, err := hex.DecodeString(attr.Value)
531-
suite.Require().NoError(err)
532-
533-
emittedHeader, err := clienttypes.UnmarshalClientMessage(suite.chainA.App.AppCodec(), bz)
534-
suite.Require().NoError(err)
535-
suite.Require().Equal(header, emittedHeader)
536-
}
537-
}
538-
suite.Require().True(contains)
539522
}
540523

541524
func (suite *KeeperTestSuite) TestRecoverClient() {

modules/core/02-client/keeper/events.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package keeper
22

33
import (
4-
"encoding/hex"
54
"fmt"
65
"strconv"
76
"strings"
@@ -32,12 +31,7 @@ func emitCreateClientEvent(ctx sdk.Context, clientID string, clientState exporte
3231
}
3332

3433
// emitUpdateClientEvent emits an update client event
35-
func emitUpdateClientEvent(ctx sdk.Context, clientID string, clientType string, consensusHeights []exported.Height, cdc codec.BinaryCodec, clientMsg exported.ClientMessage) {
36-
// Marshal the ClientMessage as an Any and encode the resulting bytes to hex.
37-
// This prevents the event value from containing invalid UTF-8 characters
38-
// which may cause data to be lost when JSON encoding/decoding.
39-
clientMsgStr := hex.EncodeToString(types.MustMarshalClientMessage(cdc, clientMsg))
40-
34+
func emitUpdateClientEvent(ctx sdk.Context, clientID string, clientType string, consensusHeights []exported.Height, _ codec.BinaryCodec, _ exported.ClientMessage) {
4135
var consensusHeightAttr string
4236
if len(consensusHeights) != 0 {
4337
consensusHeightAttr = consensusHeights[0].String()
@@ -57,7 +51,6 @@ func emitUpdateClientEvent(ctx sdk.Context, clientID string, clientType string,
5751
// Please use AttributeKeyConsensusHeights instead.
5852
sdk.NewAttribute(types.AttributeKeyConsensusHeight, consensusHeightAttr),
5953
sdk.NewAttribute(types.AttributeKeyConsensusHeights, strings.Join(consensusHeightsAttr, ",")),
60-
sdk.NewAttribute(types.AttributeKeyHeader, clientMsgStr),
6154
),
6255
sdk.NewEvent(
6356
sdk.EventTypeMessage,

modules/core/02-client/types/events.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ const (
1313
AttributeKeyClientType = "client_type"
1414
AttributeKeyConsensusHeight = "consensus_height"
1515
AttributeKeyConsensusHeights = "consensus_heights"
16-
AttributeKeyHeader = "header"
1716
AttributeKeyUpgradeStore = "upgrade_store"
1817
AttributeKeyUpgradePlanHeight = "upgrade_plan_height"
1918
AttributeKeyUpgradePlanTitle = "title"

0 commit comments

Comments
 (0)