From 11c5fed0759dc3815c917c8b41e67e1c2d691d02 Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Tue, 27 Oct 2020 12:14:34 -0700 Subject: [PATCH] Address #315 --- relayer/naive-strategy.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/relayer/naive-strategy.go b/relayer/naive-strategy.go index 65a44724d5b..a9f9076ad7f 100644 --- a/relayer/naive-strategy.go +++ b/relayer/naive-strategy.go @@ -4,7 +4,6 @@ import ( "fmt" "strconv" "strings" - "time" retry "github.com/avast/retry-go" sdk "github.com/cosmos/cosmos-sdk/types" @@ -481,10 +480,12 @@ func relayPacketFromQueryResponse(src, dst *PathEnd, res *ctypes.ResultTx, } // if we have decided not to relay this packet, don't add it + block := sh.GetHeader(dst.ChainID) + switch { - case rp.timeout != 0 && sh.GetHeight(dst.ChainID) >= rp.timeout: + case rp.timeout != 0 && block.GetHeight().GetVersionHeight() >= rp.timeout: timeoutPackets = append(timeoutPackets, rp.timeoutPacket()) - case rp.timeoutStamp != 0 && time.Now().UnixNano() >= int64(rp.timeoutStamp): + case rp.timeoutStamp != 0 && block.GetTime().UnixNano() >= int64(rp.timeoutStamp): timeoutPackets = append(timeoutPackets, rp.timeoutPacket()) case !rp.pass: rcvPackets = append(rcvPackets, rp)