Merge PR #5774: Debug timestamp issues

cosmos · Mar 10, 2020 · 01ccc21 · 01ccc21
1 parent 85a86eb
commit 01ccc21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/x/ibc/02-client/keeper/keeper.go b/x/ibc/02-client/keeper/keeper.go
@@ -135,9 +135,8 @@ func (k Keeper) GetSelfConsensusState(ctx sdk.Context, height uint64) (exported.
 	valSet := stakingtypes.Validators(histInfo.Valset)
 
 	consensusState := ibctmtypes.ConsensusState{
-		Height: height,
-		// FIXME: Currently commented out due to time normalisation issues.
-		//Timestamp:    histInfo.Header.Time,
+		Height:       height,
+		Timestamp:    histInfo.Header.Time,
 		Root:         commitmenttypes.NewMerkleRoot(histInfo.Header.AppHash),
 		ValidatorSet: tmtypes.NewValidatorSet(valSet.ToTmValidators()),
 	}

diff --git a/x/ibc/03-connection/keeper/keeper_test.go b/x/ibc/03-connection/keeper/keeper_test.go
@@ -256,9 +256,8 @@ func (chain *TestChain) updateClient(client *TestChain) {
 	client.App.StakingKeeper.SetHistoricalInfo(ctxClient, client.Header.Height, histInfo)
 
 	consensusState := ibctmtypes.ConsensusState{
-		Height: uint64(client.Header.Height),
-		// FIXME: currently commented out due to time normalisation issues.
-		//Timestamp:    client.Header.Time,
+		Height:       uint64(client.Header.Height),
+		Timestamp:    client.Header.Time,
 		Root:         commitmenttypes.NewMerkleRoot(commitID.Hash),
 		ValidatorSet: client.Vals,
 	}