From 626287ae426be8b7020ea7ec6dee18a1793e1d8f Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Wed, 27 Jan 2021 18:16:24 +0530 Subject: [PATCH 01/88] linter issues fixed --- cmd/flags.go | 1 - cmd/paths.go | 2 +- relayer/chain.go | 4 +++- relayer/log-chain.go | 6 ------ relayer/naive-strategy.go | 20 ++++++++++---------- relayer/path.go | 2 +- relayer/query.go | 12 ++++++------ relayer/relayPackets.go | 8 ++++---- 8 files changed, 25 insertions(+), 30 deletions(-) diff --git a/cmd/flags.go b/cmd/flags.go index 40b81c13b..fcd3423ec 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -16,7 +16,6 @@ var ( flagSkip = "skip" flagStrategy = "strategy" flagTimeout = "timeout" - flagConfig = "config" flagJSON = "json" flagYAML = "yaml" flagFile = "file" diff --git a/cmd/paths.go b/cmd/paths.go index c2a142e25..89c86ff54 100644 --- a/cmd/paths.go +++ b/cmd/paths.go @@ -106,7 +106,7 @@ $ %s pth gen ibc-0 ibc-1 demo-path --unordered false --version ics20-2`, appName dstClients, err = c[dst].QueryClients(0, 1000) return err }) - if eg.Wait(); err != nil { + if err := eg.Wait(); err != nil { return err } diff --git a/relayer/chain.go b/relayer/chain.go index f3f14f51b..137570eb3 100644 --- a/relayer/chain.go +++ b/relayer/chain.go @@ -677,7 +677,9 @@ func (c *Chain) UpgradeChain(dst *Chain, plan *upgradetypes.Plan, deposit sdk.Co if err != nil { return err } - sh.Updates(c, dst) + if err := sh.Updates(c, dst); err != nil { + return err + } height := int64(sh.GetHeight(dst.ChainID)) clientStateRes, err := dst.QueryClientState(height) diff --git a/relayer/log-chain.go b/relayer/log-chain.go index 15085e8bf..035e40855 100644 --- a/relayer/log-chain.go +++ b/relayer/log-chain.go @@ -107,12 +107,6 @@ func getTxActions(act []string) string { return strings.TrimSuffix(out, ",") } -func logRetryUpdateHeaders(src, dst *Chain, n uint, err error) { - if src.debug && dst.debug { - src.Log(fmt.Sprintf("- [%s]&[%s] - try(%d/%d) update headers: %s", src.ChainID, dst.ChainID, n+1, rtyAttNum, err)) - } -} - func (c *Chain) logRetryQueryPacketAcknowledgements(height uint64, n uint, err error) { if c.debug { c.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet acknowledgements: %s", c.ChainID, height, n+1, rtyAttNum, err)) diff --git a/relayer/naive-strategy.go b/relayer/naive-strategy.go index 9a0d16b8e..8ed9d9856 100644 --- a/relayer/naive-strategy.go +++ b/relayer/naive-strategy.go @@ -27,7 +27,7 @@ var ( dataTag = "packet_data" ackTag = "packet_ack" toHeightTag = "packet_timeout_height" - toTsTag = "packet_timeout_timestamp" + toTSTag = "packet_timeout_timestamp" seqTag = "packet_sequence" ) @@ -117,13 +117,13 @@ func (nrs *NaiveStrategy) UnrelayedSequences(src, dst *Chain, sh *SyncHeaders) ( eg.Go(func() error { // Query all packets sent by src that have been received by dst - rs.Src, err = dst.QueryUnrecievedPackets(sh.GetHeight(dst.ChainID), srcPacketSeq) + rs.Src, err = dst.QueryUnreceivedPackets(sh.GetHeight(dst.ChainID), srcPacketSeq) return err }) eg.Go(func() error { // Query all packets sent by dst that have been received by src - rs.Dst, err = src.QueryUnrecievedPackets(sh.GetHeight(src.ChainID), dstPacketSeq) + rs.Dst, err = src.QueryUnreceivedPackets(sh.GetHeight(src.ChainID), dstPacketSeq) return err }) @@ -199,13 +199,13 @@ func (nrs *NaiveStrategy) UnrelayedAcknowledgements(src, dst *Chain, sh *SyncHea eg.Go(func() error { // Query all packets sent by src that have been received by dst - rs.Src, err = dst.QueryUnrecievedAcknowledgements(sh.GetHeight(dst.ChainID), srcPacketSeq) + rs.Src, err = dst.QueryUnreceivedAcknowledgements(sh.GetHeight(dst.ChainID), srcPacketSeq) return err }) eg.Go(func() error { // Query all packets sent by dst that have been received by src - rs.Dst, err = src.QueryUnrecievedAcknowledgements(sh.GetHeight(src.ChainID), dstPacketSeq) + rs.Dst, err = src.QueryUnreceivedAcknowledgements(sh.GetHeight(src.ChainID), dstPacketSeq) return err }) @@ -258,7 +258,7 @@ func relayPacketsFromEventListener(src, dst *PathEnd, events map[string][]string } // finally, get and parse the timeout - if sval, ok := events[fmt.Sprintf("%s.%s", spTag, toTsTag)]; ok { + if sval, ok := events[fmt.Sprintf("%s.%s", spTag, toTSTag)]; ok { timeout, err := strconv.ParseUint(sval[i], 10, 64) if err != nil { return nil, err @@ -308,7 +308,7 @@ func relayPacketsFromEventListener(src, dst *PathEnd, events map[string][]string } // finally, get and parse the timeout - if sval, ok := events[fmt.Sprintf("%s.%s", waTag, toTsTag)]; ok { + if sval, ok := events[fmt.Sprintf("%s.%s", waTag, toTSTag)]; ok { timeout, err := strconv.ParseUint(sval[i], 10, 64) if err != nil { return nil, err @@ -696,7 +696,7 @@ func relayPacketsFromResultTx(src, dst *PathEnd, res *ctypes.ResultTx, sh *SyncH timeout, _ := strconv.ParseUint(strings.Split(string(p.Value), "-")[1], 10, 64) rp.timeout = timeout } - if string(p.Key) == toTsTag { + if string(p.Key) == toTSTag { timeout, _ := strconv.ParseUint(string(p.Value), 10, 64) rp.timeoutStamp = timeout } @@ -716,7 +716,7 @@ func relayPacketsFromResultTx(src, dst *PathEnd, res *ctypes.ResultTx, sh *SyncH // If the packet has a timeout timestamp and it has been reached, return a timeout packet case rp.timeoutStamp != 0 && block.GetTime().UnixNano() >= int64(rp.timeoutStamp): timeoutPackets = append(timeoutPackets, rp.timeoutPacket()) - // If the packet matches the relay constraints relay it as a MsgRecievePacket + // If the packet matches the relay constraints relay it as a MsgReceivePacket case !rp.pass: rcvPackets = append(rcvPackets, rp) } @@ -773,7 +773,7 @@ func acknowledgementsFromResultTx(src, dst *PathEnd, res *ctypes.ResultTx, sh *S timeout, _ := strconv.ParseUint(strings.Split(string(p.Value), "-")[1], 10, 64) rp.timeout = timeout } - if string(p.Key) == toTsTag { + if string(p.Key) == toTSTag { timeout, _ := strconv.ParseUint(string(p.Value), 10, 64) rp.timeoutStamp = timeout } diff --git a/relayer/path.go b/relayer/path.go index 5d793fc1c..5de446808 100644 --- a/relayer/path.go +++ b/relayer/path.go @@ -194,7 +194,7 @@ func GenPath(srcChainID, dstChainID, srcPortID, dstPortID, order string, version } } -// PathStatus holds the status of the primatives in the path +// PathStatus holds the status of the primitives in the path type PathStatus struct { Chains bool `yaml:"chains" json:"chains"` Clients bool `yaml:"clients" json:"clients"` diff --git a/relayer/query.go b/relayer/query.go index 48c3b9f39..6d148b977 100644 --- a/relayer/query.go +++ b/relayer/query.go @@ -524,8 +524,8 @@ func (c *Chain) QueryPacketAcknowledgement(height int64, seq uint64) (ackRes *ch return chanutils.QueryPacketAcknowledgement(c.CLIContext(height), c.PathEnd.PortID, c.PathEnd.ChannelID, seq, true) } -// QueryPacketReciept returns the packet reciept proof at a given height -func (c *Chain) QueryPacketReciept(height int64, seq uint64) (recRes *chantypes.QueryPacketReceiptResponse, err error) { +// QueryPacketReceipt returns the packet receipt proof at a given height +func (c *Chain) QueryPacketReceipt(height int64, seq uint64) (recRes *chantypes.QueryPacketReceiptResponse, err error) { return chanutils.QueryPacketReceipt(c.CLIContext(height), c.PathEnd.PortID, c.PathEnd.ChannelID, seq, true) } @@ -558,8 +558,8 @@ func (c *Chain) QueryPacketAcknowledgements(offset, limit, height uint64) (comRe }) } -// QueryUnrecievedPackets returns a list of unrelayed packet commitments -func (c *Chain) QueryUnrecievedPackets(height uint64, seqs []uint64) ([]uint64, error) { +// QueryUnreceivedPackets returns a list of unrelayed packet commitments +func (c *Chain) QueryUnreceivedPackets(height uint64, seqs []uint64) ([]uint64, error) { qc := chantypes.NewQueryClient(c.CLIContext(int64(height))) res, err := qc.UnreceivedPackets(context.Background(), &chantypes.QueryUnreceivedPacketsRequest{ PortId: c.PathEnd.PortID, @@ -569,8 +569,8 @@ func (c *Chain) QueryUnrecievedPackets(height uint64, seqs []uint64) ([]uint64, return res.Sequences, err } -// QueryUnrecievedAcknowledgements returns a list of unrelayed packet acks -func (c *Chain) QueryUnrecievedAcknowledgements(height uint64, seqs []uint64) ([]uint64, error) { +// QueryUnreceivedAcknowledgements returns a list of unrelayed packet acks +func (c *Chain) QueryUnreceivedAcknowledgements(height uint64, seqs []uint64) ([]uint64, error) { qc := chantypes.NewQueryClient(c.CLIContext(int64(height))) res, err := qc.UnreceivedAcks(context.Background(), &chantypes.QueryUnreceivedAcksRequest{ PortId: c.PathEnd.PortID, diff --git a/relayer/relayPackets.go b/relayer/relayPackets.go index 350498940..f6f6c49e1 100644 --- a/relayer/relayPackets.go +++ b/relayer/relayPackets.go @@ -45,12 +45,12 @@ func (rp *relayMsgTimeout) FetchCommitResponse(src, dst *Chain, sh *SyncHeaders) if err = retry.Do(func() error { // NOTE: Timeouts currently only work with ORDERED channels for nwo queryHeight := sh.GetHeight(dst.ChainID) - 1 - dstRecvRes, err = dst.QueryPacketReciept(int64(queryHeight), rp.seq) + dstRecvRes, err = dst.QueryPacketReceipt(int64(queryHeight), rp.seq) switch { case err != nil: return err case dstRecvRes.Proof == nil: - return fmt.Errorf("timeout packet reciept proof seq(%d) is nil", rp.seq) + return fmt.Errorf("timeout packet receipt proof seq(%d) is nil", rp.seq) default: return nil } @@ -58,7 +58,7 @@ func (rp *relayMsgTimeout) FetchCommitResponse(src, dst *Chain, sh *SyncHeaders) // OnRetry we want to update the headers and then debug log sh.Updates(src, dst) if dst.debug { - dst.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet reciept: %s", dst.ChainID, sh.GetHeight(dst.ChainID)-1, n+1, rtyAttNum, err)) + dst.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet receipt: %s", dst.ChainID, sh.GetHeight(dst.ChainID)-1, n+1, rtyAttNum, err)) } })); err != nil { dst.Error(err) @@ -157,7 +157,7 @@ func (rp *relayMsgRecvPacket) FetchCommitResponse(src, dst *Chain, sh *SyncHeade func (rp *relayMsgRecvPacket) Msg(src, dst *Chain) (sdk.Msg, error) { if rp.dstComRes == nil { - return nil, fmt.Errorf("recieve packet [%s]seq{%d} has no associated proofs", src.ChainID, rp.seq) + return nil, fmt.Errorf("receive packet [%s]seq{%d} has no associated proofs", src.ChainID, rp.seq) } version := clienttypes.ParseChainID(src.PathEnd.ChainID) packet := chantypes.NewPacket( From dd91b78dcd8aec11aee2fd833748a68218c68f33 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Wed, 27 Jan 2021 18:49:42 +0530 Subject: [PATCH 02/88] lint issues fixed --- relayer/chain.go | 4 ++-- relayer/channel-tx.go | 2 +- relayer/client-tx.go | 2 +- relayer/contextual.go | 2 +- relayer/naive-strategy.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/relayer/chain.go b/relayer/chain.go index 137570eb3..c7f018fc2 100644 --- a/relayer/chain.go +++ b/relayer/chain.go @@ -82,7 +82,7 @@ func ValidatePaths(src, dst *Chain) error { return nil } -// ValidateClientPath takes two chains and validates their clients +// ValidateClientPaths takes two chains and validates their clients func ValidateClientPaths(src, dst *Chain) error { if err := src.PathEnd.Vclient(); err != nil { return err @@ -671,7 +671,7 @@ func (c *Chain) GenerateConnHandshakeProof(height uint64) (clientState ibcexport } -// UpgradesChain submits and upgrade proposal using a zero'd out client state with an updated unbonding period. +// UpgradeChain submits and upgrade proposal using a zero'd out client state with an updated unbonding period. func (c *Chain) UpgradeChain(dst *Chain, plan *upgradetypes.Plan, deposit sdk.Coin, unbondingPeriod time.Duration) error { sh, err := NewSyncHeaders(c, dst) if err != nil { diff --git a/relayer/channel-tx.go b/relayer/channel-tx.go index c6eb166f0..f3621998a 100644 --- a/relayer/channel-tx.go +++ b/relayer/channel-tx.go @@ -10,7 +10,7 @@ import ( "golang.org/x/sync/errgroup" ) -// CreateChannel runs the channel creation messages on timeout until they pass +// CreateOpenChannels runs the channel creation messages on timeout until they pass func (c *Chain) CreateOpenChannels(dst *Chain, maxRetries uint64, to time.Duration) (modified bool, err error) { // client and connection identifiers must be filled in if err := ValidateConnectionPaths(c, dst); err != nil { diff --git a/relayer/client-tx.go b/relayer/client-tx.go index d27cd1e15..1d2533de5 100644 --- a/relayer/client-tx.go +++ b/relayer/client-tx.go @@ -198,7 +198,7 @@ func (c *Chain) UpdateClients(dst *Chain) (err error) { return nil } -// UpgradesClients upgrades the client on src after dst chain has undergone an upgrade. +// UpgradeClients upgrades the client on src after dst chain has undergone an upgrade. func (c *Chain) UpgradeClients(dst *Chain, height int64) error { sh, err := NewSyncHeaders(c, dst) if err != nil { diff --git a/relayer/contextual.go b/relayer/contextual.go index 5467603b3..076cee442 100644 --- a/relayer/contextual.go +++ b/relayer/contextual.go @@ -12,7 +12,7 @@ type contextualStdCodec struct { var _ codec.Marshaler = &contextualStdCodec{} -// newContextualCodec creates a codec that sets and resets context +// newContextualStdCodec creates a codec that sets and resets context func newContextualStdCodec(cdc codec.Marshaler, useContext func() func()) *contextualStdCodec { return &contextualStdCodec{ Marshaler: cdc, diff --git a/relayer/naive-strategy.go b/relayer/naive-strategy.go index 8ed9d9856..d01849269 100644 --- a/relayer/naive-strategy.go +++ b/relayer/naive-strategy.go @@ -336,7 +336,7 @@ func (nrs *NaiveStrategy) sendTxFromEventPackets(src, dst *Chain, rlyPackets []r } // send the transaction, retrying if not successful - // TODO: have seperate retries for different pieces here + // TODO: have separate retries for different pieces here if err := retry.Do(func() error { if err := sh.Updates(src, dst); err != nil { if src.debug { From e7f0deafd4251d4f41ed2a7db168e4137e304637 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Thu, 28 Jan 2021 15:48:41 +0530 Subject: [PATCH 03/88] lint issues fixed --- cmd/config.go | 5 +- cmd/keys.go | 1 + cmd/light.go | 1 + cmd/root.go | 2 + cmd/start.go | 1 + cmd/tx.go | 5 +- go.mod | 28 +++- go.sum | 309 ++++++++++++++++++++++++++++++++++++++ relayer/channel-tx.go | 2 +- relayer/controller.go | 3 + relayer/encoding.go | 1 + relayer/log-chain.go | 2 +- relayer/naive-strategy.go | 12 +- relayer/path.go | 1 + relayer/pathEnd.go | 4 + relayer/query.go | 6 +- relayer/relayMsgs.go | 5 + relayer/relayPackets.go | 12 +- 18 files changed, 382 insertions(+), 18 deletions(-) diff --git a/cmd/config.go b/cmd/config.go index 69b3f3480..908cb714c 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -1,4 +1,5 @@ /* +Package cmd ... Copyright © 2020 Jack Zampolin jack.zampolin@gmail.com Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,7 +33,9 @@ import ( ) const ( - ORDERED = "ORDERED" + //ORDERED is ... + ORDERED = "ORDERED" + //UNORDERED is ... UNORDERED = "UNORDERED" defaultOrder = ORDERED defaultVersion = "ics20-1" diff --git a/cmd/keys.go b/cmd/keys.go index 41761d155..2103edba1 100644 --- a/cmd/keys.go +++ b/cmd/keys.go @@ -1,4 +1,5 @@ /* +Package cmd ... Copyright © 2020 Jack Zampolin jack.zampolin@gmail.com Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cmd/light.go b/cmd/light.go index 7a976b65b..b552ed18f 100644 --- a/cmd/light.go +++ b/cmd/light.go @@ -1,4 +1,5 @@ /* +Package cmd ... Copyright © 2020 Jack Zampolin Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cmd/root.go b/cmd/root.go index 15d97af3f..367438a27 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -1,4 +1,5 @@ /* +Package cmd ... Copyright © 2020 Jack Zampolin jack.zampolin@gmail.com Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,6 +26,7 @@ import ( "github.com/spf13/viper" ) +//const is ... const ( MB = 1048576 // in bytes ) diff --git a/cmd/start.go b/cmd/start.go index 0a0c1049d..0e4056a3c 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -1,4 +1,5 @@ /* +Package cmd ... Copyright © 2020 Jack Zampolin Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cmd/tx.go b/cmd/tx.go index da589f6e3..da8e7876d 100644 --- a/cmd/tx.go +++ b/cmd/tx.go @@ -1,4 +1,5 @@ /* +Package cmd ... Copyright © 2020 NAME HERE Licensed under the Apache License, Version 2.0 (the "License"); @@ -348,7 +349,9 @@ $ %s tx pth demo-path`, appName, appName, appName, appName, appName)), // create clients if they aren't already created modified, err := c[src].CreateClients(c[dst]) if modified { - overWriteConfig(cmd, config) + if err := overWriteConfig(cmd, config); err != nil { + return err + } } if err != nil { diff --git a/go.mod b/go.mod index 09902e358..7efb2ed36 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/cosmos/relayer go 1.15 require ( + github.com/Djarvur/go-err113 v0.1.0 // indirect github.com/Microsoft/go-winio v0.4.15 // indirect github.com/avast/retry-go v2.6.0+incompatible github.com/cenkalti/backoff/v3 v3.2.2 // indirect @@ -10,19 +11,40 @@ require ( github.com/cosmos/cosmos-sdk v0.40.1 github.com/cosmos/go-bip39 v1.0.0 github.com/gogo/protobuf v1.3.3 + github.com/golangci/golangci-lint v1.36.0 // indirect + github.com/golangci/misspell v0.3.5 // indirect + github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039 // indirect github.com/gorilla/mux v1.8.0 + github.com/gostaticanalysis/analysisutil v0.6.1 // indirect + github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect + github.com/matoous/godox v0.0.0-20200801072554-4fb83dc2941e // indirect + github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/moby/term v0.0.0-20201101162038-25d840ce174a // indirect github.com/ory/dockertest/v3 v3.6.2 + github.com/pelletier/go-toml v1.8.1 // indirect + github.com/quasilyte/go-ruleguard v0.3.0 // indirect + github.com/quasilyte/regex/syntax v0.0.0-20200805063351-8f842688393c // indirect github.com/sirupsen/logrus v1.7.0 // indirect + github.com/spf13/afero v1.5.1 // indirect github.com/spf13/cobra v1.1.1 github.com/spf13/viper v1.7.1 + github.com/stretchr/objx v0.3.0 // indirect github.com/stretchr/testify v1.7.0 + github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b // indirect github.com/tendermint/tendermint v0.34.3 github.com/tendermint/tm-db v0.6.3 - golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 // indirect - golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e - golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 // indirect + github.com/tetafro/godot v1.4.4 // indirect + github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 // indirect + github.com/tomarrell/wrapcheck v0.0.0-20201130113247-1683564d9756 // indirect + golang.org/x/mod v0.4.1 // indirect + golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 + golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect + golang.org/x/text v0.3.5 // indirect + gopkg.in/ini.v1 v1.62.0 // indirect gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + honnef.co/go/tools v0.1.1 // indirect + mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 // indirect ) replace github.com/keybase/go-keychain => github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 diff --git a/go.sum b/go.sum index 6cb82876d..915312b6e 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a h1:wFEQiK85fRsEVF0CRrPAos5LoAryUsIX1kPW/WrIqFw= +4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= @@ -27,7 +29,13 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3 github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= +github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5 h1:XTrzB+F8+SpRmbhAH8HLxhiiG6nYNwaBZjrFps1oWEk= +github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= +github.com/Djarvur/go-err113 v0.1.0 h1:uCRZZOdMQ0TZPHYTdYpoC0bLYJKPEHPUJ8MeAa51lNU= +github.com/Djarvur/go-err113 v0.1.0/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= +github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15 h1:qkLXKzb1QoVatRyd/YlXZ/Kg0m5K3SPuoD82jjSOaBc= github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= @@ -35,8 +43,11 @@ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEV github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/OpenPeeDeeP/depguard v1.0.1 h1:VlW4R6jmBIv3/u1JNlawEvJMM4J+dPORPaZasQee8Us= +github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/Workiva/go-datastructures v1.0.52 h1:PLSK6pwn8mYdaoaCZEMsXBpBotr4HHn9abU0yMQt0NI= @@ -48,6 +59,7 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= @@ -58,6 +70,10 @@ github.com/armon/go-metrics v0.3.6 h1:x/tmtOF9cDBoXH7XoAGOz2qqm1DknFD1590XmD/DUJ github.com/armon/go-metrics v0.3.6/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= +github.com/ashanbrown/forbidigo v1.0.0 h1:QdNXBduDUopc3GW+YVYZn8jzmIMklQiCfdN2N5+dQeE= +github.com/ashanbrown/forbidigo v1.0.0/go.mod h1:PH+zMRWE15yW69fYfe7Kn8nYR6yYyafc3ntEGh2BBAg= +github.com/ashanbrown/makezero v0.0.0-20201205152432-7b7cdbb3025a h1:/U9tbJzDRof4fOR51vwzWdIBsIH6R2yU0KG1MBRM2Js= +github.com/ashanbrown/makezero v0.0.0-20201205152432-7b7cdbb3025a/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= github.com/avast/retry-go v2.6.0+incompatible h1:FelcMrm7Bxacr1/RM8+/eqkDkmVN7tjlsy51dOzB3LI= github.com/avast/retry-go v2.6.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= @@ -70,6 +86,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/bombsimon/wsl/v3 v3.1.0 h1:E5SRssoBgtVFPcYWUOFJEcgaySgdtTNYzsSKDOY7ss8= +github.com/bombsimon/wsl/v3 v3.1.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d/go.mod h1:d3C0AkH6BRcvO8T0UEPu53cnw4IbV63x1bEjildYhO0= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.21.0-beta h1:At9hIZdJW0s9E/fAz28nrz6AmcNlSVucCH796ZteX1M= @@ -142,6 +160,8 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/daixiang0/gci v0.2.8 h1:1mrIGMBQsBu0P7j7m1M8Lb+ZeZxsZL+jyGX4YoMJJpg= +github.com/daixiang0/gci v0.2.8/go.mod h1:+4dZ7TISfSmqfAGv59ePaHfNzgGtIkHAhhdKggP1JAc= github.com/danieljoos/wincred v1.0.2 h1:zf4bhty2iLuwgjgpraD2E9UbvO+fe54XXGJbOwe23fU= github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -149,6 +169,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= +github.com/denis-tingajkin/go-header v0.4.2 h1:jEeSF4sdv8/3cT/WY8AgDHUoItNSoEZ7qg9dX7pc218= +github.com/denis-tingajkin/go-header v0.4.2/go.mod h1:eLRHAVXzE5atsKAnNRDB90WHCFFnBUn4RN0nRcs1LJA= github.com/dgraph-io/badger/v2 v2.2007.1/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= github.com/dgraph-io/badger/v2 v2.2007.2 h1:EjjK0KqwaFMlPin1ajhP943VPENHJdEz1KLIegjaI3k= github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= @@ -181,6 +203,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/esimonov/ifshort v1.0.0 h1:mcOSoOMVtL4tJyyDTakunR+KFQUywLLAVesiWleGPHU= +github.com/esimonov/ifshort v1.0.0/go.mod h1:yZqNJUrNn20K8Q9n2CrjTKYyVEmX209Hgu+M1LBpeZE= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= @@ -188,6 +212,9 @@ github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqL github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQDg5gKsWoLBOB0n+ZW8s599zru8FJ2/Y= github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= +github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= @@ -198,6 +225,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-critic/go-critic v0.5.3 h1:xQEweNxzBNpSqI3wotXZAixRarETng3PTG4pkcrLCOA= +github.com/go-critic/go-critic v0.5.3/go.mod h1:2Lrs1m4jtOnnG/EdezbSpAoL0F2pRW+9HWJUZ+QaktY= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -208,11 +237,35 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g= +github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= +github.com/go-toolsmith/astcopy v1.0.0 h1:OMgl1b1MEpjFQ1m5ztEO06rz5CUd3oBv9RF7+DyvdG8= +github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ= +github.com/go-toolsmith/astequal v1.0.0 h1:4zxD8j3JRFNyLN46lodQuqz3xdKSrur7U/sr0SDS/gQ= +github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= +github.com/go-toolsmith/astfmt v1.0.0 h1:A0vDDXt+vsvLEdbMFJAUBI/uTbRw1ffOPnxsILnFL6k= +github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= +github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod h1:dDStQCHtmZpYOmjRP/8gHHnCCch3Zz3oEgCdZVdtweU= +github.com/go-toolsmith/astp v1.0.0 h1:alXE75TXgcmupDsMK1fRAy0YUzLzqPVvBKoyWV+KPXg= +github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= +github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc= +github.com/go-toolsmith/strparse v1.0.0 h1:Vcw78DnpCAKlM20kSbAyO4mPfJn/lyYA4BJUDxe2Jb4= +github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= +github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= +github.com/go-toolsmith/typep v1.0.2 h1:8xdsa1+FSIH/RhEkgnD1j2CJOy5mNllW1Q9tRiYwvlk= +github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= +github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b h1:khEcpUM4yFcxg4/FHQWkvVRmgijNXRfzkIDHh23ggEo= +github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= +github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= +github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= +github.com/gofrs/flock v0.8.0 h1:MSdYClljsF3PbENUUEx85nkWfJSGfzYI9yEBZOJz6CY= +github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/gateway v1.1.0 h1:u0SuhL9+Il+UbjM9VIE3ntfRujKbvVpFvNB4HbjeVQ0= github.com/gogo/gateway v1.1.0/go.mod h1:S7rR8FRQyG3QFESeSv4l2WnsyzlCLG0CzBbUUo/mbic= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= @@ -244,6 +297,38 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8l github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.2 h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw= github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= +github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= +github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM= +github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= +github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6 h1:YYWNAGTKWhKpcLLt7aSj/odlKrSrelQwlovBpDuf19w= +github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6/go.mod h1:DbHgvLiFKX1Sh2T1w8Q/h4NAI8MHIpzCdnBUDTXU3I0= +github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 h1:9kfjN3AdxcbsZBf8NjltjWihK2QfBBBZuv91cMFfDHw= +github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2NxV+sN8upjjeVYr5W7tyxaT1JVtvhKhOn2ii8= +github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d h1:pXTK/gkVNs7Zyy7WKgLXmpQ5bHTrq5GDsp8R9Qs67g0= +github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d/go.mod h1:ozx7R9SIwqmqf5pRP90DhR2Oay2UIjGuKheCBCNwAYU= +github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a h1:iR3fYXUjHCR97qWS8ch1y9zPNsgXThGwjKPrYfqMPks= +github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= +github.com/golangci/golangci-lint v1.36.0 h1:x9ysLvMFJ2599BdiB3feiJmEJlZpOT9hg4rAQt0Dsiw= +github.com/golangci/golangci-lint v1.36.0/go.mod h1:SZhIZhUXXT/OcDb9rymj0J21mOVikjj51zunqnXM34Y= +github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc h1:gLLhTLMk2/SutryVJ6D4VZCU3CUqr8YloG7FPIBWFpI= +github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod h1:e5tpTHCfVze+7EpLEozzMB3eafxo2KT5veNg1k6byQU= +github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA= +github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= +github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA= +github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= +github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770 h1:EL/O5HGrF7Jaq0yNhBLucz9hTuRzj2LdwGBOaENgxIk= +github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= +github.com/golangci/misspell v0.3.5 h1:pLzmVdl3VxTOncgzHcvLOKirdvcx/TydsClUQXTehjo= +github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= +github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21 h1:leSNB7iYzLYSSx3J/s5sVf4Drkc68W2wm4Ixh/mr0us= +github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod h1:tf5+bzsHdTM0bsB7+8mt0GUMvjCgwLpTapNZHU8AajI= +github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0 h1:HVfrLniijszjS1aiNg8JbBMO2+E1WIQ+j/gL4SQqGPg= +github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= +github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039 h1:XQKc8IYQOeRwVs36tDrEmTgDgP88d5iEURwpmtiAlOM= +github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= +github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys= +github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -253,6 +338,10 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -264,6 +353,7 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gookit/color v1.3.6/go.mod h1:R3ogXq2B9rTbXoSHJ1HyUVAZ3poOJHpd9nQmyGZsfvQ= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= @@ -277,6 +367,16 @@ github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= +github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= +github.com/gostaticanalysis/analysisutil v0.1.0/go.mod h1:dMhHRU9KTiDcuLGdy87/2gTR8WruwYZrKdRq9m1O6uw= +github.com/gostaticanalysis/analysisutil v0.4.1 h1:/7clKqrVfiVwiBQLM0Uke4KvXnO6JcCTS7HwF2D6wG8= +github.com/gostaticanalysis/analysisutil v0.4.1/go.mod h1:18U/DLpRgIUd459wGxVHE0fRgmo1UgHDcbw7F5idXu0= +github.com/gostaticanalysis/analysisutil v0.6.1 h1:/1JkoHe4DVxur+0wPvi26FoQfe1E3ZGqIXS3aaSLiaw= +github.com/gostaticanalysis/analysisutil v0.6.1/go.mod h1:18U/DLpRgIUd459wGxVHE0fRgmo1UgHDcbw7F5idXu0= +github.com/gostaticanalysis/comment v1.3.0/go.mod h1:xMicKDx7XRXYdVwY9f9wQpDJVnqWxw9wCauCMKp+IBI= +github.com/gostaticanalysis/comment v1.4.1 h1:xHopR5L2lRz6OsjH4R2HG5wRhW9ySl3FsHIvi5pcXwc= +github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.2.1/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= @@ -333,9 +433,19 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jgautheron/goconst v0.0.0-20201117150253-ccae5bf973f3 h1:7nkB9fLPMwtn/R6qfPcHileL/x9ydlhw8XyDrLI1ZXg= +github.com/jgautheron/goconst v0.0.0-20201117150253-ccae5bf973f3/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= +github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a h1:GmsqmapfzSJkm28dhRoHz2tLRbJmqhU86IPgBtN3mmk= +github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a/go.mod h1:xRskid8CManxVta/ALEhJha/pweKBaVG6fWgc0yH25s= +github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3 h1:jNYPNLe3d8smommaoQlK7LOA5ESyUJJ+Wf79ZtA7Vp4= +github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= +github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af h1:KA9BjwUk7KlCh6S9EAGWBt1oExIUv9WyNCiRz5amv48= +github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U= github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= +github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= +github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= @@ -350,9 +460,12 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= github.com/kkdai/bstream v1.0.0/go.mod h1:FDnDOHt5Yx4p3FaHcioFT0QjDOtgUpvjeZqAs+NVZZA= +github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -362,25 +475,50 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kulti/thelper v0.2.1 h1:H4rSHiB3ALx//SXr+k9OPqKoOw2cAZpIQwVNH1RL5T4= +github.com/kulti/thelper v0.2.1/go.mod h1:vMu2Cizjy/grP+jmsvOFDx1kYP6+PD1lqg4Yu5exl2U= +github.com/kunwardeep/paralleltest v1.0.2 h1:/jJRv0TiqPoEy/Y8dQxCFJhD56uS/pnvtatgTZBHokU= +github.com/kunwardeep/paralleltest v1.0.2/go.mod h1:ZPqNm1fVHPllh5LPVujzbVz1JN2GhLxSfY+oqUsvG30= +github.com/kyoh86/exportloopref v0.1.8 h1:5Ry/at+eFdkX9Vsdw3qU4YkvGtzuVfzT4X7S77LoN/M= +github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2 h1:hRGSmZu7j271trc9sneMrpOW7GN5ngLm8YUZIPzf394= github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOSqcmlfs= github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY= github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/maratori/testpackage v1.0.1 h1:QtJ5ZjqapShm0w5DosRjg0PRlSdAdlx+W6cCKoALdbQ= +github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU= +github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb h1:RHba4YImhrUVQDHUCe2BNSOz4tVy2yGyXhvYDvxGgeE= +github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= +github.com/matoous/godox v0.0.0-20200801072554-4fb83dc2941e h1:2U5rOmpaB96l35w+NDjMtmmrp2e6a6AJKoc4B5+7UwA= +github.com/matoous/godox v0.0.0-20200801072554-4fb83dc2941e/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mbilski/exhaustivestruct v1.1.0 h1:4ykwscnAFeHJruT+EY3M3vdeP8uXMh0VV2E61iR7XD8= +github.com/mbilski/exhaustivestruct v1.1.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 h1:hLDRPB66XQT/8+wG9WsDpiCvZf1yKO7sz7scAjSlBa0= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= @@ -390,12 +528,15 @@ github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceT github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2/go.mod h1:TjQg8pa4iejrUrjiz0MCtMV38jdMNW4doKSiBrEvCQQ= github.com/moby/term v0.0.0-20201101162038-25d840ce174a h1:K6V0Kwa5efKo60sqbTk1FOBbltdyX9Klw2a9+lKhA18= github.com/moby/term v0.0.0-20201101162038-25d840ce174a/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= @@ -403,10 +544,15 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/moricho/tparallel v0.2.1 h1:95FytivzT6rYzdJLdtfn6m1bfFJylOJK41+lgv/EHf4= +github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8qUplsoSU4k= +github.com/mozilla/tls-observatory v0.0.0-20201209171846-0547674fceff/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nakabonne/nestif v0.3.0 h1:+yOViDGhg8ygGrmII72nV9B/zGxY188TYpfolntsaPw= +github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= @@ -414,8 +560,14 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/nbutton23/zxcvbn-go v0.0.0-20201221231540-e56b841a3c88 h1:o+O3Cd1HO9CTgxE3/C8p5I5Y4C0yYWbF8d4IkfOLtcQ= +github.com/nbutton23/zxcvbn-go v0.0.0-20201221231540-e56b841a3c88/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nishanths/exhaustive v0.1.0 h1:kVlMw8h2LHPMGUVqUj6230oQjjTMFjwcZrnkhXzFfl8= +github.com/nishanths/exhaustive v0.1.0/go.mod h1:S1j9110vxV1ECdCudXRkeMnFQ/DQk9ajLT0Uf2MYZQQ= +github.com/nishanths/predeclared v0.2.1 h1:1TXtjmy4f3YCFjTxRd8zcFHOmoUir+gp0ESzjFzG2sw= +github.com/nishanths/predeclared v0.2.1/go.mod h1:HvkGJcA3naj4lOwnFXFDkFxVtSqQMB9sbB1usJ+xjQE= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= @@ -427,11 +579,13 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuKHUCQ= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -466,9 +620,13 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.8.0 h1:Keo9qb7iRJs2voHvunFtuuYFsbWeOBh8/P9v/kVMFtw= github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs= +github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM= +github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= +github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d h1:CdDQnGF8Nq9ocOS/xlSptM1N3BbrA6/kmaep5ggwaIA= +github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -479,6 +637,8 @@ github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6J github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/polyfloyd/go-errorlint v0.0.0-20201127212506-19bd8db6546f h1:xAw10KgJqG5NJDfmRqJ05Z0IFblKumjtMeyiOLxj3+4= +github.com/polyfloyd/go-errorlint v0.0.0-20201127212506-19bd8db6546f/go.mod h1:wi9BfjxjF/bwiZ701TzmfKu6UKC357IOAtNr0Td0Lvw= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= @@ -515,6 +675,17 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= +github.com/quasilyte/go-ruleguard v0.2.1-0.20201030093329-408e96760278 h1:5gcJ7tORNCNB2QjOJF+MYjzS9aiWpxhP3gntf7RVrOQ= +github.com/quasilyte/go-ruleguard v0.2.1-0.20201030093329-408e96760278/go.mod h1:2RT/tf0Ce0UDj5y243iWKosQogJd8+1G3Rs2fxmlYnw= +github.com/quasilyte/go-ruleguard v0.3.0 h1:A3OfpsK2ynOTbz/KMi62qWzignjGCOZVChATSf4P+A0= +github.com/quasilyte/go-ruleguard v0.3.0/go.mod h1:p2miAhLp6fERzFNbcuQ4bevXs8rgK//uCHsUDkumITg= +github.com/quasilyte/go-ruleguard/dsl v0.0.0-20210106184943-e47d54850b18/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= +github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mod h1:7JTjp89EGyU1d6XfBiXihJNG37wB2VRkd125Q1u7Plc= +github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 h1:L8QM9bvf68pVdQ3bCFZMDmnt9yqcMBro1pC7F+IPYMY= +github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= +github.com/quasilyte/regex/syntax v0.0.0-20200805063351-8f842688393c h1:+gtJ/Pwj2dgUGlZgTrNFqajGYKZQc7Piqus/S6DK9CE= +github.com/quasilyte/regex/syntax v0.0.0-20200805063351-8f842688393c/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= @@ -527,6 +698,8 @@ github.com/regen-network/protobuf v1.3.2-alpha.regen.4/go.mod h1:/J8/bR1T/NXyIdQ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= @@ -534,11 +707,23 @@ github.com/rs/zerolog v1.20.0 h1:38k9hgtUBdxFwE34yS8rTHmHBa4eN16E4DJlv177LNs= github.com/rs/zerolog v1.20.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryancurrah/gomodguard v1.2.0 h1:YWfhGOrXwLGiqcC/u5EqG6YeS8nh+1fw0HEc85CVZro= +github.com/ryancurrah/gomodguard v1.2.0/go.mod h1:rNqbC4TOIdUDcVMSIpNNAzTbzXAZa6W5lnUepvuMMgQ= +github.com/ryanrolds/sqlclosecheck v0.3.0 h1:AZx+Bixh8zdUBxUA1NxbxVAS78vTPq4rCb8OUZI9xFw= +github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sasha-s/go-deadlock v0.2.0 h1:lMqc+fUb7RrFS3gQLtoQsJ7/6TV/pAIFvBsqX73DK8Y= github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/securego/gosec/v2 v2.6.1 h1:+KCw+uz16FYfFyJ/A5aU6uP7mnrL+j1TbDnk1yN+8R0= +github.com/securego/gosec/v2 v2.6.1/go.mod h1:I76p3NTHBXsGhybUW+cEQ692q2Vp+A0Z6ZLzDIZy+Ao= +github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU= +github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= +github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc= +github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= +github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= +github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= @@ -552,13 +737,19 @@ github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIK github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa/go.mod h1:oJyF+mSPHbB5mVY2iO9KV3pTt/QbIkGaO8gQ2WrDbP4= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sonatard/noctx v0.0.1 h1:VC1Qhl6Oxx9vvWo3UDgrGXYCeKCe3Wbw7qAWL6FrmTY= +github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/sourcegraph/go-diff v0.6.1 h1:hmA1LzxW0n1c3Q4YbrFgg4P99GSnebYa3x8gr0HZqLQ= +github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.3.4 h1:8q6vk3hthlpb2SouZcnBVKboxWQWMDNF38bwholZrJc= github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.5.1 h1:VHu76Lk0LSP1x254maIu2bplkWpfBWI+B+6fdoZprcg= +github.com/spf13/afero v1.5.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= @@ -581,6 +772,8 @@ github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/y github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/ssgreg/nlreturn/v2 v2.1.0 h1:6/s4Rc49L6Uo6RLjhWZGBpWWjfzk2yrf1nIW8m4wgVA= +github.com/ssgreg/nlreturn/v2 v2.1.0/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= @@ -588,6 +781,9 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As= +github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -600,6 +796,10 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca h1:Ld/zXl5t4+D69SiV4JoN7kkfvJdOWlPpfxrzxpLMoUk= github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= +github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ= +github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= +github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b h1:HxLVTlqcHhFAz3nWUcuvpH7WuOMv8LQoCWmruLfFH2U= +github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= github.com/tendermint/btcd v0.1.1 h1:0VcxPfflS2zZ3RiOAHkBiFUcPvbtRj5O7zHmcJWHV7s= @@ -617,15 +817,43 @@ github.com/tendermint/tm-db v0.6.2 h1:DOn8jwCdjJblrCFJbtonEIPD1IuJWpbRUUdR8GWE4R github.com/tendermint/tm-db v0.6.2/go.mod h1:GYtQ67SUvATOcoY8/+x6ylk8Qo02BQyLrAs+yAcLvGI= github.com/tendermint/tm-db v0.6.3 h1:ZkhQcKnB8/2jr5EaZwGndN4owkPsGezW2fSisS9zGbg= github.com/tendermint/tm-db v0.6.3/go.mod h1:lfA1dL9/Y/Y8wwyPp2NMLyn5P5Ptr/gvDFNWtrCWSf8= +github.com/tetafro/godot v1.4.3 h1:pl95xaTCPdCb+l1v+uWrdcY+aiagEg19dv5rfxru57M= +github.com/tetafro/godot v1.4.3/go.mod h1:ah7jjYmOMnIjS9ku2krapvGQrFNtTLo9Z/qB3dGU1eU= +github.com/tetafro/godot v1.4.4 h1:VAtLEoAMmopIzHVWVBrztjVWDeYm1OD/DKqhqXR4828= +github.com/tetafro/godot v1.4.4/go.mod h1:FVDd4JuKliW3UgjswZfJfHq4vAx0bD/Jd5brJjGeaz4= +github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q= +github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= +github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 h1:ig99OeTyDwQWhPe2iw9lwfQVF1KB3Q4fpP3X7/2VBG8= +github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tomarrell/wrapcheck v0.0.0-20200807122107-df9e8bcb914d h1:3EZyvNUMsGD1QA8cu0STNn1L7I77rvhf2IhOcHYQhSw= +github.com/tomarrell/wrapcheck v0.0.0-20200807122107-df9e8bcb914d/go.mod h1:yiFB6fFoV7saXirUGfuK+cPtUh4NX/Hf5y2WC2lehu0= +github.com/tomarrell/wrapcheck v0.0.0-20201130113247-1683564d9756 h1:zV5mu0ESwb+WnzqVaW2z1DdbAP0S46UtjY8DHQupQP4= +github.com/tomarrell/wrapcheck v0.0.0-20201130113247-1683564d9756/go.mod h1:yiFB6fFoV7saXirUGfuK+cPtUh4NX/Hf5y2WC2lehu0= +github.com/tommy-muehle/go-mnd/v2 v2.3.1 h1:a1S4+4HSXDJMgeODJH/t0EEKxcVla6Tasw+Zx9JJMog= +github.com/tommy-muehle/go-mnd/v2 v2.3.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA= +github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= +github.com/ultraware/whitespace v0.0.4 h1:If7Va4cM03mpgrNH9k49/VOicWpGoG70XPBFFODYDsg= +github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/uudashr/gocognit v1.0.1 h1:MoG2fZ0b/Eo7NXoIwCVFLG5JED3qgQz5/NEE+rOsjPs= +github.com/uudashr/gocognit v1.0.1/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.16.0/go.mod h1:YOKImeEosDdBPnxc0gy7INqi3m1zK6A+xl6TwOBhHCA= +github.com/valyala/quicktemplate v1.6.3/go.mod h1:fwPzK2fHuYEODzJ9pkw0ipCPNHZ2tD5KW4lOuSdPKzY= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8= github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -688,6 +916,12 @@ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKG golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0 h1:8pl+sMODzuvGJkmj2W4kZihvVb5mKm8pB/X44PIQHv8= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -710,15 +944,19 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 h1:42cLlJJdEh+ySyeUUbEQ5bsTiq8voBeTuweGVkY6Puw= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb h1:eBmm0M9fYhWpKZLjQUUKka/LtIxf46G4fxeEz5KJr9U= +golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -730,6 +968,9 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -741,6 +982,7 @@ golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -763,17 +1005,23 @@ golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck= golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -781,18 +1029,28 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190307163923-6a08e3108db3/go.mod h1:25r3+/G6/xytQM8iWZKq3Hn0kr0rgFKPUNVEL/dr3z4= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -803,14 +1061,47 @@ golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190916130336-e45ffcd953cc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200110213125-a7a6caa82ab2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200410194907-79a7a3126eef/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200624225443-88f3c62a19ff/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200625211823-6506e20df31f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200812195022-5ae4c3c160a0/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201011145850-ed2f50202694/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201028025901-8cd080b735b3/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201030010431-2feb2bb1ff51/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201114224030-61ea331ec02b/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201118003311-bd56c0adb394/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201230224404-63754364767c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210102185154-773b96fafca2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210104081019-d8d6ddbec6ee/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105210202-9ed45478a130 h1:8qSBr5nyKsEgkP918Pu5FFDZpTtLIjXSo6mrtdVOFfk= +golang.org/x/tools v0.0.0-20210105210202-9ed45478a130/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -894,6 +1185,8 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= +gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= @@ -911,6 +1204,8 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -919,6 +1214,20 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.6 h1:W18jzjh8mfPez+AwGLxmOImucz/IFjpNlrKVnaj2YVc= +honnef.co/go/tools v0.0.1-2020.1.6/go.mod h1:pyyisuGw24ruLjrr1ddx39WE0y9OooInRzEYLhQB2YY= +honnef.co/go/tools v0.1.1 h1:EVDuO03OCZwpV2t/tLLxPmPiomagMoBOgfPt0FM+4IY= +honnef.co/go/tools v0.1.1/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= +mvdan.cc/gofumpt v0.1.0 h1:hsVv+Y9UsZ/mFZTxJZuHVI6shSQCtzZ11h1JEFPAZLw= +mvdan.cc/gofumpt v0.1.0/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= +mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I= +mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= +mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo= +mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= +mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7 h1:kAREL6MPwpsk1/PQPFD3Eg7WAQR5mPTWZJaBiG5LDbY= +mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7/go.mod h1:HGC5lll35J70Y5v7vCGb9oLhHoScFwkHDJm/05RdSTc= +mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 h1:HT3e4Krq+IE44tiN36RvVEb6tvqeIdtsVSsxmNPqlFU= +mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7/go.mod h1:hBpJkZE8H/sb+VRFvw2+rBpHNsTBcvSpk61hr8mzXZE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/relayer/channel-tx.go b/relayer/channel-tx.go index f3621998a..1433dc75e 100644 --- a/relayer/channel-tx.go +++ b/relayer/channel-tx.go @@ -62,7 +62,7 @@ func (c *Chain) CreateOpenChannels(dst *Chain, maxRetries uint64, to time.Durati // In the case of failure, increment the failures counter and exit if this is the 3rd failure case !success: failures++ - c.Log(fmt.Sprintf("retrying transaction...")) + c.Log(fmt.Sprint("retrying transaction...")) time.Sleep(5 * time.Second) if failures > maxRetries { diff --git a/relayer/controller.go b/relayer/controller.go index 7095f6185..c7ac4a743 100644 --- a/relayer/controller.go +++ b/relayer/controller.go @@ -4,13 +4,16 @@ import ( "encoding/json" ) +//SendToController is ... var SendToController func(needReply bool, str string) (string, error) +//ControllerUpcall is ... func ControllerUpcall(action interface{}) (bool, error) { bz, err := json.Marshal(action) if err != nil { return false, err } + ret, err := SendToController(true, string(bz)) if err != nil { return false, err diff --git a/relayer/encoding.go b/relayer/encoding.go index 1b6c7bc14..61b17a0fc 100644 --- a/relayer/encoding.go +++ b/relayer/encoding.go @@ -262,6 +262,7 @@ func (pc *ProtoCodec) UnpackAny(any *types.Any, iface interface{}) error { return pc.interfaceRegistry.UnpackAny(any, iface) } +//InterfaceRegistry is ... func (pc *ProtoCodec) InterfaceRegistry() types.InterfaceRegistry { return pc.interfaceRegistry } diff --git a/relayer/log-chain.go b/relayer/log-chain.go index 035e40855..33d3f1b88 100644 --- a/relayer/log-chain.go +++ b/relayer/log-chain.go @@ -114,5 +114,5 @@ func (c *Chain) logRetryQueryPacketAcknowledgements(height uint64, n uint, err e } func (c *Chain) errQueryUnrelayedPacketAcks() error { - return fmt.Errorf("No error on QueryPacketUnrelayedAcknowledgements for %s, however response is nil", c.ChainID) + return fmt.Errorf("no error on QueryPacketUnrelayedAcknowledgements for %s, however response is nil", c.ChainID) } diff --git a/relayer/naive-strategy.go b/relayer/naive-strategy.go index d01849269..01a34e2ed 100644 --- a/relayer/naive-strategy.go +++ b/relayer/naive-strategy.go @@ -69,7 +69,7 @@ func (nrs *NaiveStrategy) UnrelayedSequences(src, dst *Chain, sh *SyncHeaders) ( case err != nil: return err case res == nil: - return fmt.Errorf("No error on QueryPacketCommitments for %s, however response is nil", src.ChainID) + return fmt.Errorf("no error on QueryPacketCommitments for %s, however response is nil", src.ChainID) default: return nil } @@ -94,7 +94,7 @@ func (nrs *NaiveStrategy) UnrelayedSequences(src, dst *Chain, sh *SyncHeaders) ( case err != nil: return err case res == nil: - return fmt.Errorf("No error on QueryPacketCommitments for %s, however response is nil", dst.ChainID) + return fmt.Errorf("no error on QueryPacketCommitments for %s, however response is nil", dst.ChainID) default: return nil } @@ -159,7 +159,9 @@ func (nrs *NaiveStrategy) UnrelayedAcknowledgements(src, dst *Chain, sh *SyncHea } }, rtyAtt, rtyDel, rtyErr, retry.OnRetry(func(n uint, err error) { src.logRetryQueryPacketAcknowledgements(sh.GetHeight(src.ChainID), n, err) - sh.Updates(src, dst) + if err := sh.Updates(src, dst); err != nil { + return + } })); err != nil { return err } @@ -183,7 +185,9 @@ func (nrs *NaiveStrategy) UnrelayedAcknowledgements(src, dst *Chain, sh *SyncHea } }, rtyAtt, rtyDel, rtyErr, retry.OnRetry(func(n uint, err error) { dst.logRetryQueryPacketAcknowledgements(sh.GetHeight(dst.ChainID), n, err) - sh.Updates(src, dst) + if err := sh.Updates(src, dst); err != nil { + return + } })); err != nil { return err } diff --git a/relayer/path.go b/relayer/path.go index 5de446808..459c1ae86 100644 --- a/relayer/path.go +++ b/relayer/path.go @@ -92,6 +92,7 @@ func (p Paths) PathsFromChains(src, dst string) (Paths, error) { return out, nil } +//PathAction is ... type PathAction struct { *Path Type string `json:"type"` diff --git a/relayer/pathEnd.go b/relayer/pathEnd.go index 2ea771e8f..53870349f 100644 --- a/relayer/pathEnd.go +++ b/relayer/pathEnd.go @@ -13,6 +13,7 @@ import ( var ( defaultChainPrefix = commitmenttypes.NewMerklePrefix([]byte("ibc")) defaultDelayPeriod = uint64(0) + //DefaultUpgradePath is .. DefaultUpgradePath = []string{"upgrade", "upgradedIBCState"} ) @@ -40,12 +41,14 @@ func OrderFromString(order string) chantypes.Order { } } +//GetOrder is ... func (pe *PathEnd) GetOrder() chantypes.Order { return OrderFromString(strings.ToUpper(pe.Order)) } var marshalledChains = map[PathEnd]*Chain{} +//MarshalChain is ... func MarshalChain(c *Chain) PathEnd { pe := *c.PathEnd if _, ok := marshalledChains[pe]; !ok { @@ -54,6 +57,7 @@ func MarshalChain(c *Chain) PathEnd { return pe } +//UnmarshalChain is ... func UnmarshalChain(pe PathEnd) *Chain { if c, ok := marshalledChains[pe]; ok { return c diff --git a/relayer/query.go b/relayer/query.go index 6d148b977..a8581fe00 100644 --- a/relayer/query.go +++ b/relayer/query.go @@ -402,10 +402,7 @@ func (c *Chain) QueryUnbondingPeriod() (time.Duration, error) { return res.Params.UnbondingTime, nil } -///////////////////////////////////// -// UPGRADES // -///////////////////////////////////// - +//QueryUpgradedClient is ... func (c *Chain) QueryUpgradedClient(height int64) (*codectypes.Any, []byte, clienttypes.Height, error) { req := upgradetypes.QueryCurrentPlanRequest{} @@ -429,6 +426,7 @@ func (c *Chain) QueryUpgradedClient(height int64) (*codectypes.Any, []byte, clie return client, proof, proofHeight, nil } +//QueryUpgradedConsState is ... func (c *Chain) QueryUpgradedConsState(height int64) (*codectypes.Any, []byte, clienttypes.Height, error) { req := upgradetypes.QueryUpgradedConsensusStateRequest{ LastHeight: height, diff --git a/relayer/relayMsgs.go b/relayer/relayMsgs.go index 0bb8deb11..2491bc492 100644 --- a/relayer/relayMsgs.go +++ b/relayer/relayMsgs.go @@ -9,6 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) +//DeliverMsgsAction is ... type DeliverMsgsAction struct { SrcMsgs []string `json:"src_msgs"` Src PathEnd `json:"src"` @@ -54,6 +55,7 @@ func (r *RelayMsgs) Success() bool { return r.Succeeded } +//IsMaxTx is ... func (r *RelayMsgs) IsMaxTx(msgLen, txSize uint64) bool { return (r.MaxMsgLength != 0 && msgLen > r.MaxMsgLength) || (r.MaxTxSize != 0 && txSize > r.MaxTxSize) @@ -65,6 +67,7 @@ func (r *RelayMsgs) Send(src, dst *Chain) { r.SendWithController(src, dst, true) } +//EncodeMsgs is ... func EncodeMsgs(c *Chain, msgs []sdk.Msg) []string { outMsgs := make([]string, 0, len(msgs)) for _, msg := range msgs { @@ -78,6 +81,7 @@ func EncodeMsgs(c *Chain, msgs []sdk.Msg) []string { return outMsgs } +//DecodeMsgs is ... func DecodeMsgs(c *Chain, msgs []string) []sdk.Msg { outMsgs := make([]sdk.Msg, 0, len(msgs)) for _, msg := range msgs { @@ -92,6 +96,7 @@ func DecodeMsgs(c *Chain, msgs []string) []sdk.Msg { return outMsgs } +//SendWithController is ... func (r *RelayMsgs) SendWithController(src, dst *Chain, useController bool) { if useController && SendToController != nil { action := &DeliverMsgsAction{ diff --git a/relayer/relayPackets.go b/relayer/relayPackets.go index f6f6c49e1..4c2761e72 100644 --- a/relayer/relayPackets.go +++ b/relayer/relayPackets.go @@ -56,7 +56,9 @@ func (rp *relayMsgTimeout) FetchCommitResponse(src, dst *Chain, sh *SyncHeaders) } }, rtyAtt, rtyDel, rtyErr, retry.OnRetry(func(n uint, err error) { // OnRetry we want to update the headers and then debug log - sh.Updates(src, dst) + if err := sh.Updates(src, dst); err != nil { + return + } if dst.debug { dst.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet receipt: %s", dst.ChainID, sh.GetHeight(dst.ChainID)-1, n+1, rtyAttNum, err)) } @@ -142,7 +144,9 @@ func (rp *relayMsgRecvPacket) FetchCommitResponse(src, dst *Chain, sh *SyncHeade } }, rtyAtt, rtyDel, rtyErr, retry.OnRetry(func(n uint, err error) { // OnRetry we want to update the headers and then debug log - sh.Updates(src, dst) + if err := sh.Updates(src, dst); err != nil { + return + } if dst.debug { dst.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet commitment: %s", dst.ChainID, sh.GetHeight(dst.ChainID)-1, n+1, rtyAttNum, err)) } @@ -241,7 +245,9 @@ func (rp *relayMsgPacketAck) FetchCommitResponse(src, dst *Chain, sh *SyncHeader } }, rtyAtt, rtyDel, rtyErr, retry.OnRetry(func(n uint, err error) { // OnRetry we want to update the headers and then debug log - sh.Updates(src, dst) + if err := sh.Updates(src, dst); err != nil { + return + } if dst.debug { dst.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet acknowledgement: %s", dst.ChainID, sh.GetHeight(dst.ChainID)-1, n+1, rtyAttNum, err)) } From 3c19cb61cccbe7e893464e04a5057b32df0b3346 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Thu, 28 Jan 2021 16:00:55 +0530 Subject: [PATCH 04/88] name chain conflict resolved --- relayer/query.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/relayer/query.go b/relayer/query.go index a8581fe00..901867426 100644 --- a/relayer/query.go +++ b/relayer/query.go @@ -454,8 +454,8 @@ func (c *Chain) QueryUpgradedConsState(height int64) (*codectypes.Any, []byte, c // QueryUpgradeProof performs an abci query with the given key and returns the proto encoded merkle proof // for the query and the height at which the proof will succeed on a tendermint verifier. -func (chain *Chain) QueryUpgradeProof(key []byte, height uint64) ([]byte, clienttypes.Height, error) { - res, err := chain.QueryABCI(abci.RequestQuery{ +func (c *Chain) QueryUpgradeProof(key []byte, height uint64) ([]byte, clienttypes.Height, error) { + res, err := c.QueryABCI(abci.RequestQuery{ Path: "store/upgrade/key", Height: int64(height - 1), Data: key, @@ -470,12 +470,12 @@ func (chain *Chain) QueryUpgradeProof(key []byte, height uint64) ([]byte, client return nil, clienttypes.Height{}, err } - proof, err := chain.Encoding.Marshaler.MarshalBinaryBare(&merkleProof) + proof, err := c.Encoding.Marshaler.MarshalBinaryBare(&merkleProof) if err != nil { return nil, clienttypes.Height{}, err } - revision := clienttypes.ParseChainID(chain.ChainID) + revision := clienttypes.ParseChainID(c.ChainID) // proof height + 1 is returned as the proof created corresponds to the height the proof // was created in the IAVL tree. Tendermint and subsequently the clients that rely on it From 84f3f6321dc0f718b71e99de4293445c32700c6e Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Thu, 28 Jan 2021 16:37:52 +0530 Subject: [PATCH 05/88] strat modified as start --- cmd/strategy.go | 16 ++++++++-------- relayer/naive-strategy.go | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/strategy.go b/cmd/strategy.go index 813c04c2d..f7d18b683 100644 --- a/cmd/strategy.go +++ b/cmd/strategy.go @@ -9,35 +9,35 @@ import ( // GetStrategyWithOptions sets strategy specific fields. func GetStrategyWithOptions(cmd *cobra.Command, strategy relayer.Strategy) (relayer.Strategy, error) { - switch strat := strategy.(type) { + switch start := strategy.(type) { case *relayer.NaiveStrategy: maxTxSize, err := cmd.Flags().GetString(flagMaxTxSize) if err != nil { - return strat, err + return start, err } txSize, err := strconv.ParseUint(maxTxSize, 10, 64) if err != nil { - return strat, err + return start, err } // set max size of messages in a relay transaction - strat.MaxTxSize = txSize * MB // in MB + start.MaxTxSize = txSize * MB // in MB maxMsgLength, err := cmd.Flags().GetString(flagMaxMsgLength) if err != nil { - return strat, err + return start, err } msgLen, err := strconv.ParseUint(maxMsgLength, 10, 64) if err != nil { - return strat, err + return start, err } // set max length messages in relay transaction - strat.MaxMsgLength = msgLen + start.MaxMsgLength = msgLen - return strat, nil + return start, nil default: return strategy, nil } diff --git a/relayer/naive-strategy.go b/relayer/naive-strategy.go index 01a34e2ed..40c37670b 100644 --- a/relayer/naive-strategy.go +++ b/relayer/naive-strategy.go @@ -624,7 +624,7 @@ func relayPacketFromSequence(src, dst *Chain, sh *SyncHeaders, seq uint64) (rela return pkt, nil } - return nil, fmt.Errorf("Should have errored before here") + return nil, fmt.Errorf("should have errored before here") } func acknowledgementFromSequence(src, dst *Chain, sh *SyncHeaders, seq uint64) (relayPacket, error) { From 6cee5c974de777bed0f21c313adb26e9ae77333e Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Thu, 28 Jan 2021 17:41:34 +0530 Subject: [PATCH 06/88] linter issues fixed --- relayer/chain.go | 13 +++++++++---- relayer/channel-tx.go | 9 ++++++--- relayer/client-tx.go | 18 ++++++++++++------ relayer/connection-tx.go | 6 ++++-- relayer/events.go | 3 ++- relayer/path.go | 12 ++++++++---- relayer/query.go | 33 +++++++++++++++++++-------------- 7 files changed, 60 insertions(+), 34 deletions(-) diff --git a/relayer/chain.go b/relayer/chain.go index c7f018fc2..a5a331607 100644 --- a/relayer/chain.go +++ b/relayer/chain.go @@ -634,7 +634,9 @@ func (c *Chain) StatusErr() error { // GenerateConnHandshakeProof generates all the proofs needed to prove the existence of the // connection state on this chain. A counterparty should use these generated proofs. -func (c *Chain) GenerateConnHandshakeProof(height uint64) (clientState ibcexported.ClientState, clientStateProof []byte, consensusProof []byte, connectionProof []byte, connectionProofHeight clienttypes.Height, err error) { +func (c *Chain) GenerateConnHandshakeProof(height uint64) (clientState ibcexported.ClientState, + clientStateProof []byte, consensusProof []byte, connectionProof []byte, + connectionProofHeight clienttypes.Height, err error) { var ( clientStateRes *clienttypes.QueryClientStateResponse consensusStateRes *clienttypes.QueryConsensusStateResponse @@ -667,12 +669,14 @@ func (c *Chain) GenerateConnHandshakeProof(height uint64) (clientState ibcexport return nil, nil, nil, nil, clienttypes.Height{}, err } - return clientState, clientStateRes.Proof, consensusStateRes.Proof, connectionStateRes.Proof, connectionStateRes.ProofHeight, nil + return clientState, clientStateRes.Proof, consensusStateRes.Proof, connectionStateRes.Proof, + connectionStateRes.ProofHeight, nil } // UpgradeChain submits and upgrade proposal using a zero'd out client state with an updated unbonding period. -func (c *Chain) UpgradeChain(dst *Chain, plan *upgradetypes.Plan, deposit sdk.Coin, unbondingPeriod time.Duration) error { +func (c *Chain) UpgradeChain(dst *Chain, plan *upgradetypes.Plan, deposit sdk.Coin, + unbondingPeriod time.Duration) error { sh, err := NewSyncHeaders(c, dst) if err != nil { return err @@ -702,7 +706,8 @@ func (c *Chain) UpgradeChain(dst *Chain, plan *upgradetypes.Plan, deposit sdk.Co plan.UpgradedClientState = upgradedAny // TODO: make cli args for title and description - upgradeProposal := upgradetypes.NewSoftwareUpgradeProposal("upgrade", "upgrade the chain's software and unbonding period", *plan) + upgradeProposal := upgradetypes.NewSoftwareUpgradeProposal("upgrade", + "upgrade the chain's software and unbonding period", *plan) msg, err := govtypes.NewMsgSubmitProposal(upgradeProposal, sdk.NewCoins(deposit), c.MustGetAddress()) if err != nil { return err diff --git a/relayer/channel-tx.go b/relayer/channel-tx.go index 1433dc75e..d132259bb 100644 --- a/relayer/channel-tx.go +++ b/relayer/channel-tx.go @@ -113,7 +113,8 @@ func ExecuteChannelStep(src, dst *Chain) (success, last, modified bool, err erro } // Query Channel data from src and dst - srcChan, dstChan, err = QueryChannelPair(src, dst, int64(sh.GetHeight(src.ChainID))-1, int64(sh.GetHeight(dst.ChainID))-1) + srcChan, dstChan, err = QueryChannelPair(src, dst, int64(sh.GetHeight(src.ChainID))-1, + int64(sh.GetHeight(dst.ChainID))-1) if err != nil { return false, false, false, err } @@ -230,7 +231,8 @@ func ExecuteChannelStep(src, dst *Chain) (success, last, modified bool, err erro // The identifiers set in the PathEnd's are used to determine which channel ends need to be // initialized. The PathEnds are updated upon a successful transaction. // NOTE: This function may need to be called twice if neither channel exists. -func InitializeChannel(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmclient.Header, sh *SyncHeaders) (success, modified bool, err error) { +func InitializeChannel(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmclient.Header, + sh *SyncHeaders) (success, modified bool, err error) { switch { // OpenInit on source @@ -393,7 +395,8 @@ func (c *Chain) CloseChannelStep(dst *Chain) (*RelayMsgs, error) { }) eg.Go(func() error { - srcChan, dstChan, err = QueryChannelPair(c, dst, int64(sh.GetHeight(c.ChainID)), int64(sh.GetHeight(dst.ChainID))) + srcChan, dstChan, err = QueryChannelPair(c, dst, int64(sh.GetHeight(c.ChainID)), + int64(sh.GetHeight(dst.ChainID))) return err }) diff --git a/relayer/client-tx.go b/relayer/client-tx.go index 1d2533de5..cd057ebc7 100644 --- a/relayer/client-tx.go +++ b/relayer/client-tx.go @@ -89,7 +89,8 @@ func (c *Chain) CreateClients(dst *Chain) (modified bool, err error) { // Ensure client exists in the event of user inputted identifiers _, err := c.QueryClientState(srcH.Header.Height) if err != nil { - return false, fmt.Errorf("please ensure provided on-chain client (%s) exists on the chain (%s): %v", c.PathEnd.ClientID, c.ChainID, err) + return false, fmt.Errorf("please ensure provided on-chain client (%s) exists on the chain (%s): %v", + c.PathEnd.ClientID, c.ChainID, err) } } @@ -150,7 +151,8 @@ func (c *Chain) CreateClients(dst *Chain) (modified bool, err error) { // Ensure client exists in the event of user inputted identifiers _, err := dst.QueryClientState(dstH.Header.Height) if err != nil { - return false, fmt.Errorf("please ensure provided on-chain client (%s) exists on the chain (%s): %v", dst.PathEnd.ClientID, dst.ChainID, err) + return false, fmt.Errorf("please ensure provided on-chain client (%s) exists on the chain (%s): %v", + dst.PathEnd.ClientID, dst.ChainID, err) } } @@ -228,7 +230,8 @@ func (c *Chain) UpgradeClients(dst *Chain, height int64) error { return err } - upgradeMsg := &clienttypes.MsgUpgradeClient{c.PathEnd.ClientID, clientState, consensusState, proofUpgradeClient, proofUpgradeConsensusState, c.MustGetAddress().String()} + upgradeMsg := &clienttypes.MsgUpgradeClient{c.PathEnd.ClientID, clientState, + consensusState, proofUpgradeClient, proofUpgradeConsensusState, c.MustGetAddress().String()} msgs := []sdk.Msg{ c.UpdateClient(dstUpdateHeader), @@ -276,10 +279,12 @@ func FindMatchingClient(source, counterparty *Chain, clientState *ibctmtypes.Cli if IsMatchingClient(*clientState, *existingClientState) { // query the latest consensus state of the potential matching client - consensusStateResp, err := clientutils.QueryConsensusStateABCI(source.CLIContext(0), identifiedClientState.ClientId, existingClientState.GetLatestHeight()) + consensusStateResp, err := clientutils.QueryConsensusStateABCI(source.CLIContext(0), + identifiedClientState.ClientId, existingClientState.GetLatestHeight()) if err != nil { if source.debug { - source.Log(fmt.Sprintf("Error: failed to query latest consensus state for existing client on chain %s: %v", source.PathEnd.ChainID, err)) + source.Log(fmt.Sprintf("Error: failed to query latest consensus state for existing client on chain %s: %v", + source.PathEnd.ChainID, err)) } continue } @@ -287,7 +292,8 @@ func FindMatchingClient(source, counterparty *Chain, clientState *ibctmtypes.Cli header, err := counterparty.QueryHeaderAtHeight(int64(existingClientState.GetLatestHeight().GetRevisionHeight())) if err != nil { if source.debug { - source.Log(fmt.Sprintf("Error: failed to query header for chain %s at height %d: %v", counterparty.PathEnd.ChainID, existingClientState.GetLatestHeight().GetRevisionHeight(), err)) + source.Log(fmt.Sprintf("Error: failed to query header for chain %s at height %d: %v", + counterparty.PathEnd.ChainID, existingClientState.GetLatestHeight().GetRevisionHeight(), err)) } continue } diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index cef0176da..c4663c855 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -114,7 +114,8 @@ func ExecuteConnectionStep(src, dst *Chain) (success, last, modified bool, err e } // Query Connection data from src and dst - srcConn, dstConn, err = QueryConnectionPair(src, dst, int64(sh.GetHeight(src.ChainID))-1, int64(sh.GetHeight(dst.ChainID))-1) + srcConn, dstConn, err = QueryConnectionPair(src, dst, int64(sh.GetHeight(src.ChainID))-1, + int64(sh.GetHeight(dst.ChainID))-1) if err != nil { return false, false, false, err } @@ -227,7 +228,8 @@ func ExecuteConnectionStep(src, dst *Chain) (success, last, modified bool, err e // The identifiers set in the PathEnd's are used to determine which connection ends need to be // initialized. The PathEnds are updated upon a successful transaction. // NOTE: This function may need to be called twice if neither connection exists. -func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmclient.Header, sh *SyncHeaders) (success, modified bool, err error) { +func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmclient.Header, + sh *SyncHeaders) (success, modified bool, err error) { switch { // OpenInit on source diff --git a/relayer/events.go b/relayer/events.go index 539af1111..39053d0b4 100644 --- a/relayer/events.go +++ b/relayer/events.go @@ -28,7 +28,8 @@ func ParseClientIDFromEvents(events sdk.StringEvents) (string, error) { // MsgConnectionOpenTry and returns the connection identifier. func ParseConnectionIDFromEvents(events sdk.StringEvents) (string, error) { for _, ev := range events { - if ev.Type == connectiontypes.EventTypeConnectionOpenInit || ev.Type == connectiontypes.EventTypeConnectionOpenTry { + if ev.Type == connectiontypes.EventTypeConnectionOpenInit || + ev.Type == connectiontypes.EventTypeConnectionOpenTry { for _, attr := range ev.Attributes { if attr.Key == connectiontypes.AttributeKeyConnectionID { return attr.Value, nil diff --git a/relayer/path.go b/relayer/path.go index 459c1ae86..7d7377597 100644 --- a/relayer/path.go +++ b/relayer/path.go @@ -82,7 +82,8 @@ func (p *Path) MustYAML() string { func (p Paths) PathsFromChains(src, dst string) (Paths, error) { out := Paths{} for name, path := range p { - if (path.Dst.ChainID == src || path.Src.ChainID == src) && (path.Dst.ChainID == dst || path.Src.ChainID == dst) { + if (path.Dst.ChainID == src || path.Src.ChainID == src) && + (path.Dst.ChainID == dst || path.Src.ChainID == dst) { out[name] = path } } @@ -262,7 +263,8 @@ func (p *Path) QueryPathStatus(src, dst *Chain) *PathWithStatus { dstConn, err = dst.QueryConnection(dsth) return err }) - if err = eg.Wait(); err != nil || srcConn.Connection.State != conntypes.OPEN || dstConn.Connection.State != conntypes.OPEN { + if err = eg.Wait(); err != nil || srcConn.Connection.State != conntypes.OPEN || + dstConn.Connection.State != conntypes.OPEN { return out } out.Status.Connection = true @@ -275,7 +277,8 @@ func (p *Path) QueryPathStatus(src, dst *Chain) *PathWithStatus { dstChan, err = dst.QueryChannel(dsth) return err }) - if err = eg.Wait(); err != nil || srcChan.Channel.State != chantypes.OPEN || dstChan.Channel.State != chantypes.OPEN { + if err = eg.Wait(); err != nil || srcChan.Channel.State != chantypes.OPEN || + dstChan.Channel.State != chantypes.OPEN { return out } out.Status.Channel = true @@ -303,7 +306,8 @@ func (ps *PathWithStatus) PrintString(name string) string { Channel: %s`, name, pth.Strategy.Type, pth.Src.ChainID, pth.Src.ClientID, pth.Src.ConnectionID, pth.Src.ChannelID, pth.Src.PortID, pth.Dst.ChainID, pth.Dst.ClientID, pth.Dst.ConnectionID, pth.Dst.ChannelID, pth.Dst.PortID, - checkmark(ps.Status.Chains), checkmark(ps.Status.Clients), checkmark(ps.Status.Connection), checkmark(ps.Status.Channel)) + checkmark(ps.Status.Chains), checkmark(ps.Status.Clients), checkmark(ps.Status.Connection), + checkmark(ps.Status.Channel)) } func checkmark(status bool) string { diff --git a/relayer/query.go b/relayer/query.go index 901867426..9e7ddcb6b 100644 --- a/relayer/query.go +++ b/relayer/query.go @@ -311,21 +311,23 @@ func (c *Chain) QueryChannelClient(height int64) (*chantypes.QueryChannelClientS // QueryDenomTrace takes a denom from IBC and queries the information about it func (c *Chain) QueryDenomTrace(denom string) (*transfertypes.QueryDenomTraceResponse, error) { - return transfertypes.NewQueryClient(c.CLIContext(0)).DenomTrace(context.Background(), &transfertypes.QueryDenomTraceRequest{ - Hash: denom, - }) + return transfertypes.NewQueryClient(c.CLIContext(0)).DenomTrace(context.Background(), + &transfertypes.QueryDenomTraceRequest{ + Hash: denom, + }) } // QueryDenomTraces returns all the denom traces from a given chain func (c *Chain) QueryDenomTraces(offset, limit uint64, height int64) (*transfertypes.QueryDenomTracesResponse, error) { - return transfertypes.NewQueryClient(c.CLIContext(height)).DenomTraces(context.Background(), &transfertypes.QueryDenomTracesRequest{ - Pagination: &querytypes.PageRequest{ - Key: []byte(""), - Offset: offset, - Limit: limit, - CountTotal: true, - }, - }) + return transfertypes.NewQueryClient(c.CLIContext(height)).DenomTraces(context.Background(), + &transfertypes.QueryDenomTracesRequest{ + Pagination: &querytypes.PageRequest{ + Key: []byte(""), + Offset: offset, + Limit: limit, + CountTotal: true, + }, + }) } ///////////////////////////////////// @@ -414,7 +416,8 @@ func (c *Chain) QueryUpgradedClient(height int64) (*codectypes.Any, []byte, clie } if res == nil || res.Plan == nil || res.Plan.UpgradedClientState == nil { - return nil, nil, clienttypes.Height{}, fmt.Errorf("upgraded client state plan does not exist at height %d", height) + return nil, nil, clienttypes.Height{}, + fmt.Errorf("upgraded client state plan does not exist at height %d", height) } client := res.Plan.UpgradedClientState @@ -440,7 +443,8 @@ func (c *Chain) QueryUpgradedConsState(height int64) (*codectypes.Any, []byte, c } if res == nil || res.UpgradedConsensusState == nil { - return nil, nil, clienttypes.Height{}, fmt.Errorf("upgraded consensus state plan does not exist at height %d", height) + return nil, nil, clienttypes.Height{}, + fmt.Errorf("upgraded consensus state plan does not exist at height %d", height) } consState := res.UpgradedConsensusState @@ -508,7 +512,8 @@ func (c *Chain) WaitForNBlocks(n int64) error { // QueryNextSeqRecv returns the next seqRecv for a configured channel func (c *Chain) QueryNextSeqRecv(height int64) (recvRes *chantypes.QueryNextSequenceReceiveResponse, err error) { - return chanutils.QueryNextSequenceReceive(c.CLIContext(height), c.PathEnd.PortID, c.PathEnd.ChannelID, true) + return chanutils.QueryNextSequenceReceive(c.CLIContext(height), + c.PathEnd.PortID, c.PathEnd.ChannelID, true) } // QueryPacketCommitment returns the packet commitment proof at a given height From cbfcc164b30db9a5894688a6f3f427ca374b6989 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Thu, 28 Jan 2021 17:56:26 +0530 Subject: [PATCH 07/88] character length issues resolved --- relayer/channel-tx.go | 3 ++- relayer/log-chain.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/relayer/channel-tx.go b/relayer/channel-tx.go index d132259bb..63a058fbe 100644 --- a/relayer/channel-tx.go +++ b/relayer/channel-tx.go @@ -147,7 +147,8 @@ func ExecuteChannelStep(src, dst *Chain) (success, last, modified bool, err erro // OpenAck on source if dst is at TRYOPEN and src is at INIT or TRYOPEN (crossing hellos) // obtain proof of counterparty in TRYOPEN state and submit to source chain to update state // from INIT/TRYOPEN to OPEN. - case (srcChan.Channel.State == chantypes.INIT || srcChan.Channel.State == chantypes.TRYOPEN) && dstChan.Channel.State == chantypes.TRYOPEN: + case (srcChan.Channel.State == chantypes.INIT || + srcChan.Channel.State == chantypes.TRYOPEN) && dstChan.Channel.State == chantypes.TRYOPEN: if src.debug { logChannelStates(src, dst, srcChan, dstChan) } diff --git a/relayer/log-chain.go b/relayer/log-chain.go index 33d3f1b88..eaedf6e62 100644 --- a/relayer/log-chain.go +++ b/relayer/log-chain.go @@ -109,7 +109,8 @@ func getTxActions(act []string) string { func (c *Chain) logRetryQueryPacketAcknowledgements(height uint64, n uint, err error) { if c.debug { - c.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet acknowledgements: %s", c.ChainID, height, n+1, rtyAttNum, err)) + c.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet acknowledgements: %s", + c.ChainID, height, n+1, rtyAttNum, err)) } } From 5fb75adbe3b4ec16096f7bc22c30aa8862cc3fd5 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Thu, 28 Jan 2021 18:12:00 +0530 Subject: [PATCH 08/88] character length issues resolved --- relayer/connection-tx.go | 3 ++- relayer/msgs.go | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index c4663c855..b6794ae9c 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -147,7 +147,8 @@ func ExecuteConnectionStep(src, dst *Chain) (success, last, modified bool, err e // OpenAck on source if dst is at TRYOPEN and src is on INIT or TRYOPEN (crossing hellos case) // obtain proof of counterparty in TRYOPEN state and submit to source chain to update state // from INIT/TRYOPEN to OPEN. - case (srcConn.Connection.State == conntypes.INIT || srcConn.Connection.State == conntypes.TRYOPEN) && dstConn.Connection.State == conntypes.TRYOPEN: + case (srcConn.Connection.State == conntypes.INIT || srcConn.Connection.State == conntypes.TRYOPEN) && + dstConn.Connection.State == conntypes.TRYOPEN: if src.debug { logConnectionStates(src, dst, srcConn, dstConn) } diff --git a/relayer/msgs.go b/relayer/msgs.go index 3ffb909be..1376c1d10 100644 --- a/relayer/msgs.go +++ b/relayer/msgs.go @@ -78,7 +78,8 @@ func (c *Chain) ConnTry( counterparty *Chain, height uint64, ) (sdk.Msg, error) { - clientState, clientStateProof, consensusStateProof, connStateProof, proofHeight, err := counterparty.GenerateConnHandshakeProof(height) + clientState, clientStateProof, consensusStateProof, connStateProof, + proofHeight, err := counterparty.GenerateConnHandshakeProof(height) if err != nil { return nil, err } @@ -111,7 +112,8 @@ func (c *Chain) ConnAck( counterparty *Chain, height uint64, ) (sdk.Msg, error) { - clientState, clientStateProof, consensusStateProof, connStateProof, proofHeight, err := counterparty.GenerateConnHandshakeProof(height) + clientState, clientStateProof, consensusStateProof, connStateProof, + proofHeight, err := counterparty.GenerateConnHandshakeProof(height) if err != nil { return nil, err } From 6dd65c6939bca25655f3788170f6df5e48a381fc Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Thu, 28 Jan 2021 18:35:34 +0530 Subject: [PATCH 09/88] character length issues resolved --- cmd/flags.go | 3 ++- cmd/paths.go | 3 ++- cmd/raw.go | 6 ++++-- relayer/naive-strategy.go | 9 ++++++--- relayer/packet-tx.go | 3 ++- relayer/query.go | 6 ++++-- relayer/relayPackets.go | 9 ++++++--- 7 files changed, 26 insertions(+), 13 deletions(-) diff --git a/cmd/flags.go b/cmd/flags.go index fcd3423ec..d72cd1af6 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -197,7 +197,8 @@ func versionFlag(cmd *cobra.Command) *cobra.Command { } func forceFlag(cmd *cobra.Command) *cobra.Command { - cmd.Flags().BoolP(flagForce, "f", false, "option to force non-standard behavior such as initialization of light client from configured chain or generation of new path") //nolint:lll + cmd.Flags().BoolP(flagForce, "f", false, + "option to force non-standard behavior such as initialization of light client from configured chain or generation of new path") //nolint:lll if err := viper.BindPFlag(flagForce, cmd.Flags().Lookup(flagForce)); err != nil { panic(err) } diff --git a/cmd/paths.go b/cmd/paths.go index 89c86ff54..b06cdc7e0 100644 --- a/cmd/paths.go +++ b/cmd/paths.go @@ -369,7 +369,8 @@ $ %s pth l`, appName, appName, appName)), return err } stat := pth.QueryPathStatus(chains[pth.Src.ChainID], chains[pth.Dst.ChainID]).Status - printPath(i, k, pth, checkmark(stat.Chains), checkmark(stat.Clients), checkmark(stat.Connection), checkmark(stat.Channel)) + printPath(i, k, pth, checkmark(stat.Chains), checkmark(stat.Clients), + checkmark(stat.Connection), checkmark(stat.Channel)) i++ } return nil diff --git a/cmd/raw.go b/cmd/raw.go index e87c54b76..75cfff6ce 100644 --- a/cmd/raw.go +++ b/cmd/raw.go @@ -360,7 +360,8 @@ func chanInit() *cobra.Command { Short: "chan-init", Args: cobra.ExactArgs(11), Example: strings.TrimSpace(fmt.Sprintf(` -$ %s tx raw chan-init ibc-0 ibc-1 ibczeroclient ibconeclient ibcconn1 ibcconn2 ibcchan1 ibcchan2 transfer transfer ordered`, appName)), +$ %s tx raw chan-init ibc-0 ibc-1 ibczeroclient ibconeclient ibcconn1 ibcconn2 ibcchan1 ibcchan2 transfer transfer ordered`, + appName)), RunE: func(cmd *cobra.Command, args []string) error { src, dst := args[0], args[1] chains, err := config.Chains.Gets(args[0], args[1]) @@ -654,7 +655,8 @@ func closeChannelStepCmd() *cobra.Command { Short: "create the next step in closing a channel between chains with the passed identifiers", Args: cobra.ExactArgs(10), Example: strings.TrimSpace(fmt.Sprintf(` -$ %s tx raw close-channel-step ibc-0 ibc-1 ibczeroclient ibconeclient ibcconn1 ibcconn2 ibcchan1 ibcchan2 transfer transfer`, appName)), +$ %s tx raw close-channel-step ibc-0 ibc-1 ibczeroclient ibconeclient ibcconn1 ibcconn2 ibcchan1 ibcchan2 transfer transfer`, + appName)), RunE: func(cmd *cobra.Command, args []string) error { src, dst := args[0], args[1] chains, err := config.Chains.Gets(src, dst) diff --git a/relayer/naive-strategy.go b/relayer/naive-strategy.go index 40c37670b..1d065573d 100644 --- a/relayer/naive-strategy.go +++ b/relayer/naive-strategy.go @@ -75,7 +75,8 @@ func (nrs *NaiveStrategy) UnrelayedSequences(src, dst *Chain, sh *SyncHeaders) ( } }, rtyAtt, rtyDel, rtyErr, retry.OnRetry(func(n uint, err error) { if src.debug { - src.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet commitments: %s", src.ChainID, sh.GetHeight(src.ChainID), n+1, rtyAttNum, err)) + src.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet commitments: %s", src.ChainID, + sh.GetHeight(src.ChainID), n+1, rtyAttNum, err)) } })); err != nil { return err @@ -100,7 +101,8 @@ func (nrs *NaiveStrategy) UnrelayedSequences(src, dst *Chain, sh *SyncHeaders) ( } }, rtyAtt, rtyDel, rtyErr, retry.OnRetry(func(n uint, err error) { if dst.debug { - dst.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet commitments: %s", dst.ChainID, sh.GetHeight(dst.ChainID), n+1, rtyAttNum, err)) + dst.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet commitments: %s", + dst.ChainID, sh.GetHeight(dst.ChainID), n+1, rtyAttNum, err)) } })); err != nil { return err @@ -370,7 +372,8 @@ func (nrs *NaiveStrategy) sendTxFromEventPackets(src, dst *Chain, rlyPackets []r msg, err := rp.Msg(src, dst) if err != nil { if src.debug { - src.Log(fmt.Sprintf("- [%s] failed to create relay packet message bound for %s of type %T, retrying: %s", src.ChainID, dst.ChainID, rp, err)) + src.Log(fmt.Sprintf("- [%s] failed to create relay packet message bound for %s of type %T, retrying: %s", + src.ChainID, dst.ChainID, rp, err)) } return err } diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index acd987917..e3e130f99 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -8,7 +8,8 @@ import ( ) // SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args -func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr fmt.Stringer, toHeightOffset uint64, toTimeOffset time.Duration) error { +func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr fmt.Stringer, + toHeightOffset uint64, toTimeOffset time.Duration) error { var ( timeoutHeight uint64 timeoutTimestamp uint64 diff --git a/relayer/query.go b/relayer/query.go index 9e7ddcb6b..cbcc5e1bc 100644 --- a/relayer/query.go +++ b/relayer/query.go @@ -523,7 +523,8 @@ func (c *Chain) QueryPacketCommitment( } // QueryPacketAcknowledgement returns the packet ack proof at a given height -func (c *Chain) QueryPacketAcknowledgement(height int64, seq uint64) (ackRes *chantypes.QueryPacketAcknowledgementResponse, err error) { +func (c *Chain) QueryPacketAcknowledgement(height int64, seq uint64) (ackRes *chantypes.QueryPacketAcknowledgementResponse, + err error) { return chanutils.QueryPacketAcknowledgement(c.CLIContext(height), c.PathEnd.PortID, c.PathEnd.ChannelID, seq, true) } @@ -548,7 +549,8 @@ func (c *Chain) QueryPacketCommitments( } // QueryPacketAcknowledgements returns an array of packet acks -func (c *Chain) QueryPacketAcknowledgements(offset, limit, height uint64) (comRes *chantypes.QueryPacketAcknowledgementsResponse, err error) { +func (c *Chain) QueryPacketAcknowledgements(offset, limit, height uint64) (comRes *chantypes.QueryPacketAcknowledgementsResponse, + err error) { qc := chantypes.NewQueryClient(c.CLIContext(int64(height))) return qc.PacketAcknowledgements(context.Background(), &chantypes.QueryPacketAcknowledgementsRequest{ PortId: c.PathEnd.PortID, diff --git a/relayer/relayPackets.go b/relayer/relayPackets.go index 4c2761e72..a1792572f 100644 --- a/relayer/relayPackets.go +++ b/relayer/relayPackets.go @@ -60,7 +60,8 @@ func (rp *relayMsgTimeout) FetchCommitResponse(src, dst *Chain, sh *SyncHeaders) return } if dst.debug { - dst.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet receipt: %s", dst.ChainID, sh.GetHeight(dst.ChainID)-1, n+1, rtyAttNum, err)) + dst.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet receipt: %s", dst.ChainID, + sh.GetHeight(dst.ChainID)-1, n+1, rtyAttNum, err)) } })); err != nil { dst.Error(err) @@ -148,7 +149,8 @@ func (rp *relayMsgRecvPacket) FetchCommitResponse(src, dst *Chain, sh *SyncHeade return } if dst.debug { - dst.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet commitment: %s", dst.ChainID, sh.GetHeight(dst.ChainID)-1, n+1, rtyAttNum, err)) + dst.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet commitment: %s", dst.ChainID, + sh.GetHeight(dst.ChainID)-1, n+1, rtyAttNum, err)) } })); err != nil { dst.Error(err) @@ -249,7 +251,8 @@ func (rp *relayMsgPacketAck) FetchCommitResponse(src, dst *Chain, sh *SyncHeader return } if dst.debug { - dst.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet acknowledgement: %s", dst.ChainID, sh.GetHeight(dst.ChainID)-1, n+1, rtyAttNum, err)) + dst.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet acknowledgement: %s", + dst.ChainID, sh.GetHeight(dst.ChainID)-1, n+1, rtyAttNum, err)) } })); err != nil { dst.Error(err) From 3e4d0e109a2e1739fae33a671c5d856e6aa79074 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Thu, 28 Jan 2021 18:38:19 +0530 Subject: [PATCH 10/88] conflict resolved --- relayer/packet-tx.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index e3e130f99..acd987917 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -8,8 +8,7 @@ import ( ) // SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args -func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr fmt.Stringer, - toHeightOffset uint64, toTimeOffset time.Duration) error { +func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr fmt.Stringer, toHeightOffset uint64, toTimeOffset time.Duration) error { var ( timeoutHeight uint64 timeoutTimestamp uint64 From 73d5647074aca53949c284fce04b97c5a295954b Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Thu, 28 Jan 2021 18:50:01 +0530 Subject: [PATCH 11/88] character length issues resolved --- relayer/naive-strategy.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/relayer/naive-strategy.go b/relayer/naive-strategy.go index 1d065573d..f9db78a33 100644 --- a/relayer/naive-strategy.go +++ b/relayer/naive-strategy.go @@ -353,7 +353,8 @@ func (nrs *NaiveStrategy) sendTxFromEventPackets(src, dst *Chain, rlyPackets []r updateHeader, err := sh.GetUpdateHeader(dst, src) if err != nil { if src.debug { - src.Log(fmt.Sprintf("- failed to enrich update headers for %s and %s, retrying: %s", src.ChainID, dst.ChainID, err)) + src.Log(fmt.Sprintf("- failed to enrich update headers for %s and %s, retrying: %s", + src.ChainID, dst.ChainID, err)) } return err } @@ -661,8 +662,10 @@ func acknowledgementFromSequence(src, dst *Chain, sh *SyncHeaders, seq uint64) ( return pkt, nil } -// relayPacketsFromResultTx looks through the events in a *ctypes.ResultTx and returns relayPackets with the appropriate data -func relayPacketsFromResultTx(src, dst *PathEnd, res *ctypes.ResultTx, sh *SyncHeaders) ([]relayPacket, []relayPacket, error) { +// relayPacketsFromResultTx looks through the events in a *ctypes.ResultTx +// and returns relayPackets with the appropriate data +func relayPacketsFromResultTx(src, dst *PathEnd, res *ctypes.ResultTx, + sh *SyncHeaders) ([]relayPacket, []relayPacket, error) { var ( rcvPackets []relayPacket timeoutPackets []relayPacket @@ -738,7 +741,8 @@ func relayPacketsFromResultTx(src, dst *PathEnd, res *ctypes.ResultTx, sh *SyncH return nil, nil, fmt.Errorf("no packet data found") } -// acknowledgementsFromResultTx looks through the events in a *ctypes.ResultTx and returns relayPackets with the appropriate data +// acknowledgementsFromResultTx looks through the events in a *ctypes.ResultTx and returns +//relayPackets with the appropriate data func acknowledgementsFromResultTx(src, dst *PathEnd, res *ctypes.ResultTx, sh *SyncHeaders) ([]*relayMsgPacketAck, error) { var ackPackets []*relayMsgPacketAck for _, e := range res.TxResult.Events { From 2f14106d340f7d59b7c4bed5e776dcb44677d9e6 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 10:30:21 +0530 Subject: [PATCH 12/88] character lengths resolved --- relayer/naive-strategy.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/relayer/naive-strategy.go b/relayer/naive-strategy.go index f9db78a33..940aadaa4 100644 --- a/relayer/naive-strategy.go +++ b/relayer/naive-strategy.go @@ -743,7 +743,8 @@ func relayPacketsFromResultTx(src, dst *PathEnd, res *ctypes.ResultTx, // acknowledgementsFromResultTx looks through the events in a *ctypes.ResultTx and returns //relayPackets with the appropriate data -func acknowledgementsFromResultTx(src, dst *PathEnd, res *ctypes.ResultTx, sh *SyncHeaders) ([]*relayMsgPacketAck, error) { +func acknowledgementsFromResultTx(src, dst *PathEnd, + res *ctypes.ResultTx, sh *SyncHeaders) ([]*relayMsgPacketAck, error) { var ackPackets []*relayMsgPacketAck for _, e := range res.TxResult.Events { if e.Type == waTag { @@ -808,9 +809,11 @@ func acknowledgementsFromResultTx(src, dst *PathEnd, res *ctypes.ResultTx, sh *S } func rcvPacketQuery(channelID string, seq int) []string { - return []string{fmt.Sprintf("%s.packet_src_channel='%s'", spTag, channelID), fmt.Sprintf("%s.packet_sequence='%d'", spTag, seq)} + return []string{fmt.Sprintf("%s.packet_src_channel='%s'", spTag, channelID), + fmt.Sprintf("%s.packet_sequence='%d'", spTag, seq)} } func ackPacketQuery(channelID string, seq int) []string { - return []string{fmt.Sprintf("%s.packet_src_channel='%s'", waTag, channelID), fmt.Sprintf("%s.packet_sequence='%d'", waTag, seq)} + return []string{fmt.Sprintf("%s.packet_src_channel='%s'", waTag, channelID), + fmt.Sprintf("%s.packet_sequence='%d'", waTag, seq)} } From 32665ead27e88886be341ac58d1f3e3ebd4582f4 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 10:42:03 +0530 Subject: [PATCH 13/88] character lengths resolved --- relayer/packet-tx.go | 3 ++- relayer/query.go | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index acd987917..fb37f4bc9 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -8,7 +8,8 @@ import ( ) // SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args -func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr fmt.Stringer, toHeightOffset uint64, toTimeOffset time.Duration) error { +func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr fmt.Stringer, toHeightOffset uint64, + toTimeOffset time.Duration) error { var ( timeoutHeight uint64 timeoutTimestamp uint64 diff --git a/relayer/query.go b/relayer/query.go index cbcc5e1bc..12bf8416b 100644 --- a/relayer/query.go +++ b/relayer/query.go @@ -523,8 +523,8 @@ func (c *Chain) QueryPacketCommitment( } // QueryPacketAcknowledgement returns the packet ack proof at a given height -func (c *Chain) QueryPacketAcknowledgement(height int64, seq uint64) (ackRes *chantypes.QueryPacketAcknowledgementResponse, - err error) { +func (c *Chain) QueryPacketAcknowledgement(height int64, + seq uint64) (ackRes *chantypes.QueryPacketAcknowledgementResponse, err error) { return chanutils.QueryPacketAcknowledgement(c.CLIContext(height), c.PathEnd.PortID, c.PathEnd.ChannelID, seq, true) } @@ -549,8 +549,8 @@ func (c *Chain) QueryPacketCommitments( } // QueryPacketAcknowledgements returns an array of packet acks -func (c *Chain) QueryPacketAcknowledgements(offset, limit, height uint64) (comRes *chantypes.QueryPacketAcknowledgementsResponse, - err error) { +func (c *Chain) QueryPacketAcknowledgements(offset, limit, + height uint64) (comRes *chantypes.QueryPacketAcknowledgementsResponse, err error) { qc := chantypes.NewQueryClient(c.CLIContext(int64(height))) return qc.PacketAcknowledgements(context.Background(), &chantypes.QueryPacketAcknowledgementsRequest{ PortId: c.PathEnd.PortID, From 0e87333d80974647484ae051dd3d48fb3e2a57c8 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 10:44:01 +0530 Subject: [PATCH 14/88] conflict resolved --- relayer/packet-tx.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index fb37f4bc9..acd987917 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -8,8 +8,7 @@ import ( ) // SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args -func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr fmt.Stringer, toHeightOffset uint64, - toTimeOffset time.Duration) error { +func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr fmt.Stringer, toHeightOffset uint64, toTimeOffset time.Duration) error { var ( timeoutHeight uint64 timeoutTimestamp uint64 From 6b940603eaf52044530aed4ac5cf9f43152c1cf7 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 10:53:51 +0530 Subject: [PATCH 15/88] character lengths resolved --- cmd/paths.go | 3 ++- cmd/raw.go | 4 ++-- relayer/packet-tx.go | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmd/paths.go b/cmd/paths.go index b06cdc7e0..bd7e73a0c 100644 --- a/cmd/paths.go +++ b/cmd/paths.go @@ -284,7 +284,8 @@ $ %s pth gen ibc-0 ibc-1 demo-path --unordered false --version ics20-2`, appName dstOrder := dstChan.Ordering == path.Dst.GetOrder() srcVersion := srcChan.Version == path.Src.Version dstVersion := dstChan.Version == path.Dst.Version - if !(dstCpForSrc && srcCpForDst && srcOpen && dstOpen && srcPort && dstPort && srcOrder && dstOrder && srcVersion && dstVersion) { + if !(dstCpForSrc && srcCpForDst && srcOpen && dstOpen && srcPort && dstPort && + srcOrder && dstOrder && srcVersion && dstVersion) { path.GenSrcChanID() path.GenDstChanID() } diff --git a/cmd/raw.go b/cmd/raw.go index 75cfff6ce..4012aaaad 100644 --- a/cmd/raw.go +++ b/cmd/raw.go @@ -360,8 +360,8 @@ func chanInit() *cobra.Command { Short: "chan-init", Args: cobra.ExactArgs(11), Example: strings.TrimSpace(fmt.Sprintf(` -$ %s tx raw chan-init ibc-0 ibc-1 ibczeroclient ibconeclient ibcconn1 ibcconn2 ibcchan1 ibcchan2 transfer transfer ordered`, - appName)), +$ %s tx raw chan-init ibc-0 ibc-1 ibczeroclient ibconeclient +ibcconn1 ibcconn2 ibcchan1 ibcchan2 transfer transfer ordered`, appName)), RunE: func(cmd *cobra.Command, args []string) error { src, dst := args[0], args[1] chains, err := config.Chains.Gets(args[0], args[1]) diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index acd987917..df40a7d54 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -8,7 +8,8 @@ import ( ) // SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args -func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr fmt.Stringer, toHeightOffset uint64, toTimeOffset time.Duration) error { +func (c *Chain) SendTransferMsg(dst *Chain, + amount sdk.Coin, dstAddr fmt.Stringer, toHeightOffset uint64, toTimeOffset time.Duration) error { var ( timeoutHeight uint64 timeoutTimestamp uint64 From 2fcf05a8e03f9462e27e9c07858b4621e6971e21 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 10:55:54 +0530 Subject: [PATCH 16/88] conflict resolved --- relayer/packet-tx.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index df40a7d54..70388479e 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -8,8 +8,8 @@ import ( ) // SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args -func (c *Chain) SendTransferMsg(dst *Chain, - amount sdk.Coin, dstAddr fmt.Stringer, toHeightOffset uint64, toTimeOffset time.Duration) error { +func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, + dstAddr fmt.Stringer, toHeightOffset uint64, toTimeOffset time.Duration) error { var ( timeoutHeight uint64 timeoutTimestamp uint64 From a30bfb0c6ef608b46bb76fee30e339e666fb298f Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 10:57:08 +0530 Subject: [PATCH 17/88] conflict resolved --- relayer/packet-tx.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index 70388479e..acd987917 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -8,8 +8,7 @@ import ( ) // SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args -func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, - dstAddr fmt.Stringer, toHeightOffset uint64, toTimeOffset time.Duration) error { +func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr fmt.Stringer, toHeightOffset uint64, toTimeOffset time.Duration) error { var ( timeoutHeight uint64 timeoutTimestamp uint64 From 51e0659490457f32006859f902ceb05eeaa4ea8c Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 11:04:11 +0530 Subject: [PATCH 18/88] character lengths resolved --- cmd/raw.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/raw.go b/cmd/raw.go index 4012aaaad..e0ae846aa 100644 --- a/cmd/raw.go +++ b/cmd/raw.go @@ -542,9 +542,10 @@ func createChannelStepCmd() *cobra.Command { Short: "create the next step in creating a channel between chains with the passed identifiers", Args: cobra.ExactArgs(11), Example: strings.TrimSpace(fmt.Sprintf(` -$ %s transact raw chan-step ibc-0 ibc-1 ibczeroclient ibconeclient ibcconn1 ibcconn2 ibcchan1 ibcchan2 transfer transfer ordered -$ %s tx raw channel-step ibc-0 ibc-1 ibczeroclient ibconeclient ibcconn1 ibcconn2 ibcchan1 ibcchan2 transfer transfer ordered -`, appName, appName)), +$ %s transact raw chan-step ibc-0 ibc-1 ibczeroclient ibconeclient ibcconn1 +ibcconn2 ibcchan1 ibcchan2 transfer transfer ordered +$ %s tx raw channel-step ibc-0 ibc-1 ibczeroclient ibconeclient ibcconn1 + ibcconn2 ibcchan1 ibcchan2 transfer transfer ordered`, appName, appName)), RunE: func(cmd *cobra.Command, args []string) error { src, dst := args[0], args[1] chains, err := config.Chains.Gets(src, dst) From 0bc9feeba01a008489c613f11e5f6236f1e5bdaa Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 11:23:14 +0530 Subject: [PATCH 19/88] character lengths resolved --- cmd/raw.go | 4 ++-- cmd/tx.go | 7 ++++--- relayer/packet-tx.go | 4 +++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cmd/raw.go b/cmd/raw.go index e0ae846aa..94f1a4e43 100644 --- a/cmd/raw.go +++ b/cmd/raw.go @@ -656,8 +656,8 @@ func closeChannelStepCmd() *cobra.Command { Short: "create the next step in closing a channel between chains with the passed identifiers", Args: cobra.ExactArgs(10), Example: strings.TrimSpace(fmt.Sprintf(` -$ %s tx raw close-channel-step ibc-0 ibc-1 ibczeroclient ibconeclient ibcconn1 ibcconn2 ibcchan1 ibcchan2 transfer transfer`, - appName)), +$ %s tx raw close-channel-step ibc-0 ibc-1 ibczeroclient ibconeclient ibcconn1 +ibcconn2 ibcchan1 ibcchan2 transfer transfer`, appName)), RunE: func(cmd *cobra.Command, args []string) error { src, dst := args[0], args[1] chains, err := config.Chains.Gets(src, dst) diff --git a/cmd/tx.go b/cmd/tx.go index da8e7876d..6b3ce15ad 100644 --- a/cmd/tx.go +++ b/cmd/tx.go @@ -500,9 +500,10 @@ $ %s tx acks demo-path -l 3 -s 6`, appName, appName)), func upgradeChainCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "upgrade-chain [path-name] [chain-id] [new-unbonding-period] [deposit] [path/to/upgradePlan.json]", - Short: "upgrade a chain by providing the chain-id of the chain being upgraded, the new unbonding period, the proposal deposit and the json file of the upgrade plan without the upgrade client state ", - Args: cobra.ExactArgs(5), + Use: "upgrade-chain [path-name] [chain-id] [new-unbonding-period] [deposit] [path/to/upgradePlan.json]", + Short: "upgrade a chain by providing the chain-id of the chain being upgraded, the new unbonding period," + + "the proposal deposit and the json file of the upgrade plan without the upgrade client state", + Args: cobra.ExactArgs(5), RunE: func(cmd *cobra.Command, args []string) error { c, src, dst, err := config.ChainsFromPath(args[0]) if err != nil { diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index acd987917..044330a1d 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -8,7 +8,9 @@ import ( ) // SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args -func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr fmt.Stringer, toHeightOffset uint64, toTimeOffset time.Duration) error { +func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, + dstAddr fmt.Stringer, toHeightOffset uint64, toTimeOffset time.Duration) error { + var ( timeoutHeight uint64 timeoutTimestamp uint64 From f44e8f1b9cdea9ddf7d36ecdb1adfb1eb8acdb08 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 11:24:42 +0530 Subject: [PATCH 20/88] conflict resolved --- relayer/packet-tx.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index 044330a1d..02eed91f3 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -8,8 +8,7 @@ import ( ) // SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args -func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, - dstAddr fmt.Stringer, toHeightOffset uint64, toTimeOffset time.Duration) error { +func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr fmt.Stringer, toHeightOffset uint64, toTimeOffset time.Duration) error { var ( timeoutHeight uint64 From 8ffe5c137c513d503c828b0fd43a9efa6b59e7f6 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 11:27:56 +0530 Subject: [PATCH 21/88] conflict resolved --- relayer/packet-tx.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index 02eed91f3..beef9c82d 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -8,7 +8,8 @@ import ( ) // SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args -func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr fmt.Stringer, toHeightOffset uint64, toTimeOffset time.Duration) error { +func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, + dstAddr string, toHeightOffset uint64, toTimeOffset time.Duration) error { var ( timeoutHeight uint64 From 85b5bfcccb45e46b16d63ac967c0138f56898ab7 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 11:29:00 +0530 Subject: [PATCH 22/88] conflict resolved --- relayer/packet-tx.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index beef9c82d..85c6671ae 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -8,8 +8,7 @@ import ( ) // SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args -func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, - dstAddr string, toHeightOffset uint64, toTimeOffset time.Duration) error { +func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr string, toHeightOffset uint64, toTimeOffset time.Duration) error { var ( timeoutHeight uint64 From ae8b619b4cfc1f2b560b103990b76cc8c98ed25c Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 11:43:33 +0530 Subject: [PATCH 23/88] conflict resolved --- relayer/packet-tx.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index 85c6671ae..7c09acdd0 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -9,7 +9,6 @@ import ( // SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr string, toHeightOffset uint64, toTimeOffset time.Duration) error { - var ( timeoutHeight uint64 timeoutTimestamp uint64 @@ -20,9 +19,6 @@ func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr string, toH return err } - // Properly render the address string - dstAddrString := dstAddr.String() - switch { case toHeightOffset > 0 && toTimeOffset > 0: timeoutHeight = uint64(h.Header.Height) + toHeightOffset @@ -41,7 +37,7 @@ func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr string, toH // MsgTransfer will call SendPacket on src chain txs := RelayMsgs{ Src: []sdk.Msg{c.MsgTransfer( - dst.PathEnd, amount, dstAddrString, timeoutHeight, timeoutTimestamp, + dst.PathEnd, amount, dstAddr, timeoutHeight, timeoutTimestamp, )}, Dst: []sdk.Msg{}, } From ede54d610c6322f86eaf5434c1b085301f2db02b Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 11:48:13 +0530 Subject: [PATCH 24/88] length character issuse resolved --- relayer/packet-tx.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index 7c09acdd0..7fbcc3525 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -8,7 +8,8 @@ import ( ) // SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args -func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr string, toHeightOffset uint64, toTimeOffset time.Duration) error { +func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr string, + toHeightOffset uint64, toTimeOffset time.Duration) error { var ( timeoutHeight uint64 timeoutTimestamp uint64 From 0f3c49c3b2bffea867ef96e73cd0129444fa0e98 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 11:54:07 +0530 Subject: [PATCH 25/88] conflict resolved --- relayer/packet-tx.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index 7fbcc3525..7c09acdd0 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -8,8 +8,7 @@ import ( ) // SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args -func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr string, - toHeightOffset uint64, toTimeOffset time.Duration) error { +func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr string, toHeightOffset uint64, toTimeOffset time.Duration) error { var ( timeoutHeight uint64 timeoutTimestamp uint64 From d2018c0125fe4bd557265aba075a7efbc69cd345 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 12:09:01 +0530 Subject: [PATCH 26/88] reundant return issue resolved --- relayer/contextual.go | 1 - relayer/relayPackets.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/relayer/contextual.go b/relayer/contextual.go index 076cee442..ef9cbb973 100644 --- a/relayer/contextual.go +++ b/relayer/contextual.go @@ -48,7 +48,6 @@ func (cdc *contextualStdCodec) MustUnmarshalJSON(bz []byte, ptr proto.Message) { if err := cdc.UnmarshalJSON(bz, ptr); err != nil { panic(err) } - return } func (cdc *contextualStdCodec) MarshalBinaryBare(ptr codec.ProtoMarshaler) ([]byte, error) { diff --git a/relayer/relayPackets.go b/relayer/relayPackets.go index a1792572f..5c0fd9e75 100644 --- a/relayer/relayPackets.go +++ b/relayer/relayPackets.go @@ -146,7 +146,6 @@ func (rp *relayMsgRecvPacket) FetchCommitResponse(src, dst *Chain, sh *SyncHeade }, rtyAtt, rtyDel, rtyErr, retry.OnRetry(func(n uint, err error) { // OnRetry we want to update the headers and then debug log if err := sh.Updates(src, dst); err != nil { - return } if dst.debug { dst.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet commitment: %s", dst.ChainID, @@ -156,7 +155,6 @@ func (rp *relayMsgRecvPacket) FetchCommitResponse(src, dst *Chain, sh *SyncHeade dst.Error(err) return } - rp.dstComRes = dstCommitRes return } From bd449e9fee180a454f0b7637a0bab80cd60df84b Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 12:29:28 +0530 Subject: [PATCH 27/88] error check added to retry.do function --- test/test_queries.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/test_queries.go b/test/test_queries.go index 26d6cba3b..0dca8ccee 100644 --- a/test/test_queries.go +++ b/test/test_queries.go @@ -24,13 +24,15 @@ func testClient(t *testing.T, src, dst *ry.Chain) { var ( client *clientypes.QueryClientStateResponse ) - retry.Do(func() error { + if err = retry.Do(func() error { client, err = src.QueryClientState(srch) if err != nil { srch, _ = src.QueryLatestHeight() } return err - }) + }); err != nil { + return + } require.NoError(t, err) require.NotNil(t, client) cs, err := clientypes.UnpackClientState(client.ClientState) From 021c032474d251b794194e7d9161a1fc57404588 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 13:05:55 +0530 Subject: [PATCH 28/88] lint issues fixed --- clib/main.go | 6 +++--- cmd/xfer.go | 2 +- relayer/connection-tx.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clib/main.go b/clib/main.go index 9ba36b6a3..a9afff3b2 100644 --- a/clib/main.go +++ b/clib/main.go @@ -33,7 +33,7 @@ var clibPort = 0 var replies = map[int]chan goReturn{} var lastReply = 0 -//export RunClib +//RunClib is ... func RunClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { if relayer.SendToController == nil { relayer.SendToController = func(needReply bool, str string) (string, error) { @@ -75,7 +75,7 @@ func RunClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { return C.int(clibPort) } -//export ReplyToClib +//ReplyToClib is ... func ReplyToClib(replyPort C.int, isError C.int, str C.Body) C.int { goStr := C.GoString(str) returnCh := replies[int(replyPort)] @@ -92,7 +92,7 @@ func ReplyToClib(replyPort C.int, isError C.int, str C.Body) C.int { return C.int(0) } -//export SendToClib +//SendToClib is ... func SendToClib(port C.int, str C.Body) C.Body { goStr := C.GoString(str) var action relayer.DeliverMsgsAction diff --git a/cmd/xfer.go b/cmd/xfer.go index 761323e17..d9d9c1d5e 100644 --- a/cmd/xfer.go +++ b/cmd/xfer.go @@ -80,7 +80,7 @@ $ %s tx raw send ibc-0 ibc-1 100000stake cosmos1skjwj5whet0lpe65qaq4rpq03hjxlwd9 } done() - return c[src].SendTransferMsg(c[dst], amount, dstAddr, toHeightOffset, toTimeOffset) + return c[src].SendTransferMsg(c[dst], amount, dstAddr.String(), toHeightOffset, toTimeOffset) }, } return timeoutFlags(pathFlag(cmd)) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index b6794ae9c..0d117f31f 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -58,7 +58,7 @@ func (c *Chain) CreateOpenConnections(dst *Chain, maxRetries uint64, to time.Dur // increment the failures counter and exit if we used all retry attempts case !success: failed++ - c.Log(fmt.Sprintf("retrying transaction...")) + c.Log(fmt.Sprint("retrying transaction...")) time.Sleep(5 * time.Second) if failed > maxRetries { From 4a151e83996ec5ee7b1a32cfc25ab91eed2c381d Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 13:47:20 +0530 Subject: [PATCH 29/88] redundant issue resolved --- relayer/contextual.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/relayer/contextual.go b/relayer/contextual.go index ef9cbb973..03065587e 100644 --- a/relayer/contextual.go +++ b/relayer/contextual.go @@ -76,8 +76,6 @@ func (cdc *contextualStdCodec) MustUnmarshalBinaryBare(bz []byte, ptr codec.Prot if err := cdc.UnmarshalBinaryBare(bz, ptr); err != nil { panic(err) } - - return } // // newContextualCodec creates a codec that sets and resets context From ad827d03e673ed10039b196e7e154512dc845ab4 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 14:02:02 +0530 Subject: [PATCH 30/88] lint issues fixed --- clib/main.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clib/main.go b/clib/main.go index a9afff3b2..46a4e6580 100644 --- a/clib/main.go +++ b/clib/main.go @@ -34,7 +34,7 @@ var replies = map[int]chan goReturn{} var lastReply = 0 //RunClib is ... -func RunClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { +func runClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { if relayer.SendToController == nil { relayer.SendToController = func(needReply bool, str string) (string, error) { var rPort int @@ -76,7 +76,7 @@ func RunClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { } //ReplyToClib is ... -func ReplyToClib(replyPort C.int, isError C.int, str C.Body) C.int { +func replyToClib(replyPort C.int, isError C.int, str C.Body) C.int { goStr := C.GoString(str) returnCh := replies[int(replyPort)] if returnCh == nil { @@ -93,7 +93,7 @@ func ReplyToClib(replyPort C.int, isError C.int, str C.Body) C.int { } //SendToClib is ... -func SendToClib(port C.int, str C.Body) C.Body { +func sendToClib(port C.int, str C.Body) C.Body { goStr := C.GoString(str) var action relayer.DeliverMsgsAction err := json.Unmarshal([]byte(goStr), &action) From 4cd0b389615c153802c55eed6683fa7056b5a65d Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 14:06:10 +0530 Subject: [PATCH 31/88] lint issues fixed --- clib/main.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/clib/main.go b/clib/main.go index 46a4e6580..b1cdc724c 100644 --- a/clib/main.go +++ b/clib/main.go @@ -33,7 +33,6 @@ var clibPort = 0 var replies = map[int]chan goReturn{} var lastReply = 0 -//RunClib is ... func runClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { if relayer.SendToController == nil { relayer.SendToController = func(needReply bool, str string) (string, error) { @@ -75,7 +74,6 @@ func runClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { return C.int(clibPort) } -//ReplyToClib is ... func replyToClib(replyPort C.int, isError C.int, str C.Body) C.int { goStr := C.GoString(str) returnCh := replies[int(replyPort)] @@ -92,7 +90,6 @@ func replyToClib(replyPort C.int, isError C.int, str C.Body) C.int { return C.int(0) } -//SendToClib is ... func sendToClib(port C.int, str C.Body) C.Body { goStr := C.GoString(str) var action relayer.DeliverMsgsAction From 55088cb12ae730797e798351cbd631cba896b901 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 14:46:37 +0530 Subject: [PATCH 32/88] lint issues fixed --- clib/main.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/clib/main.go b/clib/main.go index b1cdc724c..9ba36b6a3 100644 --- a/clib/main.go +++ b/clib/main.go @@ -33,7 +33,8 @@ var clibPort = 0 var replies = map[int]chan goReturn{} var lastReply = 0 -func runClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { +//export RunClib +func RunClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { if relayer.SendToController == nil { relayer.SendToController = func(needReply bool, str string) (string, error) { var rPort int @@ -74,7 +75,8 @@ func runClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { return C.int(clibPort) } -func replyToClib(replyPort C.int, isError C.int, str C.Body) C.int { +//export ReplyToClib +func ReplyToClib(replyPort C.int, isError C.int, str C.Body) C.int { goStr := C.GoString(str) returnCh := replies[int(replyPort)] if returnCh == nil { @@ -90,7 +92,8 @@ func replyToClib(replyPort C.int, isError C.int, str C.Body) C.int { return C.int(0) } -func sendToClib(port C.int, str C.Body) C.Body { +//export SendToClib +func SendToClib(port C.int, str C.Body) C.Body { goStr := C.GoString(str) var action relayer.DeliverMsgsAction err := json.Unmarshal([]byte(goStr), &action) From 2522a971b809a94101fcec0b4ff7c7bd3e3545e7 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 16:34:47 +0530 Subject: [PATCH 33/88] composite literal issue resolved --- go.sum | 1 + relayer/client-tx.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum index 915312b6e..4929f8a00 100644 --- a/go.sum +++ b/go.sum @@ -141,6 +141,7 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/cosmos-sdk v0.40.1 h1:gjrtV3MQj/CMeyXN4+sosHMG6Xwa2uH6HITSjSNL/0E= github.com/cosmos/cosmos-sdk v0.40.1/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= +github.com/cosmos/cosmos-sdk v0.41.0 h1:U614TXkI/+T8HY6V9krC0/mKaDm6qSs9EMFSIKuomCo= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= diff --git a/relayer/client-tx.go b/relayer/client-tx.go index cd057ebc7..93af03340 100644 --- a/relayer/client-tx.go +++ b/relayer/client-tx.go @@ -230,8 +230,8 @@ func (c *Chain) UpgradeClients(dst *Chain, height int64) error { return err } - upgradeMsg := &clienttypes.MsgUpgradeClient{c.PathEnd.ClientID, clientState, - consensusState, proofUpgradeClient, proofUpgradeConsensusState, c.MustGetAddress().String()} + upgradeMsg := &clienttypes.MsgUpgradeClient{ClientId: c.PathEnd.ClientID, ClientState: clientState, + ConsensusState: consensusState, ProofUpgradeClient: proofUpgradeClient, ProofUpgradeConsensusState: proofUpgradeConsensusState, Signer: c.MustGetAddress().String()} msgs := []sdk.Msg{ c.UpdateClient(dstUpdateHeader), From 689b9280f9f2a5f060e2dffc8431435316fa2634 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 16:40:10 +0530 Subject: [PATCH 34/88] character lenth issue solved --- relayer/client-tx.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/relayer/client-tx.go b/relayer/client-tx.go index 93af03340..8446ae33d 100644 --- a/relayer/client-tx.go +++ b/relayer/client-tx.go @@ -231,7 +231,8 @@ func (c *Chain) UpgradeClients(dst *Chain, height int64) error { } upgradeMsg := &clienttypes.MsgUpgradeClient{ClientId: c.PathEnd.ClientID, ClientState: clientState, - ConsensusState: consensusState, ProofUpgradeClient: proofUpgradeClient, ProofUpgradeConsensusState: proofUpgradeConsensusState, Signer: c.MustGetAddress().String()} + ConsensusState: consensusState, ProofUpgradeClient: proofUpgradeClient, + ProofUpgradeConsensusState: proofUpgradeConsensusState, Signer: c.MustGetAddress().String()} msgs := []sdk.Msg{ c.UpdateClient(dstUpdateHeader), From e43c84e2e5dc8b862d444c8419981c8512099e72 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 17:18:20 +0530 Subject: [PATCH 35/88] Sprint issue resolved --- cmd/xfer.go | 3 ++- relayer/channel-tx.go | 3 ++- relayer/connection-tx.go | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmd/xfer.go b/cmd/xfer.go index d9d9c1d5e..8b544cdb9 100644 --- a/cmd/xfer.go +++ b/cmd/xfer.go @@ -23,9 +23,10 @@ func xfersend() *cobra.Command { Example: strings.TrimSpace(fmt.Sprintf(` $ %s transact transfer ibc-0 ibc-1 100000stake cosmos1skjwj5whet0lpe65qaq4rpq03hjxlwd9nf39lk --path demo-path $ %s tx xfer ibc-0 ibc-1 100000stake cosmos1skjwj5whet0lpe65qaq4rpq03hjxlwd9nf39lk --path demo -y 2 -c 10 +$ %s tx xfer ibc-0 ibc-1 100000stake raw:non-bech32-address --path demo $ %s tx txf ibc-0 ibc-1 100000stake cosmos1skjwj5whet0lpe65qaq4rpq03hjxlwd9nf39lk --path demo $ %s tx raw send ibc-0 ibc-1 100000stake cosmos1skjwj5whet0lpe65qaq4rpq03hjxlwd9nf39lk --path demo -c 5 -`, appName, appName, appName, appName)), +`, appName, appName, appName, appName, appName)), RunE: func(cmd *cobra.Command, args []string) error { src, dst := args[0], args[1] c, err := config.Chains.Gets(src, dst) diff --git a/relayer/channel-tx.go b/relayer/channel-tx.go index 63a058fbe..f7129be98 100644 --- a/relayer/channel-tx.go +++ b/relayer/channel-tx.go @@ -62,7 +62,8 @@ func (c *Chain) CreateOpenChannels(dst *Chain, maxRetries uint64, to time.Durati // In the case of failure, increment the failures counter and exit if this is the 3rd failure case !success: failures++ - c.Log(fmt.Sprint("retrying transaction...")) + str := fmt.Sprint("retrying transaction...") + c.Log(str) time.Sleep(5 * time.Second) if failures > maxRetries { diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index 0d117f31f..c999cfd19 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -58,7 +58,8 @@ func (c *Chain) CreateOpenConnections(dst *Chain, maxRetries uint64, to time.Dur // increment the failures counter and exit if we used all retry attempts case !success: failed++ - c.Log(fmt.Sprint("retrying transaction...")) + str := fmt.Sprint("retrying transaction...") + c.Log(str) time.Sleep(5 * time.Second) if failed > maxRetries { From 4d1a7a5d4afabebb21262eb6bc9435e3a5cb028d Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Fri, 29 Jan 2021 17:22:11 +0530 Subject: [PATCH 36/88] Sprint issue resolved --- relayer/channel-tx.go | 2 +- relayer/connection-tx.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/relayer/channel-tx.go b/relayer/channel-tx.go index f7129be98..6a941a6ea 100644 --- a/relayer/channel-tx.go +++ b/relayer/channel-tx.go @@ -62,7 +62,7 @@ func (c *Chain) CreateOpenChannels(dst *Chain, maxRetries uint64, to time.Durati // In the case of failure, increment the failures counter and exit if this is the 3rd failure case !success: failures++ - str := fmt.Sprint("retrying transaction...") + str := "retrying transaction..." c.Log(str) time.Sleep(5 * time.Second) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index c999cfd19..6bc5fe346 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -58,7 +58,7 @@ func (c *Chain) CreateOpenConnections(dst *Chain, maxRetries uint64, to time.Dur // increment the failures counter and exit if we used all retry attempts case !success: failed++ - str := fmt.Sprint("retrying transaction...") + str := ("retrying transaction...") c.Log(str) time.Sleep(5 * time.Second) From 3a7de6d4747619f9230b9345b3f1332e9735fce4 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 11:14:30 +0530 Subject: [PATCH 37/88] start changed to sTrategy --- cmd/strategy.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/strategy.go b/cmd/strategy.go index f7d18b683..2de147d1b 100644 --- a/cmd/strategy.go +++ b/cmd/strategy.go @@ -9,35 +9,35 @@ import ( // GetStrategyWithOptions sets strategy specific fields. func GetStrategyWithOptions(cmd *cobra.Command, strategy relayer.Strategy) (relayer.Strategy, error) { - switch start := strategy.(type) { + switch sTrategy := strategy.(type) { case *relayer.NaiveStrategy: maxTxSize, err := cmd.Flags().GetString(flagMaxTxSize) if err != nil { - return start, err + return sTrategy, err } txSize, err := strconv.ParseUint(maxTxSize, 10, 64) if err != nil { - return start, err + return sTrategy, err } // set max size of messages in a relay transaction - start.MaxTxSize = txSize * MB // in MB + sTrategy.MaxTxSize = txSize * MB // in MB maxMsgLength, err := cmd.Flags().GetString(flagMaxMsgLength) if err != nil { - return start, err + return sTrategy, err } msgLen, err := strconv.ParseUint(maxMsgLength, 10, 64) if err != nil { - return start, err + return sTrategy, err } // set max length messages in relay transaction - start.MaxMsgLength = msgLen + sTrategy.MaxMsgLength = msgLen - return start, nil + return sTrategy, nil default: return strategy, nil } From 020feda543031c9b0bad29a185808275b42c2b7e Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 11:26:05 +0530 Subject: [PATCH 38/88] conflict resolved --- go.sum | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum index 4929f8a00..48175d98c 100644 --- a/go.sum +++ b/go.sum @@ -139,8 +139,8 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cosmos/cosmos-sdk v0.40.1 h1:gjrtV3MQj/CMeyXN4+sosHMG6Xwa2uH6HITSjSNL/0E= -github.com/cosmos/cosmos-sdk v0.40.1/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= + + github.com/cosmos/cosmos-sdk v0.41.0 h1:U614TXkI/+T8HY6V9krC0/mKaDm6qSs9EMFSIKuomCo= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= From 7da3ebdef8dc7c0e8e3055f665e717b90c1f894e Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 11:40:39 +0530 Subject: [PATCH 39/88] conflict resolved --- go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.sum b/go.sum index 48175d98c..3cda54ab1 100644 --- a/go.sum +++ b/go.sum @@ -139,8 +139,6 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= - - github.com/cosmos/cosmos-sdk v0.41.0 h1:U614TXkI/+T8HY6V9krC0/mKaDm6qSs9EMFSIKuomCo= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= From 9ad95ba872b2b759d6f39033ce15a1a507414f13 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 11:44:03 +0530 Subject: [PATCH 40/88] conflict resolved --- go.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/go.sum b/go.sum index 3cda54ab1..e3eef1407 100644 --- a/go.sum +++ b/go.sum @@ -138,6 +138,7 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cosmos/cosmos-sdk v0.41.0/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/cosmos-sdk v0.41.0 h1:U614TXkI/+T8HY6V9krC0/mKaDm6qSs9EMFSIKuomCo= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From d38c64a771dd579adb7c1dfa9b0f57d1930a4925 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 11:46:55 +0530 Subject: [PATCH 41/88] conflict resolved --- go.sum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.sum b/go.sum index e3eef1407..9b3d0dc06 100644 --- a/go.sum +++ b/go.sum @@ -122,6 +122,7 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/cosmos/cosmos-sdk v0.41.0/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/confio/ics23/go v0.0.0-20200817220745-f173e6211efb/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= github.com/confio/ics23/go v0.6.3 h1:PuGK2V1NJWZ8sSkNDq91jgT/cahFEW9RGp4Y5jxulf0= @@ -138,7 +139,6 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cosmos/cosmos-sdk v0.41.0/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/cosmos-sdk v0.41.0 h1:U614TXkI/+T8HY6V9krC0/mKaDm6qSs9EMFSIKuomCo= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From a06b83d61d0c1bf20ecbc06b1fadaa8ac60ba0e3 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 11:55:51 +0530 Subject: [PATCH 42/88] conflict resolved --- go.sum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.sum b/go.sum index 9b3d0dc06..57629f176 100644 --- a/go.sum +++ b/go.sum @@ -122,7 +122,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/cosmos/cosmos-sdk v0.41.0/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/confio/ics23/go v0.0.0-20200817220745-f173e6211efb/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= github.com/confio/ics23/go v0.6.3 h1:PuGK2V1NJWZ8sSkNDq91jgT/cahFEW9RGp4Y5jxulf0= @@ -140,6 +139,7 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cosmos/cosmos-sdk v0.41.0/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= github.com/cosmos/cosmos-sdk v0.41.0 h1:U614TXkI/+T8HY6V9krC0/mKaDm6qSs9EMFSIKuomCo= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= From 6fad57574b333e7a40d4178a9742bd0e56c704aa Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 12:00:26 +0530 Subject: [PATCH 43/88] conflict resolved --- go.sum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.sum b/go.sum index 57629f176..b35b8a10b 100644 --- a/go.sum +++ b/go.sum @@ -139,8 +139,8 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cosmos/cosmos-sdk v0.41.0/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= github.com/cosmos/cosmos-sdk v0.41.0 h1:U614TXkI/+T8HY6V9krC0/mKaDm6qSs9EMFSIKuomCo= +github.com/cosmos/cosmos-sdk v0.41.0/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= From 42014c8a6acd35b591348ab908c6e298489d5b96 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 12:41:56 +0530 Subject: [PATCH 44/88] make file changed --- Makefile | 9 +++++++++ go.sum | 2 ++ 2 files changed, 11 insertions(+) diff --git a/Makefile b/Makefile index 86e1996b1..14cc35b94 100644 --- a/Makefile +++ b/Makefile @@ -63,6 +63,15 @@ coverage: lint: @golangci-lint run @find . -name '*.go' -type f -not -path "*.git*" | xargs gofmt -d -s + @touch $(TMPFILEGOLINT) + -@for pkg in $(PKGS) ; do \ + echo `golint $$pkg | grep -v "empty branch (staticcheck)" | grep -v "line is 135 charachters (111)"` >> $(TMPFILEGOLINT) ; \ + done + @grep -Ev "^$$" $(TMPFILEGOLINT) || true + @if [ "$$(grep -Ev "^$$" $(TMPFILEGOLINT) | wc -l)" -gt "0" ]; then \ + rm -f $(TMPFILEGOLINT); echo "golint failure\n"; exit 1; else \ + rm -f $(TMPFILEGOLINT); echo "golint success\n"; \ + fi @go mod verify .PHONY: install build lint coverage clean diff --git a/go.sum b/go.sum index b35b8a10b..ef8e2e179 100644 --- a/go.sum +++ b/go.sum @@ -139,6 +139,8 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cosmos/cosmos-sdk v0.40.1 h1:gjrtV3MQj/CMeyXN4+sosHMG6Xwa2uH6HITSjSNL/0E= +github.com/cosmos/cosmos-sdk v0.40.1/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= github.com/cosmos/cosmos-sdk v0.41.0 h1:U614TXkI/+T8HY6V9krC0/mKaDm6qSs9EMFSIKuomCo= github.com/cosmos/cosmos-sdk v0.41.0/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= From 1245d3f1b35f9c39f0c88e29ce7c471a61ddcc48 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 12:53:07 +0530 Subject: [PATCH 45/88] conflict resolved --- Makefile | 2 +- go.mod | 2 +- go.sum | 4 ++-- test/test_chains.go | 14 ++++++++------ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 14cc35b94..e67be8add 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION := $(shell echo $(shell git describe --tags) | sed 's/^v//') COMMIT := $(shell git log -1 --format='%H') SDKCOMMIT := $(shell go list -m -u -f '{{.Version}}' github.com/cosmos/cosmos-sdk) -GAIA_VERSION := v3.0.1 +GAIA_VERSION := v4.0.0 AKASH_VERSION := jack/update-sdk GOPATH := $(shell go env GOPATH) diff --git a/go.mod b/go.mod index 7efb2ed36..d7896637a 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/avast/retry-go v2.6.0+incompatible github.com/cenkalti/backoff/v3 v3.2.2 // indirect github.com/containerd/continuity v0.0.0-20200928162600-f2cc35102c2a // indirect - github.com/cosmos/cosmos-sdk v0.40.1 + github.com/cosmos/cosmos-sdk v0.41.1 github.com/cosmos/go-bip39 v1.0.0 github.com/gogo/protobuf v1.3.3 github.com/golangci/golangci-lint v1.36.0 // indirect diff --git a/go.sum b/go.sum index ef8e2e179..e289b35f9 100644 --- a/go.sum +++ b/go.sum @@ -139,8 +139,8 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cosmos/cosmos-sdk v0.40.1 h1:gjrtV3MQj/CMeyXN4+sosHMG6Xwa2uH6HITSjSNL/0E= -github.com/cosmos/cosmos-sdk v0.40.1/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= +github.com/cosmos/cosmos-sdk v0.41.0 h1:U614TXkI/+T8HY6V9krC0/mKaDm6qSs9EMFSIKuomCo= +github.com/cosmos/cosmos-sdk v0.41.0/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= github.com/cosmos/cosmos-sdk v0.41.0 h1:U614TXkI/+T8HY6V9krC0/mKaDm6qSs9EMFSIKuomCo= github.com/cosmos/cosmos-sdk v0.41.0/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= diff --git a/test/test_chains.go b/test/test_chains.go index 5904e5e63..0f996a4d1 100644 --- a/test/test_chains.go +++ b/test/test_chains.go @@ -12,16 +12,17 @@ import ( ) var ( + // Chains built using SDK v0.41.0 + // GAIA BLOCK TIMEOUTS are located in the single node setup script on gaia // https://github.com/cosmos/gaia/blob/main/contrib/single-node.sh // timeout_commit = "1000ms" // timeout_propose = "1000ms" // 3 second relayer timeout works well with these block times gaiaTestConfig = testChainConfig{ - // This is built from contrib/Dockerfile.test of this PR: - // https://github.com/CosmWasm/gaia/tree/ethanfrey/docker-test-fixes - dockerImage: "cosmwasm/gaiatest", - dockerTag: "v3.0.0", + // This is built from contrib/Dockerfile.test from the gaia repository: + dockerImage: "colinaxner/gaiatest", + dockerTag: "v4.0.0", timeout: 3 * time.Second, rpcPort: "26657", accountPrefix: "cosmos", @@ -32,9 +33,10 @@ var ( // timeout_commit = "1000ms" // timeout_propose = "1000ms" // 3 second relayer timeout works well with these block times + // This is built from contrib/Dockerfile.test from the akash repository: akashTestConfig = testChainConfig{ - dockerImage: "jackzampolin/akashtest", - dockerTag: "jack_update-ibc-args", + dockerImage: "colinaxner/akashtest", + dockerTag: "latest", timeout: 3 * time.Second, rpcPort: "26657", accountPrefix: "akash", From a46ecb82b81c651cea7509c9213c12bb850e1f79 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 12:56:27 +0530 Subject: [PATCH 46/88] conflict resolved --- go.mod | 2 +- test/test_chains.go | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index d7896637a..784ac3235 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/avast/retry-go v2.6.0+incompatible github.com/cenkalti/backoff/v3 v3.2.2 // indirect github.com/containerd/continuity v0.0.0-20200928162600-f2cc35102c2a // indirect - github.com/cosmos/cosmos-sdk v0.41.1 + github.com/cosmos/cosmos-sdk v0.41.0 github.com/cosmos/go-bip39 v1.0.0 github.com/gogo/protobuf v1.3.3 github.com/golangci/golangci-lint v1.36.0 // indirect diff --git a/test/test_chains.go b/test/test_chains.go index 0f996a4d1..5904e5e63 100644 --- a/test/test_chains.go +++ b/test/test_chains.go @@ -12,17 +12,16 @@ import ( ) var ( - // Chains built using SDK v0.41.0 - // GAIA BLOCK TIMEOUTS are located in the single node setup script on gaia // https://github.com/cosmos/gaia/blob/main/contrib/single-node.sh // timeout_commit = "1000ms" // timeout_propose = "1000ms" // 3 second relayer timeout works well with these block times gaiaTestConfig = testChainConfig{ - // This is built from contrib/Dockerfile.test from the gaia repository: - dockerImage: "colinaxner/gaiatest", - dockerTag: "v4.0.0", + // This is built from contrib/Dockerfile.test of this PR: + // https://github.com/CosmWasm/gaia/tree/ethanfrey/docker-test-fixes + dockerImage: "cosmwasm/gaiatest", + dockerTag: "v3.0.0", timeout: 3 * time.Second, rpcPort: "26657", accountPrefix: "cosmos", @@ -33,10 +32,9 @@ var ( // timeout_commit = "1000ms" // timeout_propose = "1000ms" // 3 second relayer timeout works well with these block times - // This is built from contrib/Dockerfile.test from the akash repository: akashTestConfig = testChainConfig{ - dockerImage: "colinaxner/akashtest", - dockerTag: "latest", + dockerImage: "jackzampolin/akashtest", + dockerTag: "jack_update-ibc-args", timeout: 3 * time.Second, rpcPort: "26657", accountPrefix: "akash", From 53a1a8a487adfb5dcf4ca4778f6a235e97595e93 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 13:03:53 +0530 Subject: [PATCH 47/88] conflict resolved --- go.sum | 2 -- test/test_chains.go | 14 ++++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.sum b/go.sum index e289b35f9..b35b8a10b 100644 --- a/go.sum +++ b/go.sum @@ -141,8 +141,6 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/cosmos-sdk v0.41.0 h1:U614TXkI/+T8HY6V9krC0/mKaDm6qSs9EMFSIKuomCo= github.com/cosmos/cosmos-sdk v0.41.0/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= -github.com/cosmos/cosmos-sdk v0.41.0 h1:U614TXkI/+T8HY6V9krC0/mKaDm6qSs9EMFSIKuomCo= -github.com/cosmos/cosmos-sdk v0.41.0/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= diff --git a/test/test_chains.go b/test/test_chains.go index 5904e5e63..0f996a4d1 100644 --- a/test/test_chains.go +++ b/test/test_chains.go @@ -12,16 +12,17 @@ import ( ) var ( + // Chains built using SDK v0.41.0 + // GAIA BLOCK TIMEOUTS are located in the single node setup script on gaia // https://github.com/cosmos/gaia/blob/main/contrib/single-node.sh // timeout_commit = "1000ms" // timeout_propose = "1000ms" // 3 second relayer timeout works well with these block times gaiaTestConfig = testChainConfig{ - // This is built from contrib/Dockerfile.test of this PR: - // https://github.com/CosmWasm/gaia/tree/ethanfrey/docker-test-fixes - dockerImage: "cosmwasm/gaiatest", - dockerTag: "v3.0.0", + // This is built from contrib/Dockerfile.test from the gaia repository: + dockerImage: "colinaxner/gaiatest", + dockerTag: "v4.0.0", timeout: 3 * time.Second, rpcPort: "26657", accountPrefix: "cosmos", @@ -32,9 +33,10 @@ var ( // timeout_commit = "1000ms" // timeout_propose = "1000ms" // 3 second relayer timeout works well with these block times + // This is built from contrib/Dockerfile.test from the akash repository: akashTestConfig = testChainConfig{ - dockerImage: "jackzampolin/akashtest", - dockerTag: "jack_update-ibc-args", + dockerImage: "colinaxner/akashtest", + dockerTag: "latest", timeout: 3 * time.Second, rpcPort: "26657", accountPrefix: "akash", From 2eba8bb57ff29a7677b167b421f396b193da9cd2 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 15:14:28 +0530 Subject: [PATCH 48/88] empty branch issue resolved --- relayer/channel-tx.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/relayer/channel-tx.go b/relayer/channel-tx.go index 6a941a6ea..7a82bf28a 100644 --- a/relayer/channel-tx.go +++ b/relayer/channel-tx.go @@ -240,6 +240,7 @@ func InitializeChannel(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmclie // OpenInit on source // Neither channel has been initialized case src.PathEnd.ChannelID == "" && dst.PathEnd.ChannelID == "": + //nolint:gosec if src.debug { // TODO: log that we are attempting to create new channel ends } @@ -268,6 +269,7 @@ func InitializeChannel(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmclie // OpenTry on source // source channel does not exist, but counterparty channel exists case src.PathEnd.ChannelID == "" && dst.PathEnd.ChannelID != "": + //nolint:gosec if src.debug { // TODO: update logging } From 3c1c1bd8acb7708ea8ae065de931026fb29b5fa5 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 15:25:29 +0530 Subject: [PATCH 49/88] empty branch issue resolved --- relayer/channel-tx.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/relayer/channel-tx.go b/relayer/channel-tx.go index 7a82bf28a..f97ef65a0 100644 --- a/relayer/channel-tx.go +++ b/relayer/channel-tx.go @@ -240,7 +240,7 @@ func InitializeChannel(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmclie // OpenInit on source // Neither channel has been initialized case src.PathEnd.ChannelID == "" && dst.PathEnd.ChannelID == "": - //nolint:gosec + //nolint:staticcheck if src.debug { // TODO: log that we are attempting to create new channel ends } @@ -269,7 +269,7 @@ func InitializeChannel(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmclie // OpenTry on source // source channel does not exist, but counterparty channel exists case src.PathEnd.ChannelID == "" && dst.PathEnd.ChannelID != "": - //nolint:gosec + //nolint:staticcheck if src.debug { // TODO: update logging } From 8ad4dc03c493aa0812489c4f941ef2a69d26317e Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 15:36:28 +0530 Subject: [PATCH 50/88] empty branch issue resolved --- Makefile | 9 --------- relayer/chain.go | 1 + relayer/channel-tx.go | 1 + relayer/connection-tx.go | 1 + relayer/packet-tx.go | 1 + 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index e67be8add..05a71f97f 100644 --- a/Makefile +++ b/Makefile @@ -63,15 +63,6 @@ coverage: lint: @golangci-lint run @find . -name '*.go' -type f -not -path "*.git*" | xargs gofmt -d -s - @touch $(TMPFILEGOLINT) - -@for pkg in $(PKGS) ; do \ - echo `golint $$pkg | grep -v "empty branch (staticcheck)" | grep -v "line is 135 charachters (111)"` >> $(TMPFILEGOLINT) ; \ - done - @grep -Ev "^$$" $(TMPFILEGOLINT) || true - @if [ "$$(grep -Ev "^$$" $(TMPFILEGOLINT) | wc -l)" -gt "0" ]; then \ - rm -f $(TMPFILEGOLINT); echo "golint failure\n"; exit 1; else \ - rm -f $(TMPFILEGOLINT); echo "golint success\n"; \ - fi @go mod verify .PHONY: install build lint coverage clean diff --git a/relayer/chain.go b/relayer/chain.go index a5a331607..0d4ac4199 100644 --- a/relayer/chain.go +++ b/relayer/chain.go @@ -119,6 +119,7 @@ func ValidateChannelParams(src, dst *Chain) error { if err := dst.PathEnd.ValidateBasic(); err != nil { return err } + //nolint:staticcheck if strings.ToUpper(src.PathEnd.Order) != strings.ToUpper(dst.PathEnd.Order) { return fmt.Errorf("src and dst path ends must have same ORDER. got src: %s, dst: %s", src.PathEnd.Order, dst.PathEnd.Order) diff --git a/relayer/channel-tx.go b/relayer/channel-tx.go index f97ef65a0..670b7d66e 100644 --- a/relayer/channel-tx.go +++ b/relayer/channel-tx.go @@ -302,6 +302,7 @@ func InitializeChannel(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmclie // OpenTry on counterparty // source channel exists, but counterparty channel does not exist case src.PathEnd.ChannelID != "" && dst.PathEnd.ChannelID == "": + //nolint:staticcheck if dst.debug { // TODO: update logging } diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index 6bc5fe346..f85a8a11e 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -237,6 +237,7 @@ func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmc // OpenInit on source // Neither connection has been initialized case src.PathEnd.ConnectionID == "" && dst.PathEnd.ConnectionID == "": + //nolint:staticcheck if src.debug { // TODO: log that we are attempting to create new connection ends } diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index 7c09acdd0..6fc897657 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -8,6 +8,7 @@ import ( ) // SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args +//nolint:lll func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr string, toHeightOffset uint64, toTimeOffset time.Duration) error { var ( timeoutHeight uint64 From 4866085afa4c5527df4d54190043a3aae061cb43 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 15:39:23 +0530 Subject: [PATCH 51/88] empty branch issue resolved --- relayer/packet-tx.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index 6fc897657..2136bf3a3 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -// SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args //nolint:lll +// SendTransferMsg initiates an ibs20 transfer from src to dst with the specified args func (c *Chain) SendTransferMsg(dst *Chain, amount sdk.Coin, dstAddr string, toHeightOffset uint64, toTimeOffset time.Duration) error { var ( timeoutHeight uint64 From 50f25355f36803c37e000fdf1c873986c4617d92 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 15:50:54 +0530 Subject: [PATCH 52/88] empty branch issue resolved --- relayer/connection-tx.go | 2 ++ relayer/relayPackets.go | 1 + 2 files changed, 3 insertions(+) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index f85a8a11e..bc0029698 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -266,6 +266,7 @@ func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmc // OpenTry on source // source connection does not exist, but counterparty connection exists case src.PathEnd.ConnectionID == "" && dst.PathEnd.ConnectionID != "": + //nolint:staticcheck if src.debug { // TODO: update logging } @@ -297,6 +298,7 @@ func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmc // OpenTry on counterparty // source connection exists, but counterparty connection does not exist case src.PathEnd.ConnectionID != "" && dst.PathEnd.ConnectionID == "": + //nolint:staticcheck if dst.debug { // TODO: update logging } diff --git a/relayer/relayPackets.go b/relayer/relayPackets.go index 5c0fd9e75..168f7306f 100644 --- a/relayer/relayPackets.go +++ b/relayer/relayPackets.go @@ -146,6 +146,7 @@ func (rp *relayMsgRecvPacket) FetchCommitResponse(src, dst *Chain, sh *SyncHeade }, rtyAtt, rtyDel, rtyErr, retry.OnRetry(func(n uint, err error) { // OnRetry we want to update the headers and then debug log if err := sh.Updates(src, dst); err != nil { + return } if dst.debug { dst.Log(fmt.Sprintf("- [%s]@{%d} - try(%d/%d) query packet commitment: %s", dst.ChainID, From 3a278c5b89a82d97a5fdafa3ab6ea38dccb50e2f Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 15:59:31 +0530 Subject: [PATCH 53/88] interfacer issue resolved --- relayer/channel-tx.go | 1 + relayer/msgs.go | 1 + 2 files changed, 2 insertions(+) diff --git a/relayer/channel-tx.go b/relayer/channel-tx.go index 670b7d66e..1f235fa69 100644 --- a/relayer/channel-tx.go +++ b/relayer/channel-tx.go @@ -229,6 +229,7 @@ func ExecuteChannelStep(src, dst *Chain) (success, last, modified bool, err erro return true, last, false, nil } +//nolint:interfacer // InitializeChannel creates a new channel on either the source or destination chain . // The identifiers set in the PathEnd's are used to determine which channel ends need to be // initialized. The PathEnds are updated upon a successful transaction. diff --git a/relayer/msgs.go b/relayer/msgs.go index 1376c1d10..4b449629f 100644 --- a/relayer/msgs.go +++ b/relayer/msgs.go @@ -22,6 +22,7 @@ import ( // CreateClient creates an sdk.Msg to update the client on src with consensus state from dst func (c *Chain) CreateClient( + //nolint:interfacer clientState *tmclient.ClientState, dstHeader *tmclient.Header) sdk.Msg { From cb07b341ccd7260945ec109ab5308dde4d51dc5f Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 16:11:28 +0530 Subject: [PATCH 54/88] go lint issues fixed --- clib/main.go | 9 ++++++--- relayer/connection-tx.go | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/clib/main.go b/clib/main.go index 9ba36b6a3..26bcc027d 100644 --- a/clib/main.go +++ b/clib/main.go @@ -33,7 +33,8 @@ var clibPort = 0 var replies = map[int]chan goReturn{} var lastReply = 0 -//export RunClib +//nolint:golint +//RunClib is ... func RunClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { if relayer.SendToController == nil { relayer.SendToController = func(needReply bool, str string) (string, error) { @@ -75,7 +76,8 @@ func RunClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { return C.int(clibPort) } -//export ReplyToClib +//nolint:golint +//ReplyToClib is ... func ReplyToClib(replyPort C.int, isError C.int, str C.Body) C.int { goStr := C.GoString(str) returnCh := replies[int(replyPort)] @@ -92,7 +94,8 @@ func ReplyToClib(replyPort C.int, isError C.int, str C.Body) C.int { return C.int(0) } -//export SendToClib +//nolint:golint +//SendToClib is ... func SendToClib(port C.int, str C.Body) C.Body { goStr := C.GoString(str) var action relayer.DeliverMsgsAction diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index bc0029698..1c70e6c66 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -226,6 +226,7 @@ func ExecuteConnectionStep(src, dst *Chain) (success, last, modified bool, err e return true, last, false, nil } +//nolint:interfacer // InitializeConnection creates a new connection on either the source or destination chain . // The identifiers set in the PathEnd's are used to determine which connection ends need to be // initialized. The PathEnds are updated upon a successful transaction. From b31b7a2b811396615b66f5013b031d7fada1e6f7 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 16:16:47 +0530 Subject: [PATCH 55/88] go lint issues fixed --- clib/main.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/clib/main.go b/clib/main.go index 26bcc027d..9ba36b6a3 100644 --- a/clib/main.go +++ b/clib/main.go @@ -33,8 +33,7 @@ var clibPort = 0 var replies = map[int]chan goReturn{} var lastReply = 0 -//nolint:golint -//RunClib is ... +//export RunClib func RunClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { if relayer.SendToController == nil { relayer.SendToController = func(needReply bool, str string) (string, error) { @@ -76,8 +75,7 @@ func RunClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { return C.int(clibPort) } -//nolint:golint -//ReplyToClib is ... +//export ReplyToClib func ReplyToClib(replyPort C.int, isError C.int, str C.Body) C.int { goStr := C.GoString(str) returnCh := replies[int(replyPort)] @@ -94,8 +92,7 @@ func ReplyToClib(replyPort C.int, isError C.int, str C.Body) C.int { return C.int(0) } -//nolint:golint -//SendToClib is ... +//export SendToClib func SendToClib(port C.int, str C.Body) C.Body { goStr := C.GoString(str) var action relayer.DeliverMsgsAction From 7db27d08dd38f372ef31c434be230270d28c513e Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 16:22:25 +0530 Subject: [PATCH 56/88] go lint issues fixed --- clib/main.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/clib/main.go b/clib/main.go index 9ba36b6a3..9877e4c5a 100644 --- a/clib/main.go +++ b/clib/main.go @@ -33,6 +33,7 @@ var clibPort = 0 var replies = map[int]chan goReturn{} var lastReply = 0 +//nolint:golint //export RunClib func RunClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { if relayer.SendToController == nil { @@ -75,7 +76,7 @@ func RunClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { return C.int(clibPort) } -//export ReplyToClib +//nolint:golint func ReplyToClib(replyPort C.int, isError C.int, str C.Body) C.int { goStr := C.GoString(str) returnCh := replies[int(replyPort)] @@ -92,7 +93,7 @@ func ReplyToClib(replyPort C.int, isError C.int, str C.Body) C.int { return C.int(0) } -//export SendToClib +//nolint:golint func SendToClib(port C.int, str C.Body) C.Body { goStr := C.GoString(str) var action relayer.DeliverMsgsAction From 37fb2e40afdaee2c3fae57b8dcf9f35a7b6688c9 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 16:26:18 +0530 Subject: [PATCH 57/88] go lint issues fixed --- clib/main.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/clib/main.go b/clib/main.go index 9877e4c5a..6daa1e2bb 100644 --- a/clib/main.go +++ b/clib/main.go @@ -77,6 +77,7 @@ func RunClib(nodePort C.int, toNode C.sendFunc, clibArgs []*C.char) C.int { } //nolint:golint +//export ReplyToClib func ReplyToClib(replyPort C.int, isError C.int, str C.Body) C.int { goStr := C.GoString(str) returnCh := replies[int(replyPort)] @@ -94,6 +95,7 @@ func ReplyToClib(replyPort C.int, isError C.int, str C.Body) C.int { } //nolint:golint +//export SendToClib func SendToClib(port C.int, str C.Body) C.Body { goStr := C.GoString(str) var action relayer.DeliverMsgsAction From c5ee7a7c33a634ca0d84227ff4330db972866e19 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 16:57:17 +0530 Subject: [PATCH 58/88] comments modified --- cmd/config.go | 4 ++-- relayer/controller.go | 2 +- relayer/encoding.go | 2 +- relayer/pathEnd.go | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/config.go b/cmd/config.go index 908cb714c..2eeabddd3 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -33,9 +33,9 @@ import ( ) const ( - //ORDERED is ... + //ORDERED is exported constant ORDERED = "ORDERED" - //UNORDERED is ... + //UNORDERED is exported constant UNORDERED = "UNORDERED" defaultOrder = ORDERED defaultVersion = "ics20-1" diff --git a/relayer/controller.go b/relayer/controller.go index c7ac4a743..2e5adff6f 100644 --- a/relayer/controller.go +++ b/relayer/controller.go @@ -7,7 +7,7 @@ import ( //SendToController is ... var SendToController func(needReply bool, str string) (string, error) -//ControllerUpcall is ... +//ControllerUpcall takes action interface type func ControllerUpcall(action interface{}) (bool, error) { bz, err := json.Marshal(action) if err != nil { diff --git a/relayer/encoding.go b/relayer/encoding.go index 61b17a0fc..8ecef88bc 100644 --- a/relayer/encoding.go +++ b/relayer/encoding.go @@ -262,7 +262,7 @@ func (pc *ProtoCodec) UnpackAny(any *types.Any, iface interface{}) error { return pc.interfaceRegistry.UnpackAny(any, iface) } -//InterfaceRegistry is ... +//InterfaceRegistry returns protocodec struct type interfaceRegistry func (pc *ProtoCodec) InterfaceRegistry() types.InterfaceRegistry { return pc.interfaceRegistry } diff --git a/relayer/pathEnd.go b/relayer/pathEnd.go index 53870349f..e2d0e79ed 100644 --- a/relayer/pathEnd.go +++ b/relayer/pathEnd.go @@ -41,14 +41,14 @@ func OrderFromString(order string) chantypes.Order { } } -//GetOrder is ... +//nolint:golint func (pe *PathEnd) GetOrder() chantypes.Order { return OrderFromString(strings.ToUpper(pe.Order)) } var marshalledChains = map[PathEnd]*Chain{} -//MarshalChain is ... +//nolint:golint func MarshalChain(c *Chain) PathEnd { pe := *c.PathEnd if _, ok := marshalledChains[pe]; !ok { @@ -57,7 +57,7 @@ func MarshalChain(c *Chain) PathEnd { return pe } -//UnmarshalChain is ... +//nolint:golint func UnmarshalChain(pe PathEnd) *Chain { if c, ok := marshalledChains[pe]; ok { return c From 5cfbd4ee29554c2f3e74c18eec9dd4b1959c14c6 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 17:10:01 +0530 Subject: [PATCH 59/88] comments modified --- relayer/pathEnd.go | 6 +++--- relayer/query.go | 4 ++-- relayer/relayMsgs.go | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/relayer/pathEnd.go b/relayer/pathEnd.go index e2d0e79ed..ff4af2bd9 100644 --- a/relayer/pathEnd.go +++ b/relayer/pathEnd.go @@ -41,14 +41,14 @@ func OrderFromString(order string) chantypes.Order { } } -//nolint:golint +//GetOrder is ... func (pe *PathEnd) GetOrder() chantypes.Order { return OrderFromString(strings.ToUpper(pe.Order)) } var marshalledChains = map[PathEnd]*Chain{} -//nolint:golint +//MarshalChain is PathEnd func MarshalChain(c *Chain) PathEnd { pe := *c.PathEnd if _, ok := marshalledChains[pe]; !ok { @@ -57,7 +57,7 @@ func MarshalChain(c *Chain) PathEnd { return pe } -//nolint:golint +//UnmarshalChain returns Marshalled chain func UnmarshalChain(pe PathEnd) *Chain { if c, ok := marshalledChains[pe]; ok { return c diff --git a/relayer/query.go b/relayer/query.go index 12bf8416b..65635e7f8 100644 --- a/relayer/query.go +++ b/relayer/query.go @@ -404,7 +404,7 @@ func (c *Chain) QueryUnbondingPeriod() (time.Duration, error) { return res.Params.UnbondingTime, nil } -//QueryUpgradedClient is ... +//QueryUpgradedClient returns upgraded client info func (c *Chain) QueryUpgradedClient(height int64) (*codectypes.Any, []byte, clienttypes.Height, error) { req := upgradetypes.QueryCurrentPlanRequest{} @@ -429,7 +429,7 @@ func (c *Chain) QueryUpgradedClient(height int64) (*codectypes.Any, []byte, clie return client, proof, proofHeight, nil } -//QueryUpgradedConsState is ... +//QueryUpgradedConsState returns upgraded consensus state and height of client func (c *Chain) QueryUpgradedConsState(height int64) (*codectypes.Any, []byte, clienttypes.Height, error) { req := upgradetypes.QueryUpgradedConsensusStateRequest{ LastHeight: height, diff --git a/relayer/relayMsgs.go b/relayer/relayMsgs.go index 2491bc492..05daf6d91 100644 --- a/relayer/relayMsgs.go +++ b/relayer/relayMsgs.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -//DeliverMsgsAction is ... +//DeliverMsgsAction is struct type DeliverMsgsAction struct { SrcMsgs []string `json:"src_msgs"` Src PathEnd `json:"src"` @@ -55,7 +55,7 @@ func (r *RelayMsgs) Success() bool { return r.Succeeded } -//IsMaxTx is ... +//IsMaxTx is func (r *RelayMsgs) IsMaxTx(msgLen, txSize uint64) bool { return (r.MaxMsgLength != 0 && msgLen > r.MaxMsgLength) || (r.MaxTxSize != 0 && txSize > r.MaxTxSize) @@ -81,7 +81,6 @@ func EncodeMsgs(c *Chain, msgs []sdk.Msg) []string { return outMsgs } -//DecodeMsgs is ... func DecodeMsgs(c *Chain, msgs []string) []sdk.Msg { outMsgs := make([]sdk.Msg, 0, len(msgs)) for _, msg := range msgs { From 703a9d6a41cb4580372a6b1cac8d1f2c413ea7cc Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 17:12:55 +0530 Subject: [PATCH 60/88] comments modified --- relayer/relayMsgs.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/relayer/relayMsgs.go b/relayer/relayMsgs.go index 05daf6d91..51d93f676 100644 --- a/relayer/relayMsgs.go +++ b/relayer/relayMsgs.go @@ -55,7 +55,6 @@ func (r *RelayMsgs) Success() bool { return r.Succeeded } -//IsMaxTx is func (r *RelayMsgs) IsMaxTx(msgLen, txSize uint64) bool { return (r.MaxMsgLength != 0 && msgLen > r.MaxMsgLength) || (r.MaxTxSize != 0 && txSize > r.MaxTxSize) @@ -67,7 +66,6 @@ func (r *RelayMsgs) Send(src, dst *Chain) { r.SendWithController(src, dst, true) } -//EncodeMsgs is ... func EncodeMsgs(c *Chain, msgs []sdk.Msg) []string { outMsgs := make([]string, 0, len(msgs)) for _, msg := range msgs { @@ -95,7 +93,6 @@ func DecodeMsgs(c *Chain, msgs []string) []sdk.Msg { return outMsgs } -//SendWithController is ... func (r *RelayMsgs) SendWithController(src, dst *Chain, useController bool) { if useController && SendToController != nil { action := &DeliverMsgsAction{ From 32b99c1fb5866c5b8f55a1ddbf8609b0c3fea1a5 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 17:24:44 +0530 Subject: [PATCH 61/88] comments modified --- cmd/config.go | 2 +- cmd/keys.go | 2 +- cmd/light.go | 2 +- cmd/root.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/config.go b/cmd/config.go index 2eeabddd3..dceb985b1 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -1,5 +1,5 @@ /* -Package cmd ... +Package cmd includes relayer commands Copyright © 2020 Jack Zampolin jack.zampolin@gmail.com Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cmd/keys.go b/cmd/keys.go index 2103edba1..8fd57d41c 100644 --- a/cmd/keys.go +++ b/cmd/keys.go @@ -1,5 +1,5 @@ /* -Package cmd ... +Package cmd includes relayer commands Copyright © 2020 Jack Zampolin jack.zampolin@gmail.com Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cmd/light.go b/cmd/light.go index b552ed18f..5ed8bd7c2 100644 --- a/cmd/light.go +++ b/cmd/light.go @@ -1,5 +1,5 @@ /* -Package cmd ... +Package cmd includes relayer commands Copyright © 2020 Jack Zampolin Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cmd/root.go b/cmd/root.go index 367438a27..68b73b1c6 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/viper" ) -//const is ... +//MB is ... const ( MB = 1048576 // in bytes ) From 1676467607a317ad913c2e40990d69a450a0f7cf Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 17:52:53 +0530 Subject: [PATCH 62/88] comments added --- cmd/xfer.go | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/cmd/xfer.go b/cmd/xfer.go index 8b544cdb9..0dabb3e41 100644 --- a/cmd/xfer.go +++ b/cmd/xfer.go @@ -10,6 +10,14 @@ import ( "github.com/cosmos/relayer/relayer" ) +type stringStringer struct { + str string +} + +func (ss stringStringer) String() string { + return ss.str +} + // NOTE: These commands are registered over in cmd/raw.go func xfersend() *cobra.Command { @@ -74,12 +82,21 @@ $ %s tx raw send ibc-0 ibc-1 100000stake cosmos1skjwj5whet0lpe65qaq4rpq03hjxlwd9 return err } - done := c[dst].UseSDKContext() - dstAddr, err := sdk.AccAddressFromBech32(args[3]) - if err != nil { - return err + // If the argument begins with "raw:" then use the suffix directly. + rawDstAddr := strings.TrimPrefix(args[3], "raw:") + var dstAddr fmt.Stringer + if rawDstAddr == args[3] { + // Not "raw:", treat the dstAddr as bech32. + done := c[dst].UseSDKContext() + dstAddr, err = sdk.AccAddressFromBech32(args[3]) + if err != nil { + return err + } + done() + } else { + // Don't parse the rest of the dstAddr... it's raw. + dstAddr = stringStringer{str: rawDstAddr} } - done() return c[src].SendTransferMsg(c[dst], amount, dstAddr.String(), toHeightOffset, toTimeOffset) }, From 3e8d183bb2102a28f69a6b2debf3236d9578f85c Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 20:57:49 +0530 Subject: [PATCH 63/88] comments added --- cmd/root.go | 2 +- cmd/start.go | 2 +- cmd/tx.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 68b73b1c6..cdfa35140 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -1,5 +1,5 @@ /* -Package cmd ... +Package cmd includes relayer commands Copyright © 2020 Jack Zampolin jack.zampolin@gmail.com Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cmd/start.go b/cmd/start.go index 0e4056a3c..d8e784d9a 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -1,5 +1,5 @@ /* -Package cmd ... +Package cmd includes relayer commands Copyright © 2020 Jack Zampolin Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cmd/tx.go b/cmd/tx.go index 6b3ce15ad..3d8065440 100644 --- a/cmd/tx.go +++ b/cmd/tx.go @@ -1,5 +1,5 @@ /* -Package cmd ... +Package cmd includes relayer commands Copyright © 2020 NAME HERE Licensed under the Apache License, Version 2.0 (the "License"); From e4913f4a91ab0ad47ad21e0ec3293574368ebaa6 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 21:38:16 +0530 Subject: [PATCH 64/88] comments added --- cmd/keys.go | 2 +- cmd/light.go | 3 ++- cmd/testnets.go | 2 +- relayer/client-tx.go | 1 + relayer/ics24.go | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmd/keys.go b/cmd/keys.go index 8fd57d41c..8501f8c8a 100644 --- a/cmd/keys.go +++ b/cmd/keys.go @@ -134,7 +134,7 @@ $ %s k r ibc-1 faucet-key "[mnemonic-words]"`, appName, appName)), } coinType, _ := cmd.Flags().GetUint32(flagCoinType) - + //nolint:lll info, err := chain.Keybase.NewAccount(keyName, args[2], "", hd.CreateHDPath(coinType, 0, 0).String(), hd.Secp256k1) if err != nil { return err diff --git a/cmd/light.go b/cmd/light.go index 5ed8bd7c2..0711161e5 100644 --- a/cmd/light.go +++ b/cmd/light.go @@ -87,6 +87,7 @@ $ %s l i ibc-2 --force`, appName, appName, appName)), if err != nil { return err } + //nolint:lll fmt.Printf("successfully created light client for %s by trusting endpoint %s...\n", chain.ChainID, chain.RPCAddr) case height > 0 && len(hash) > 0: // height and hash are given _, err = chain.LightClientWithTrust(db, chain.TrustOptions(height, hash)) @@ -128,7 +129,7 @@ $ %s l u ibc-1`, appName, appName)), if err != nil { return err } - + //nolint:lll fmt.Printf("Updated light client for %s from height %d -> height %d\n", args[0], bh.Header.Height, ah.Header.Height) return nil }, diff --git a/cmd/testnets.go b/cmd/testnets.go index 422e8f3cf..212346e43 100644 --- a/cmd/testnets.go +++ b/cmd/testnets.go @@ -76,7 +76,7 @@ $ %s tst req ibc-0`, appName, appName, appName)), if err != nil { return err } - + //nolint:lll body, err := json.Marshal(relayer.FaucetRequest{Address: info.GetAddress().String(), ChainID: chain.ChainID}) if err != nil { return err diff --git a/relayer/client-tx.go b/relayer/client-tx.go index 8446ae33d..43edaf10c 100644 --- a/relayer/client-tx.go +++ b/relayer/client-tx.go @@ -284,6 +284,7 @@ func FindMatchingClient(source, counterparty *Chain, clientState *ibctmtypes.Cli identifiedClientState.ClientId, existingClientState.GetLatestHeight()) if err != nil { if source.debug { + //nolint:lll source.Log(fmt.Sprintf("Error: failed to query latest consensus state for existing client on chain %s: %v", source.PathEnd.ChainID, err)) } diff --git a/relayer/ics24.go b/relayer/ics24.go index 0164f4156..c65e1cd3f 100644 --- a/relayer/ics24.go +++ b/relayer/ics24.go @@ -34,6 +34,7 @@ func (pe *PathEnd) Vversion() error { } func (pe PathEnd) String() string { + //nolint:lll return fmt.Sprintf("%s:cl(%s):co(%s):ch(%s):pt(%s)", pe.ChainID, pe.ClientID, pe.ConnectionID, pe.ChannelID, pe.PortID) } From 2d17b4a3e29ceb60abd6e3ad10e31b520cdf1a67 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 21:48:44 +0530 Subject: [PATCH 65/88] comments deleted --- cmd/keys.go | 1 - cmd/light.go | 2 -- cmd/testnets.go | 1 - relayer/client-tx.go | 1 - relayer/ics24.go | 1 - 5 files changed, 6 deletions(-) diff --git a/cmd/keys.go b/cmd/keys.go index 8501f8c8a..2c871a1fc 100644 --- a/cmd/keys.go +++ b/cmd/keys.go @@ -134,7 +134,6 @@ $ %s k r ibc-1 faucet-key "[mnemonic-words]"`, appName, appName)), } coinType, _ := cmd.Flags().GetUint32(flagCoinType) - //nolint:lll info, err := chain.Keybase.NewAccount(keyName, args[2], "", hd.CreateHDPath(coinType, 0, 0).String(), hd.Secp256k1) if err != nil { return err diff --git a/cmd/light.go b/cmd/light.go index 0711161e5..fbf33fba7 100644 --- a/cmd/light.go +++ b/cmd/light.go @@ -87,7 +87,6 @@ $ %s l i ibc-2 --force`, appName, appName, appName)), if err != nil { return err } - //nolint:lll fmt.Printf("successfully created light client for %s by trusting endpoint %s...\n", chain.ChainID, chain.RPCAddr) case height > 0 && len(hash) > 0: // height and hash are given _, err = chain.LightClientWithTrust(db, chain.TrustOptions(height, hash)) @@ -129,7 +128,6 @@ $ %s l u ibc-1`, appName, appName)), if err != nil { return err } - //nolint:lll fmt.Printf("Updated light client for %s from height %d -> height %d\n", args[0], bh.Header.Height, ah.Header.Height) return nil }, diff --git a/cmd/testnets.go b/cmd/testnets.go index 212346e43..f77280e1f 100644 --- a/cmd/testnets.go +++ b/cmd/testnets.go @@ -76,7 +76,6 @@ $ %s tst req ibc-0`, appName, appName, appName)), if err != nil { return err } - //nolint:lll body, err := json.Marshal(relayer.FaucetRequest{Address: info.GetAddress().String(), ChainID: chain.ChainID}) if err != nil { return err diff --git a/relayer/client-tx.go b/relayer/client-tx.go index 43edaf10c..8446ae33d 100644 --- a/relayer/client-tx.go +++ b/relayer/client-tx.go @@ -284,7 +284,6 @@ func FindMatchingClient(source, counterparty *Chain, clientState *ibctmtypes.Cli identifiedClientState.ClientId, existingClientState.GetLatestHeight()) if err != nil { if source.debug { - //nolint:lll source.Log(fmt.Sprintf("Error: failed to query latest consensus state for existing client on chain %s: %v", source.PathEnd.ChainID, err)) } diff --git a/relayer/ics24.go b/relayer/ics24.go index c65e1cd3f..0164f4156 100644 --- a/relayer/ics24.go +++ b/relayer/ics24.go @@ -34,7 +34,6 @@ func (pe *PathEnd) Vversion() error { } func (pe PathEnd) String() string { - //nolint:lll return fmt.Sprintf("%s:cl(%s):co(%s):ch(%s):pt(%s)", pe.ChainID, pe.ClientID, pe.ConnectionID, pe.ChannelID, pe.PortID) } From 991b0e901d24213ad0f1d6ef66da0c367ef59a20 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 21:56:14 +0530 Subject: [PATCH 66/88] comments deleted --- cmd/root.go | 2 +- cmd/start.go | 2 +- cmd/tx.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index cdfa35140..68b73b1c6 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -1,5 +1,5 @@ /* -Package cmd includes relayer commands +Package cmd ... Copyright © 2020 Jack Zampolin jack.zampolin@gmail.com Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cmd/start.go b/cmd/start.go index d8e784d9a..0e4056a3c 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -1,5 +1,5 @@ /* -Package cmd includes relayer commands +Package cmd ... Copyright © 2020 Jack Zampolin Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cmd/tx.go b/cmd/tx.go index 3d8065440..6b3ce15ad 100644 --- a/cmd/tx.go +++ b/cmd/tx.go @@ -1,5 +1,5 @@ /* -Package cmd includes relayer commands +Package cmd ... Copyright © 2020 NAME HERE Licensed under the Apache License, Version 2.0 (the "License"); From 695664d626ea75e445e5c811e35fed2bcccb7d70 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 22:24:18 +0530 Subject: [PATCH 67/88] comments deleted --- cmd/root.go | 2 +- cmd/start.go | 2 +- cmd/tx.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 68b73b1c6..cdfa35140 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -1,5 +1,5 @@ /* -Package cmd ... +Package cmd includes relayer commands Copyright © 2020 Jack Zampolin jack.zampolin@gmail.com Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cmd/start.go b/cmd/start.go index 0e4056a3c..d8e784d9a 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -1,5 +1,5 @@ /* -Package cmd ... +Package cmd includes relayer commands Copyright © 2020 Jack Zampolin Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/cmd/tx.go b/cmd/tx.go index 6b3ce15ad..3d8065440 100644 --- a/cmd/tx.go +++ b/cmd/tx.go @@ -1,5 +1,5 @@ /* -Package cmd ... +Package cmd includes relayer commands Copyright © 2020 NAME HERE Licensed under the Apache License, Version 2.0 (the "License"); From 39bc53cc3ba951e35fe8b22e7eae55f427c6d708 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 22:42:54 +0530 Subject: [PATCH 68/88] issues fixed --- cmd/flags.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/flags.go b/cmd/flags.go index d72cd1af6..32aef7667 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -197,8 +197,8 @@ func versionFlag(cmd *cobra.Command) *cobra.Command { } func forceFlag(cmd *cobra.Command) *cobra.Command { - cmd.Flags().BoolP(flagForce, "f", false, - "option to force non-standard behavior such as initialization of light client from configured chain or generation of new path") //nolint:lll + //nolint:lll + cmd.Flags().BoolP(flagForce, "f", false, "option to force non-standard behavior such as initialization of light client from configured chain or generation of new path") if err := viper.BindPFlag(flagForce, cmd.Flags().Lookup(flagForce)); err != nil { panic(err) } From ce57844cd264c41d28fc5fe5d5d104d711d76fbc Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Mon, 1 Feb 2021 22:59:20 +0530 Subject: [PATCH 69/88] issues fixed --- cmd/flags.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/flags.go b/cmd/flags.go index 32aef7667..cf02a2c87 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -197,8 +197,9 @@ func versionFlag(cmd *cobra.Command) *cobra.Command { } func forceFlag(cmd *cobra.Command) *cobra.Command { - //nolint:lll - cmd.Flags().BoolP(flagForce, "f", false, "option to force non-standard behavior such as initialization of light client from configured chain or generation of new path") + cmd.Flags().BoolP(flagForce, "f", false, + "option to force non-standard behavior such as initialization of light client from"+ + "configured chain or generation of new path") if err := viper.BindPFlag(flagForce, cmd.Flags().Lookup(flagForce)); err != nil { panic(err) } From 8f8df6a0a115199c0a40ac3ac2f25fd65b45a278 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 10:41:32 +0530 Subject: [PATCH 70/88] length issue resolved --- cmd/light.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/light.go b/cmd/light.go index fbf33fba7..5265bceb1 100644 --- a/cmd/light.go +++ b/cmd/light.go @@ -87,7 +87,8 @@ $ %s l i ibc-2 --force`, appName, appName, appName)), if err != nil { return err } - fmt.Printf("successfully created light client for %s by trusting endpoint %s...\n", chain.ChainID, chain.RPCAddr) + fmt.Printf("successfully created light client for %s by trusting endpoint %s...\n", + chain.ChainID, chain.RPCAddr) case height > 0 && len(hash) > 0: // height and hash are given _, err = chain.LightClientWithTrust(db, chain.TrustOptions(height, hash)) if err != nil { @@ -128,7 +129,8 @@ $ %s l u ibc-1`, appName, appName)), if err != nil { return err } - fmt.Printf("Updated light client for %s from height %d -> height %d\n", args[0], bh.Header.Height, ah.Header.Height) + fmt.Printf("Updated light client for %s from height %d -> height %d\n", + args[0], bh.Header.Height, ah.Header.Height) return nil }, } From 4f1fdfcdba6bfa59b0adf0e2fb019371d5aff22b Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 11:06:30 +0530 Subject: [PATCH 71/88] updated --- cmd/testnets.go | 3 +- cmd/xfer.go | 3 +- relayer/connection-tx.go | 160 ++++++++++++++++++++++++--------------- 3 files changed, 103 insertions(+), 63 deletions(-) diff --git a/cmd/testnets.go b/cmd/testnets.go index f77280e1f..b70ac4f42 100644 --- a/cmd/testnets.go +++ b/cmd/testnets.go @@ -76,7 +76,8 @@ $ %s tst req ibc-0`, appName, appName, appName)), if err != nil { return err } - body, err := json.Marshal(relayer.FaucetRequest{Address: info.GetAddress().String(), ChainID: chain.ChainID}) + body, err := json.Marshal(relayer.FaucetRequest{Address: info.GetAddress().String(), + ChainID: chain.ChainID}) if err != nil { return err } diff --git a/cmd/xfer.go b/cmd/xfer.go index 0dabb3e41..e268b323d 100644 --- a/cmd/xfer.go +++ b/cmd/xfer.go @@ -124,7 +124,8 @@ func setPathsFromArgs(src, dst *relayer.Chain, name string) (*relayer.Path, erro return path, err } case name == "" && len(paths) > 1: - return nil, fmt.Errorf("more than one path between %s and %s exists, pass in path name", src.ChainID, dst.ChainID) + return nil, fmt.Errorf("more than one path between %s and %s exists, pass in path name", + src.ChainID, dst.ChainID) case name == "" && len(paths) == 1: for _, v := range paths { path = v diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index 1c70e6c66..c5b6a4d43 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -58,8 +58,7 @@ func (c *Chain) CreateOpenConnections(dst *Chain, maxRetries uint64, to time.Dur // increment the failures counter and exit if we used all retry attempts case !success: failed++ - str := ("retrying transaction...") - c.Log(str) + c.Log(fmt.Sprintf("retrying transaction...")) time.Sleep(5 * time.Second) if failed > maxRetries { @@ -105,7 +104,6 @@ func ExecuteConnectionStep(src, dst *Chain) (success, last, modified bool, err e // is chosen or a new connection is created. // This will perform either an OpenInit or OpenTry step and return if src.PathEnd.ConnectionID == "" || dst.PathEnd.ConnectionID == "" { - // TODO: Query for existing identifier and fill config, if possible success, modified, err := InitializeConnection(src, dst, srcUpdateHeader, dstUpdateHeader, sh) if err != nil { return false, false, false, err @@ -115,8 +113,7 @@ func ExecuteConnectionStep(src, dst *Chain) (success, last, modified bool, err e } // Query Connection data from src and dst - srcConn, dstConn, err = QueryConnectionPair(src, dst, int64(sh.GetHeight(src.ChainID))-1, - int64(sh.GetHeight(dst.ChainID))-1) + srcConn, dstConn, err = QueryConnectionPair(src, dst, int64(sh.GetHeight(src.ChainID))-1, int64(sh.GetHeight(dst.ChainID))-1) if err != nil { return false, false, false, err } @@ -148,8 +145,7 @@ func ExecuteConnectionStep(src, dst *Chain) (success, last, modified bool, err e // OpenAck on source if dst is at TRYOPEN and src is on INIT or TRYOPEN (crossing hellos case) // obtain proof of counterparty in TRYOPEN state and submit to source chain to update state // from INIT/TRYOPEN to OPEN. - case (srcConn.Connection.State == conntypes.INIT || srcConn.Connection.State == conntypes.TRYOPEN) && - dstConn.Connection.State == conntypes.TRYOPEN: + case (srcConn.Connection.State == conntypes.INIT || srcConn.Connection.State == conntypes.TRYOPEN) && dstConn.Connection.State == conntypes.TRYOPEN: if src.debug { logConnectionStates(src, dst, srcConn, dstConn) } @@ -221,44 +217,47 @@ func ExecuteConnectionStep(src, dst *Chain) (success, last, modified bool, err e return false, false, false, err } + case srcConn.Connection.State == conntypes.OPEN && dstConn.Connection.State == conntypes.OPEN: + last = true + } return true, last, false, nil } -//nolint:interfacer // InitializeConnection creates a new connection on either the source or destination chain . // The identifiers set in the PathEnd's are used to determine which connection ends need to be // initialized. The PathEnds are updated upon a successful transaction. // NOTE: This function may need to be called twice if neither connection exists. -func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmclient.Header, - sh *SyncHeaders) (success, modified bool, err error) { +func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmclient.Header, sh *SyncHeaders) (success, modified bool, err error) { switch { // OpenInit on source // Neither connection has been initialized case src.PathEnd.ConnectionID == "" && dst.PathEnd.ConnectionID == "": - //nolint:staticcheck if src.debug { // TODO: log that we are attempting to create new connection ends } - // cosntruct OpenInit message to be submitted on source chain - msgs := []sdk.Msg{ - src.UpdateClient(dstUpdateHeader), - src.ConnInit(dst.PathEnd), - } + connectionID, found := FindMatchingConnection(src, dst) + if !found { + // construct OpenInit message to be submitted on source chain + msgs := []sdk.Msg{ + src.UpdateClient(dstUpdateHeader), + src.ConnInit(dst.PathEnd), + } - res, success, err := src.SendMsgs(msgs) - if !success { - return false, false, err - } + res, success, err := src.SendMsgs(msgs) + if !success { + return false, false, err + } - // update connection identifier in PathEnd - // use index 1, connection open init is the second message in the transaction - connectionID, err := ParseConnectionIDFromEvents(res.Logs[1].Events) - if err != nil { - return false, false, err + // update connection identifier in PathEnd + // use index 1, connection open init is the second message in the transaction + connectionID, err = ParseConnectionIDFromEvents(res.Logs[1].Events) + if err != nil { + return false, false, err + } } src.PathEnd.ConnectionID = connectionID @@ -267,30 +266,32 @@ func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmc // OpenTry on source // source connection does not exist, but counterparty connection exists case src.PathEnd.ConnectionID == "" && dst.PathEnd.ConnectionID != "": - //nolint:staticcheck if src.debug { // TODO: update logging } - openTry, err := src.ConnTry(dst, dstUpdateHeader.GetHeight().GetRevisionHeight()-1) - if err != nil { - return false, false, err - } + connectionID, found := FindMatchingConnection(src, dst) + if !found { + openTry, err := src.ConnTry(dst, dstUpdateHeader.GetHeight().GetRevisionHeight()-1) + if err != nil { + return false, false, err + } - msgs := []sdk.Msg{ - src.UpdateClient(dstUpdateHeader), - openTry, - } - res, success, err := src.SendMsgs(msgs) - if !success { - return false, false, err - } + msgs := []sdk.Msg{ + src.UpdateClient(dstUpdateHeader), + openTry, + } + res, success, err := src.SendMsgs(msgs) + if !success { + return false, false, err + } - // update connection identifier in PathEnd - // use index 1, connection open try is the second message in the transaction - connectionID, err := ParseConnectionIDFromEvents(res.Logs[1].Events) - if err != nil { - return false, false, err + // update connection identifier in PathEnd + // use index 1, connection open try is the second message in the transaction + connectionID, err = ParseConnectionIDFromEvents(res.Logs[1].Events) + if err != nil { + return false, false, err + } } src.PathEnd.ConnectionID = connectionID @@ -299,30 +300,32 @@ func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmc // OpenTry on counterparty // source connection exists, but counterparty connection does not exist case src.PathEnd.ConnectionID != "" && dst.PathEnd.ConnectionID == "": - //nolint:staticcheck if dst.debug { // TODO: update logging } - openTry, err := dst.ConnTry(src, srcUpdateHeader.GetHeight().GetRevisionHeight()-1) - if err != nil { - return false, false, err - } + connectionID, found := FindMatchingConnection(dst, src) + if !found { + openTry, err := dst.ConnTry(src, srcUpdateHeader.GetHeight().GetRevisionHeight()-1) + if err != nil { + return false, false, err + } - msgs := []sdk.Msg{ - dst.UpdateClient(srcUpdateHeader), - openTry, - } - res, success, err := dst.SendMsgs(msgs) - if !success { - return false, false, err - } + msgs := []sdk.Msg{ + dst.UpdateClient(srcUpdateHeader), + openTry, + } + res, success, err := dst.SendMsgs(msgs) + if !success { + return false, false, err + } - // update connection identifier in PathEnd - // use index 1, connection open try is the second message in the transaction - connectionID, err := ParseConnectionIDFromEvents(res.Logs[1].Events) - if err != nil { - return false, false, err + // update connection identifier in PathEnd + // use index 1, connection open try is the second message in the transaction + connectionID, err = ParseConnectionIDFromEvents(res.Logs[1].Events) + if err != nil { + return false, false, err + } } dst.PathEnd.ConnectionID = connectionID @@ -332,3 +335,38 @@ func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmc return false, true, fmt.Errorf("connection ends already created") } } + +// FindMatchingConnection will determine if there already exists a connection between source and counterparty +// that matches the parameters set in the relayer config. +func FindMatchingConnection(source, counterparty *Chain) (string, bool) { + // TODO: add appropriate offset and limits, along with retries + connectionsResp, err := source.QueryConnections(0, 1000) + if err != nil { + if source.debug { + source.Log(fmt.Sprintf("Error: querying connections on %s failed: %v", source.PathEnd.ChainID, err)) + } + return "", false + } + + for _, connection := range connectionsResp.Connections { + if IsMatchingConnection(source, counterparty, connection) { + // unused connection found + return connection.Id, true + } + } + + return "", false +} + +// IsMatchingConnection determines if given connection matches required conditions +func IsMatchingConnection(source, counterparty *Chain, connection *conntypes.IdentifiedConnection) bool { + // determines version we use is matching with given versions + _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, conntypes.ProtoVersionsToExported(connection.Versions)) + return connection.ClientId == source.PathEnd.ClientID && + connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && + isVersionMatched && connection.DelayPeriod == defaultDelayPeriod && + connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && + (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && connection.Counterparty.ConnectionId == "") || + (connection.State == conntypes.OPEN && (counterparty.PathEnd.ConnectionID == "" || + connection.Counterparty.ConnectionId == counterparty.PathEnd.ConnectionID))) +} From d51b55865594b529d3dde5e8047d7afd48bc724b Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 11:16:27 +0530 Subject: [PATCH 72/88] lint issues fixed --- relayer/connection-tx.go | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index c5b6a4d43..40a2ab3e9 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -58,7 +58,8 @@ func (c *Chain) CreateOpenConnections(dst *Chain, maxRetries uint64, to time.Dur // increment the failures counter and exit if we used all retry attempts case !success: failed++ - c.Log(fmt.Sprintf("retrying transaction...")) + str := ("retrying transaction...") + c.Log(fmt.Sprint(str)) time.Sleep(5 * time.Second) if failed > maxRetries { @@ -113,7 +114,8 @@ func ExecuteConnectionStep(src, dst *Chain) (success, last, modified bool, err e } // Query Connection data from src and dst - srcConn, dstConn, err = QueryConnectionPair(src, dst, int64(sh.GetHeight(src.ChainID))-1, int64(sh.GetHeight(dst.ChainID))-1) + srcConn, dstConn, err = QueryConnectionPair(src, dst, int64(sh.GetHeight(src.ChainID))-1, + int64(sh.GetHeight(dst.ChainID))-1) if err != nil { return false, false, false, err } @@ -145,7 +147,8 @@ func ExecuteConnectionStep(src, dst *Chain) (success, last, modified bool, err e // OpenAck on source if dst is at TRYOPEN and src is on INIT or TRYOPEN (crossing hellos case) // obtain proof of counterparty in TRYOPEN state and submit to source chain to update state // from INIT/TRYOPEN to OPEN. - case (srcConn.Connection.State == conntypes.INIT || srcConn.Connection.State == conntypes.TRYOPEN) && dstConn.Connection.State == conntypes.TRYOPEN: + case (srcConn.Connection.State == conntypes.INIT || srcConn.Connection.State == conntypes.TRYOPEN) && + dstConn.Connection.State == conntypes.TRYOPEN: if src.debug { logConnectionStates(src, dst, srcConn, dstConn) } @@ -225,6 +228,7 @@ func ExecuteConnectionStep(src, dst *Chain) (success, last, modified bool, err e return true, last, false, nil } +//nolint:interfacer // InitializeConnection creates a new connection on either the source or destination chain . // The identifiers set in the PathEnd's are used to determine which connection ends need to be // initialized. The PathEnds are updated upon a successful transaction. @@ -235,6 +239,7 @@ func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmc // OpenInit on source // Neither connection has been initialized case src.PathEnd.ConnectionID == "" && dst.PathEnd.ConnectionID == "": + //nolint:staticcheck if src.debug { // TODO: log that we are attempting to create new connection ends } @@ -266,6 +271,7 @@ func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmc // OpenTry on source // source connection does not exist, but counterparty connection exists case src.PathEnd.ConnectionID == "" && dst.PathEnd.ConnectionID != "": + //nolint:staticcheck if src.debug { // TODO: update logging } @@ -300,6 +306,7 @@ func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmc // OpenTry on counterparty // source connection exists, but counterparty connection does not exist case src.PathEnd.ConnectionID != "" && dst.PathEnd.ConnectionID == "": + //nolint:staticcheck if dst.debug { // TODO: update logging } @@ -336,6 +343,7 @@ func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmc } } +//nolint:staticcheck // FindMatchingConnection will determine if there already exists a connection between source and counterparty // that matches the parameters set in the relayer config. func FindMatchingConnection(source, counterparty *Chain) (string, bool) { @@ -361,12 +369,14 @@ func FindMatchingConnection(source, counterparty *Chain) (string, bool) { // IsMatchingConnection determines if given connection matches required conditions func IsMatchingConnection(source, counterparty *Chain, connection *conntypes.IdentifiedConnection) bool { // determines version we use is matching with given versions - _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, conntypes.ProtoVersionsToExported(connection.Versions)) + _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, + conntypes.ProtoVersionsToExported(connection.Versions)) return connection.ClientId == source.PathEnd.ClientID && connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && isVersionMatched && connection.DelayPeriod == defaultDelayPeriod && connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && - (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && connection.Counterparty.ConnectionId == "") || + (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && + connection.Counterparty.ConnectionId == "") || (connection.State == conntypes.OPEN && (counterparty.PathEnd.ConnectionID == "" || connection.Counterparty.ConnectionId == counterparty.PathEnd.ConnectionID))) } From 9265ef4f15854d4c10b26a3561dde19f07f57d21 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 11:18:15 +0530 Subject: [PATCH 73/88] conflict resolved --- relayer/connection-tx.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index 40a2ab3e9..e487a11d5 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -343,10 +343,10 @@ func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmc } } -//nolint:staticcheck // FindMatchingConnection will determine if there already exists a connection between source and counterparty // that matches the parameters set in the relayer config. func FindMatchingConnection(source, counterparty *Chain) (string, bool) { + //nolint:staticcheck // TODO: add appropriate offset and limits, along with retries connectionsResp, err := source.QueryConnections(0, 1000) if err != nil { From 69c7310f4240a0c3f98d8d77c8b9926324bf1a1c Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 11:20:50 +0530 Subject: [PATCH 74/88] conflict resolved --- relayer/connection-tx.go | 1 - 1 file changed, 1 deletion(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index e487a11d5..389f9ef7e 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -346,7 +346,6 @@ func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmc // FindMatchingConnection will determine if there already exists a connection between source and counterparty // that matches the parameters set in the relayer config. func FindMatchingConnection(source, counterparty *Chain) (string, bool) { - //nolint:staticcheck // TODO: add appropriate offset and limits, along with retries connectionsResp, err := source.QueryConnections(0, 1000) if err != nil { From 0b825f988ee56260fcb6d4691627dd687a97c737 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 11:22:36 +0530 Subject: [PATCH 75/88] conflict resolved --- relayer/connection-tx.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index 389f9ef7e..90920d4ef 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -368,14 +368,11 @@ func FindMatchingConnection(source, counterparty *Chain) (string, bool) { // IsMatchingConnection determines if given connection matches required conditions func IsMatchingConnection(source, counterparty *Chain, connection *conntypes.IdentifiedConnection) bool { // determines version we use is matching with given versions - _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, - conntypes.ProtoVersionsToExported(connection.Versions)) - return connection.ClientId == source.PathEnd.ClientID && - connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && + _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, conntypes.ProtoVersionsToExported(connection.Versions)) + return connection.ClientId == source.PathEnd.ClientID && connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && isVersionMatched && connection.DelayPeriod == defaultDelayPeriod && connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && - (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && - connection.Counterparty.ConnectionId == "") || + (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && connection.Counterparty.ConnectionId == "") || (connection.State == conntypes.OPEN && (counterparty.PathEnd.ConnectionID == "" || connection.Counterparty.ConnectionId == counterparty.PathEnd.ConnectionID))) } From 25d53f5c452cc2755b847fdb6e594f8c051a2821 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 11:24:03 +0530 Subject: [PATCH 76/88] conflict resolved --- relayer/connection-tx.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index 90920d4ef..d481dab10 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -369,7 +369,8 @@ func FindMatchingConnection(source, counterparty *Chain) (string, bool) { func IsMatchingConnection(source, counterparty *Chain, connection *conntypes.IdentifiedConnection) bool { // determines version we use is matching with given versions _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, conntypes.ProtoVersionsToExported(connection.Versions)) - return connection.ClientId == source.PathEnd.ClientID && connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && + return connection.ClientId == source.PathEnd.ClientID && + connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && isVersionMatched && connection.DelayPeriod == defaultDelayPeriod && connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && connection.Counterparty.ConnectionId == "") || From 7eefe93c14b84a558cdbc619207567ea2b8ea869 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 11:28:48 +0530 Subject: [PATCH 77/88] issues fixed --- relayer/connection-tx.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index d481dab10..0a01da1b4 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -233,6 +233,7 @@ func ExecuteConnectionStep(src, dst *Chain) (success, last, modified bool, err e // The identifiers set in the PathEnd's are used to determine which connection ends need to be // initialized. The PathEnds are updated upon a successful transaction. // NOTE: This function may need to be called twice if neither connection exists. +//nolint:lll func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmclient.Header, sh *SyncHeaders) (success, modified bool, err error) { switch { @@ -368,11 +369,12 @@ func FindMatchingConnection(source, counterparty *Chain) (string, bool) { // IsMatchingConnection determines if given connection matches required conditions func IsMatchingConnection(source, counterparty *Chain, connection *conntypes.IdentifiedConnection) bool { // determines version we use is matching with given versions + //nolint:lll _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, conntypes.ProtoVersionsToExported(connection.Versions)) return connection.ClientId == source.PathEnd.ClientID && connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && isVersionMatched && connection.DelayPeriod == defaultDelayPeriod && - connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && + connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && //nolint:lll (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && connection.Counterparty.ConnectionId == "") || (connection.State == conntypes.OPEN && (counterparty.PathEnd.ConnectionID == "" || connection.Counterparty.ConnectionId == counterparty.PathEnd.ConnectionID))) From 0afe8bdc3e9bce637eb4c3d4a7ea1d23d4302c79 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 11:30:19 +0530 Subject: [PATCH 78/88] conflict resolved --- relayer/connection-tx.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index 0a01da1b4..81f2bf1b9 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -369,12 +369,11 @@ func FindMatchingConnection(source, counterparty *Chain) (string, bool) { // IsMatchingConnection determines if given connection matches required conditions func IsMatchingConnection(source, counterparty *Chain, connection *conntypes.IdentifiedConnection) bool { // determines version we use is matching with given versions - //nolint:lll _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, conntypes.ProtoVersionsToExported(connection.Versions)) return connection.ClientId == source.PathEnd.ClientID && connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && isVersionMatched && connection.DelayPeriod == defaultDelayPeriod && - connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && //nolint:lll + connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && connection.Counterparty.ConnectionId == "") || (connection.State == conntypes.OPEN && (counterparty.PathEnd.ConnectionID == "" || connection.Counterparty.ConnectionId == counterparty.PathEnd.ConnectionID))) From a26cc6572dfb98ca4ff8ecd5328b3eaeed3f423f Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 11:34:56 +0530 Subject: [PATCH 79/88] issues fixed --- relayer/connection-tx.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index 81f2bf1b9..ca3e69d78 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -233,8 +233,8 @@ func ExecuteConnectionStep(src, dst *Chain) (success, last, modified bool, err e // The identifiers set in the PathEnd's are used to determine which connection ends need to be // initialized. The PathEnds are updated upon a successful transaction. // NOTE: This function may need to be called twice if neither connection exists. -//nolint:lll -func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmclient.Header, sh *SyncHeaders) (success, modified bool, err error) { +func InitializeConnection(src, dst *Chain, srcUpdateHeader, dstUpdateHeader *tmclient.Header, + sh *SyncHeaders) (success, modified bool, err error) { switch { // OpenInit on source @@ -369,12 +369,14 @@ func FindMatchingConnection(source, counterparty *Chain) (string, bool) { // IsMatchingConnection determines if given connection matches required conditions func IsMatchingConnection(source, counterparty *Chain, connection *conntypes.IdentifiedConnection) bool { // determines version we use is matching with given versions - _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, conntypes.ProtoVersionsToExported(connection.Versions)) + _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, + conntypes.ProtoVersionsToExported(connection.Versions)) return connection.ClientId == source.PathEnd.ClientID && connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && isVersionMatched && connection.DelayPeriod == defaultDelayPeriod && connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && - (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && connection.Counterparty.ConnectionId == "") || + (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && + connection.Counterparty.ConnectionId == "") || (connection.State == conntypes.OPEN && (counterparty.PathEnd.ConnectionID == "" || connection.Counterparty.ConnectionId == counterparty.PathEnd.ConnectionID))) } From 277affe2ebcaaae188126c63d078ed9b75f3b295 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 11:38:46 +0530 Subject: [PATCH 80/88] conflicts resolved --- relayer/connection-tx.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index ca3e69d78..65cb7b614 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -369,14 +369,12 @@ func FindMatchingConnection(source, counterparty *Chain) (string, bool) { // IsMatchingConnection determines if given connection matches required conditions func IsMatchingConnection(source, counterparty *Chain, connection *conntypes.IdentifiedConnection) bool { // determines version we use is matching with given versions - _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, - conntypes.ProtoVersionsToExported(connection.Versions)) + _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, conntypes.ProtoVersionsToExported(connection.Versions)) return connection.ClientId == source.PathEnd.ClientID && connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && isVersionMatched && connection.DelayPeriod == defaultDelayPeriod && connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && - (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && - connection.Counterparty.ConnectionId == "") || + (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && connection.Counterparty.ConnectionId == "") || (connection.State == conntypes.OPEN && (counterparty.PathEnd.ConnectionID == "" || connection.Counterparty.ConnectionId == counterparty.PathEnd.ConnectionID))) } From d5325a70882484facb46a31b3689d8705b36a8b2 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 11:45:08 +0530 Subject: [PATCH 81/88] issues fixed --- relayer/connection-tx.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index 65cb7b614..ca3e69d78 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -369,12 +369,14 @@ func FindMatchingConnection(source, counterparty *Chain) (string, bool) { // IsMatchingConnection determines if given connection matches required conditions func IsMatchingConnection(source, counterparty *Chain, connection *conntypes.IdentifiedConnection) bool { // determines version we use is matching with given versions - _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, conntypes.ProtoVersionsToExported(connection.Versions)) + _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, + conntypes.ProtoVersionsToExported(connection.Versions)) return connection.ClientId == source.PathEnd.ClientID && connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && isVersionMatched && connection.DelayPeriod == defaultDelayPeriod && connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && - (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && connection.Counterparty.ConnectionId == "") || + (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && + connection.Counterparty.ConnectionId == "") || (connection.State == conntypes.OPEN && (counterparty.PathEnd.ConnectionID == "" || connection.Counterparty.ConnectionId == counterparty.PathEnd.ConnectionID))) } From 9757543ad5d7267f3f899f866837735209dad077 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 11:47:10 +0530 Subject: [PATCH 82/88] issues fixed --- relayer/connection-tx.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index ca3e69d78..a0f47e4c7 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -368,15 +368,13 @@ func FindMatchingConnection(source, counterparty *Chain) (string, bool) { // IsMatchingConnection determines if given connection matches required conditions func IsMatchingConnection(source, counterparty *Chain, connection *conntypes.IdentifiedConnection) bool { - // determines version we use is matching with given versions - _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, - conntypes.ProtoVersionsToExported(connection.Versions)) + // determines version we use is matching with given versions //nolint:lll + _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, conntypes.ProtoVersionsToExported(connection.Versions)) return connection.ClientId == source.PathEnd.ClientID && connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && isVersionMatched && connection.DelayPeriod == defaultDelayPeriod && connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && - (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && - connection.Counterparty.ConnectionId == "") || + (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && connection.Counterparty.ConnectionId == "") || (connection.State == conntypes.OPEN && (counterparty.PathEnd.ConnectionID == "" || connection.Counterparty.ConnectionId == counterparty.PathEnd.ConnectionID))) } From 817acf53fd70dd8b8f4cbc6cb460e1c443fb5a91 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 11:53:18 +0530 Subject: [PATCH 83/88] issues fixed --- relayer/connection-tx.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index a0f47e4c7..13b044765 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -368,7 +368,8 @@ func FindMatchingConnection(source, counterparty *Chain) (string, bool) { // IsMatchingConnection determines if given connection matches required conditions func IsMatchingConnection(source, counterparty *Chain, connection *conntypes.IdentifiedConnection) bool { - // determines version we use is matching with given versions //nolint:lll + // determines version we use is matching with given versions + //nolint:lll _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, conntypes.ProtoVersionsToExported(connection.Versions)) return connection.ClientId == source.PathEnd.ClientID && connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && From ec539e37aa7853f3f9295c4c256f86eee55b7a66 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 11:55:22 +0530 Subject: [PATCH 84/88] issues fixed --- relayer/connection-tx.go | 1 - 1 file changed, 1 deletion(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index 13b044765..65cb7b614 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -369,7 +369,6 @@ func FindMatchingConnection(source, counterparty *Chain) (string, bool) { // IsMatchingConnection determines if given connection matches required conditions func IsMatchingConnection(source, counterparty *Chain, connection *conntypes.IdentifiedConnection) bool { // determines version we use is matching with given versions - //nolint:lll _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, conntypes.ProtoVersionsToExported(connection.Versions)) return connection.ClientId == source.PathEnd.ClientID && connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && From bd24dae7ff7b7fb77858f3c099594e1603f8cc67 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 12:01:04 +0530 Subject: [PATCH 85/88] issue resolved --- relayer/connection-tx.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index 65cb7b614..cf85a5565 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -369,11 +369,12 @@ func FindMatchingConnection(source, counterparty *Chain) (string, bool) { // IsMatchingConnection determines if given connection matches required conditions func IsMatchingConnection(source, counterparty *Chain, connection *conntypes.IdentifiedConnection) bool { // determines version we use is matching with given versions + //nolint:lll _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, conntypes.ProtoVersionsToExported(connection.Versions)) return connection.ClientId == source.PathEnd.ClientID && connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && isVersionMatched && connection.DelayPeriod == defaultDelayPeriod && - connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && + connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && //nolint:lll (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && connection.Counterparty.ConnectionId == "") || (connection.State == conntypes.OPEN && (counterparty.PathEnd.ConnectionID == "" || connection.Counterparty.ConnectionId == counterparty.PathEnd.ConnectionID))) From 91b5578e30a69dd3227e7cc5d3c15cd4f12541f6 Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 12:04:53 +0530 Subject: [PATCH 86/88] issue resolved --- relayer/connection-tx.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index cf85a5565..ca3e69d78 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -369,13 +369,14 @@ func FindMatchingConnection(source, counterparty *Chain) (string, bool) { // IsMatchingConnection determines if given connection matches required conditions func IsMatchingConnection(source, counterparty *Chain, connection *conntypes.IdentifiedConnection) bool { // determines version we use is matching with given versions - //nolint:lll - _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, conntypes.ProtoVersionsToExported(connection.Versions)) + _, isVersionMatched := conntypes.FindSupportedVersion(conntypes.DefaultIBCVersion, + conntypes.ProtoVersionsToExported(connection.Versions)) return connection.ClientId == source.PathEnd.ClientID && connection.Counterparty.ClientId == counterparty.PathEnd.ClientID && isVersionMatched && connection.DelayPeriod == defaultDelayPeriod && - connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && //nolint:lll - (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && connection.Counterparty.ConnectionId == "") || + connection.Counterparty.Prefix.String() == defaultChainPrefix.String() && + (((connection.State == conntypes.INIT || connection.State == conntypes.TRYOPEN) && + connection.Counterparty.ConnectionId == "") || (connection.State == conntypes.OPEN && (counterparty.PathEnd.ConnectionID == "" || connection.Counterparty.ConnectionId == counterparty.PathEnd.ConnectionID))) } From 9f116c9e36caef86ba272ea878a5cbedba2dadbd Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 12:47:06 +0530 Subject: [PATCH 87/88] sTrategy changed to strategyType --- cmd/strategy.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/strategy.go b/cmd/strategy.go index 2de147d1b..aa92b8fcb 100644 --- a/cmd/strategy.go +++ b/cmd/strategy.go @@ -9,35 +9,35 @@ import ( // GetStrategyWithOptions sets strategy specific fields. func GetStrategyWithOptions(cmd *cobra.Command, strategy relayer.Strategy) (relayer.Strategy, error) { - switch sTrategy := strategy.(type) { + switch strategyType := strategy.(type) { case *relayer.NaiveStrategy: maxTxSize, err := cmd.Flags().GetString(flagMaxTxSize) if err != nil { - return sTrategy, err + return strategyType, err } txSize, err := strconv.ParseUint(maxTxSize, 10, 64) if err != nil { - return sTrategy, err + return strategyType, err } // set max size of messages in a relay transaction - sTrategy.MaxTxSize = txSize * MB // in MB + strategyType.MaxTxSize = txSize * MB // in MB maxMsgLength, err := cmd.Flags().GetString(flagMaxMsgLength) if err != nil { - return sTrategy, err + return strategyType, err } msgLen, err := strconv.ParseUint(maxMsgLength, 10, 64) if err != nil { - return sTrategy, err + return strategyType, err } // set max length messages in relay transaction - sTrategy.MaxMsgLength = msgLen + strategyType.MaxMsgLength = msgLen - return sTrategy, nil + return strategyType, nil default: return strategy, nil } From 37903965347b6a609d5bd2c3c503eb7683be42fc Mon Sep 17 00:00:00 2001 From: NagaTulasi Date: Tue, 2 Feb 2021 17:07:41 +0530 Subject: [PATCH 88/88] Changes done --- cmd/config.go | 4 +- cmd/root.go | 2 +- go.mod | 21 +-- go.sum | 290 +-------------------------------------- relayer/channel-tx.go | 3 +- relayer/connection-tx.go | 3 +- relayer/controller.go | 4 +- relayer/encoding.go | 2 +- relayer/path.go | 2 +- relayer/pathEnd.go | 8 +- relayer/query.go | 4 +- relayer/relayMsgs.go | 2 +- 12 files changed, 25 insertions(+), 320 deletions(-) diff --git a/cmd/config.go b/cmd/config.go index dceb985b1..d9aaecbd4 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -33,9 +33,9 @@ import ( ) const ( - //ORDERED is exported constant + // ORDERED is exported channel type constant ORDERED = "ORDERED" - //UNORDERED is exported constant + // UNORDERED is exported channel type constant UNORDERED = "UNORDERED" defaultOrder = ORDERED defaultVersion = "ics20-1" diff --git a/cmd/root.go b/cmd/root.go index cdfa35140..fc0ac9d46 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/viper" ) -//MB is ... +// MB is a megabyte const ( MB = 1048576 // in bytes ) diff --git a/go.mod b/go.mod index 784ac3235..d981396c4 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/cosmos/relayer go 1.15 require ( - github.com/Djarvur/go-err113 v0.1.0 // indirect github.com/Microsoft/go-winio v0.4.15 // indirect github.com/avast/retry-go v2.6.0+incompatible github.com/cenkalti/backoff/v3 v3.2.2 // indirect @@ -11,40 +10,30 @@ require ( github.com/cosmos/cosmos-sdk v0.41.0 github.com/cosmos/go-bip39 v1.0.0 github.com/gogo/protobuf v1.3.3 - github.com/golangci/golangci-lint v1.36.0 // indirect - github.com/golangci/misspell v0.3.5 // indirect - github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039 // indirect + github.com/google/go-cmp v0.5.4 // indirect github.com/gorilla/mux v1.8.0 - github.com/gostaticanalysis/analysisutil v0.6.1 // indirect - github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect - github.com/matoous/godox v0.0.0-20200801072554-4fb83dc2941e // indirect + github.com/kr/text v0.2.0 // indirect + github.com/lib/pq v1.9.0 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/moby/term v0.0.0-20201101162038-25d840ce174a // indirect + github.com/onsi/ginkgo v1.14.2 // indirect + github.com/onsi/gomega v1.10.4 // indirect github.com/ory/dockertest/v3 v3.6.2 github.com/pelletier/go-toml v1.8.1 // indirect - github.com/quasilyte/go-ruleguard v0.3.0 // indirect - github.com/quasilyte/regex/syntax v0.0.0-20200805063351-8f842688393c // indirect github.com/sirupsen/logrus v1.7.0 // indirect github.com/spf13/afero v1.5.1 // indirect github.com/spf13/cobra v1.1.1 github.com/spf13/viper v1.7.1 github.com/stretchr/objx v0.3.0 // indirect github.com/stretchr/testify v1.7.0 - github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b // indirect github.com/tendermint/tendermint v0.34.3 github.com/tendermint/tm-db v0.6.3 - github.com/tetafro/godot v1.4.4 // indirect - github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 // indirect - github.com/tomarrell/wrapcheck v0.0.0-20201130113247-1683564d9756 // indirect - golang.org/x/mod v0.4.1 // indirect golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect golang.org/x/text v0.3.5 // indirect gopkg.in/ini.v1 v1.62.0 // indirect gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect - honnef.co/go/tools v0.1.1 // indirect - mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 // indirect ) replace github.com/keybase/go-keychain => github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 diff --git a/go.sum b/go.sum index b35b8a10b..c1f022add 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a h1:wFEQiK85fRsEVF0CRrPAos5LoAryUsIX1kPW/WrIqFw= -4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= @@ -29,13 +27,7 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3 github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5 h1:XTrzB+F8+SpRmbhAH8HLxhiiG6nYNwaBZjrFps1oWEk= -github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= -github.com/Djarvur/go-err113 v0.1.0 h1:uCRZZOdMQ0TZPHYTdYpoC0bLYJKPEHPUJ8MeAa51lNU= -github.com/Djarvur/go-err113 v0.1.0/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= -github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15 h1:qkLXKzb1QoVatRyd/YlXZ/Kg0m5K3SPuoD82jjSOaBc= github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= @@ -43,11 +35,8 @@ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEV github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/OpenPeeDeeP/depguard v1.0.1 h1:VlW4R6jmBIv3/u1JNlawEvJMM4J+dPORPaZasQee8Us= -github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/Workiva/go-datastructures v1.0.52 h1:PLSK6pwn8mYdaoaCZEMsXBpBotr4HHn9abU0yMQt0NI= @@ -59,7 +48,6 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= @@ -70,10 +58,6 @@ github.com/armon/go-metrics v0.3.6 h1:x/tmtOF9cDBoXH7XoAGOz2qqm1DknFD1590XmD/DUJ github.com/armon/go-metrics v0.3.6/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/ashanbrown/forbidigo v1.0.0 h1:QdNXBduDUopc3GW+YVYZn8jzmIMklQiCfdN2N5+dQeE= -github.com/ashanbrown/forbidigo v1.0.0/go.mod h1:PH+zMRWE15yW69fYfe7Kn8nYR6yYyafc3ntEGh2BBAg= -github.com/ashanbrown/makezero v0.0.0-20201205152432-7b7cdbb3025a h1:/U9tbJzDRof4fOR51vwzWdIBsIH6R2yU0KG1MBRM2Js= -github.com/ashanbrown/makezero v0.0.0-20201205152432-7b7cdbb3025a/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= github.com/avast/retry-go v2.6.0+incompatible h1:FelcMrm7Bxacr1/RM8+/eqkDkmVN7tjlsy51dOzB3LI= github.com/avast/retry-go v2.6.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= @@ -86,8 +70,6 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/bombsimon/wsl/v3 v3.1.0 h1:E5SRssoBgtVFPcYWUOFJEcgaySgdtTNYzsSKDOY7ss8= -github.com/bombsimon/wsl/v3 v3.1.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d/go.mod h1:d3C0AkH6BRcvO8T0UEPu53cnw4IbV63x1bEjildYhO0= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.21.0-beta h1:At9hIZdJW0s9E/fAz28nrz6AmcNlSVucCH796ZteX1M= @@ -160,8 +142,6 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/daixiang0/gci v0.2.8 h1:1mrIGMBQsBu0P7j7m1M8Lb+ZeZxsZL+jyGX4YoMJJpg= -github.com/daixiang0/gci v0.2.8/go.mod h1:+4dZ7TISfSmqfAGv59ePaHfNzgGtIkHAhhdKggP1JAc= github.com/danieljoos/wincred v1.0.2 h1:zf4bhty2iLuwgjgpraD2E9UbvO+fe54XXGJbOwe23fU= github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -169,8 +149,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= -github.com/denis-tingajkin/go-header v0.4.2 h1:jEeSF4sdv8/3cT/WY8AgDHUoItNSoEZ7qg9dX7pc218= -github.com/denis-tingajkin/go-header v0.4.2/go.mod h1:eLRHAVXzE5atsKAnNRDB90WHCFFnBUn4RN0nRcs1LJA= github.com/dgraph-io/badger/v2 v2.2007.1/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= github.com/dgraph-io/badger/v2 v2.2007.2 h1:EjjK0KqwaFMlPin1ajhP943VPENHJdEz1KLIegjaI3k= github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= @@ -203,8 +181,6 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/esimonov/ifshort v1.0.0 h1:mcOSoOMVtL4tJyyDTakunR+KFQUywLLAVesiWleGPHU= -github.com/esimonov/ifshort v1.0.0/go.mod h1:yZqNJUrNn20K8Q9n2CrjTKYyVEmX209Hgu+M1LBpeZE= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= @@ -212,9 +188,6 @@ github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqL github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQDg5gKsWoLBOB0n+ZW8s599zru8FJ2/Y= github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= -github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= @@ -225,8 +198,6 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-critic/go-critic v0.5.3 h1:xQEweNxzBNpSqI3wotXZAixRarETng3PTG4pkcrLCOA= -github.com/go-critic/go-critic v0.5.3/go.mod h1:2Lrs1m4jtOnnG/EdezbSpAoL0F2pRW+9HWJUZ+QaktY= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -237,35 +208,11 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g= -github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= -github.com/go-toolsmith/astcopy v1.0.0 h1:OMgl1b1MEpjFQ1m5ztEO06rz5CUd3oBv9RF7+DyvdG8= -github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ= -github.com/go-toolsmith/astequal v1.0.0 h1:4zxD8j3JRFNyLN46lodQuqz3xdKSrur7U/sr0SDS/gQ= -github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= -github.com/go-toolsmith/astfmt v1.0.0 h1:A0vDDXt+vsvLEdbMFJAUBI/uTbRw1ffOPnxsILnFL6k= -github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= -github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod h1:dDStQCHtmZpYOmjRP/8gHHnCCch3Zz3oEgCdZVdtweU= -github.com/go-toolsmith/astp v1.0.0 h1:alXE75TXgcmupDsMK1fRAy0YUzLzqPVvBKoyWV+KPXg= -github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= -github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc= -github.com/go-toolsmith/strparse v1.0.0 h1:Vcw78DnpCAKlM20kSbAyO4mPfJn/lyYA4BJUDxe2Jb4= -github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= -github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= -github.com/go-toolsmith/typep v1.0.2 h1:8xdsa1+FSIH/RhEkgnD1j2CJOy5mNllW1Q9tRiYwvlk= -github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= -github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b h1:khEcpUM4yFcxg4/FHQWkvVRmgijNXRfzkIDHh23ggEo= -github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= -github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= -github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= -github.com/gofrs/flock v0.8.0 h1:MSdYClljsF3PbENUUEx85nkWfJSGfzYI9yEBZOJz6CY= -github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/gateway v1.1.0 h1:u0SuhL9+Il+UbjM9VIE3ntfRujKbvVpFvNB4HbjeVQ0= github.com/gogo/gateway v1.1.0/go.mod h1:S7rR8FRQyG3QFESeSv4l2WnsyzlCLG0CzBbUUo/mbic= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= @@ -297,38 +244,6 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8l github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.2 h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw= github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= -github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= -github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM= -github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= -github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6 h1:YYWNAGTKWhKpcLLt7aSj/odlKrSrelQwlovBpDuf19w= -github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6/go.mod h1:DbHgvLiFKX1Sh2T1w8Q/h4NAI8MHIpzCdnBUDTXU3I0= -github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 h1:9kfjN3AdxcbsZBf8NjltjWihK2QfBBBZuv91cMFfDHw= -github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2NxV+sN8upjjeVYr5W7tyxaT1JVtvhKhOn2ii8= -github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d h1:pXTK/gkVNs7Zyy7WKgLXmpQ5bHTrq5GDsp8R9Qs67g0= -github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d/go.mod h1:ozx7R9SIwqmqf5pRP90DhR2Oay2UIjGuKheCBCNwAYU= -github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a h1:iR3fYXUjHCR97qWS8ch1y9zPNsgXThGwjKPrYfqMPks= -github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= -github.com/golangci/golangci-lint v1.36.0 h1:x9ysLvMFJ2599BdiB3feiJmEJlZpOT9hg4rAQt0Dsiw= -github.com/golangci/golangci-lint v1.36.0/go.mod h1:SZhIZhUXXT/OcDb9rymj0J21mOVikjj51zunqnXM34Y= -github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc h1:gLLhTLMk2/SutryVJ6D4VZCU3CUqr8YloG7FPIBWFpI= -github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod h1:e5tpTHCfVze+7EpLEozzMB3eafxo2KT5veNg1k6byQU= -github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA= -github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= -github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA= -github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= -github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770 h1:EL/O5HGrF7Jaq0yNhBLucz9hTuRzj2LdwGBOaENgxIk= -github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= -github.com/golangci/misspell v0.3.5 h1:pLzmVdl3VxTOncgzHcvLOKirdvcx/TydsClUQXTehjo= -github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= -github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21 h1:leSNB7iYzLYSSx3J/s5sVf4Drkc68W2wm4Ixh/mr0us= -github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod h1:tf5+bzsHdTM0bsB7+8mt0GUMvjCgwLpTapNZHU8AajI= -github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0 h1:HVfrLniijszjS1aiNg8JbBMO2+E1WIQ+j/gL4SQqGPg= -github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= -github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039 h1:XQKc8IYQOeRwVs36tDrEmTgDgP88d5iEURwpmtiAlOM= -github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= -github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys= -github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -338,8 +253,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= @@ -353,7 +266,6 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gookit/color v1.3.6/go.mod h1:R3ogXq2B9rTbXoSHJ1HyUVAZ3poOJHpd9nQmyGZsfvQ= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= @@ -367,16 +279,6 @@ github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gostaticanalysis/analysisutil v0.1.0/go.mod h1:dMhHRU9KTiDcuLGdy87/2gTR8WruwYZrKdRq9m1O6uw= -github.com/gostaticanalysis/analysisutil v0.4.1 h1:/7clKqrVfiVwiBQLM0Uke4KvXnO6JcCTS7HwF2D6wG8= -github.com/gostaticanalysis/analysisutil v0.4.1/go.mod h1:18U/DLpRgIUd459wGxVHE0fRgmo1UgHDcbw7F5idXu0= -github.com/gostaticanalysis/analysisutil v0.6.1 h1:/1JkoHe4DVxur+0wPvi26FoQfe1E3ZGqIXS3aaSLiaw= -github.com/gostaticanalysis/analysisutil v0.6.1/go.mod h1:18U/DLpRgIUd459wGxVHE0fRgmo1UgHDcbw7F5idXu0= -github.com/gostaticanalysis/comment v1.3.0/go.mod h1:xMicKDx7XRXYdVwY9f9wQpDJVnqWxw9wCauCMKp+IBI= -github.com/gostaticanalysis/comment v1.4.1 h1:xHopR5L2lRz6OsjH4R2HG5wRhW9ySl3FsHIvi5pcXwc= -github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.2.1/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= @@ -433,19 +335,9 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jgautheron/goconst v0.0.0-20201117150253-ccae5bf973f3 h1:7nkB9fLPMwtn/R6qfPcHileL/x9ydlhw8XyDrLI1ZXg= -github.com/jgautheron/goconst v0.0.0-20201117150253-ccae5bf973f3/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= -github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a h1:GmsqmapfzSJkm28dhRoHz2tLRbJmqhU86IPgBtN3mmk= -github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a/go.mod h1:xRskid8CManxVta/ALEhJha/pweKBaVG6fWgc0yH25s= -github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3 h1:jNYPNLe3d8smommaoQlK7LOA5ESyUJJ+Wf79ZtA7Vp4= -github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= -github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af h1:KA9BjwUk7KlCh6S9EAGWBt1oExIUv9WyNCiRz5amv48= -github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U= github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= -github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= -github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= @@ -464,8 +356,6 @@ github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= github.com/kkdai/bstream v1.0.0/go.mod h1:FDnDOHt5Yx4p3FaHcioFT0QjDOtgUpvjeZqAs+NVZZA= -github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -475,50 +365,29 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kulti/thelper v0.2.1 h1:H4rSHiB3ALx//SXr+k9OPqKoOw2cAZpIQwVNH1RL5T4= -github.com/kulti/thelper v0.2.1/go.mod h1:vMu2Cizjy/grP+jmsvOFDx1kYP6+PD1lqg4Yu5exl2U= -github.com/kunwardeep/paralleltest v1.0.2 h1:/jJRv0TiqPoEy/Y8dQxCFJhD56uS/pnvtatgTZBHokU= -github.com/kunwardeep/paralleltest v1.0.2/go.mod h1:ZPqNm1fVHPllh5LPVujzbVz1JN2GhLxSfY+oqUsvG30= -github.com/kyoh86/exportloopref v0.1.8 h1:5Ry/at+eFdkX9Vsdw3qU4YkvGtzuVfzT4X7S77LoN/M= -github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2 h1:hRGSmZu7j271trc9sneMrpOW7GN5ngLm8YUZIPzf394= github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.9.0 h1:L8nSXQQzAYByakOFMTwpjRoHsMJklur4Gi59b6VivR8= github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOSqcmlfs= github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY= github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/maratori/testpackage v1.0.1 h1:QtJ5ZjqapShm0w5DosRjg0PRlSdAdlx+W6cCKoALdbQ= -github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU= -github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb h1:RHba4YImhrUVQDHUCe2BNSOz4tVy2yGyXhvYDvxGgeE= -github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= -github.com/matoous/godox v0.0.0-20200801072554-4fb83dc2941e h1:2U5rOmpaB96l35w+NDjMtmmrp2e6a6AJKoc4B5+7UwA= -github.com/matoous/godox v0.0.0-20200801072554-4fb83dc2941e/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mbilski/exhaustivestruct v1.1.0 h1:4ykwscnAFeHJruT+EY3M3vdeP8uXMh0VV2E61iR7XD8= -github.com/mbilski/exhaustivestruct v1.1.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 h1:hLDRPB66XQT/8+wG9WsDpiCvZf1yKO7sz7scAjSlBa0= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= @@ -528,7 +397,6 @@ github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceT github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= @@ -544,15 +412,10 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/moricho/tparallel v0.2.1 h1:95FytivzT6rYzdJLdtfn6m1bfFJylOJK41+lgv/EHf4= -github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8qUplsoSU4k= -github.com/mozilla/tls-observatory v0.0.0-20201209171846-0547674fceff/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nakabonne/nestif v0.3.0 h1:+yOViDGhg8ygGrmII72nV9B/zGxY188TYpfolntsaPw= -github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= @@ -560,14 +423,8 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/nbutton23/zxcvbn-go v0.0.0-20201221231540-e56b841a3c88 h1:o+O3Cd1HO9CTgxE3/C8p5I5Y4C0yYWbF8d4IkfOLtcQ= -github.com/nbutton23/zxcvbn-go v0.0.0-20201221231540-e56b841a3c88/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nishanths/exhaustive v0.1.0 h1:kVlMw8h2LHPMGUVqUj6230oQjjTMFjwcZrnkhXzFfl8= -github.com/nishanths/exhaustive v0.1.0/go.mod h1:S1j9110vxV1ECdCudXRkeMnFQ/DQk9ajLT0Uf2MYZQQ= -github.com/nishanths/predeclared v0.2.1 h1:1TXtjmy4f3YCFjTxRd8zcFHOmoUir+gp0ESzjFzG2sw= -github.com/nishanths/predeclared v0.2.1/go.mod h1:HvkGJcA3naj4lOwnFXFDkFxVtSqQMB9sbB1usJ+xjQE= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= @@ -579,12 +436,14 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M= github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.10.4 h1:NiTx7EEvBzu9sFOD1zORteLSt3o8gnlvZZwSE9TnY9U= github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuKHUCQ= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -625,8 +484,6 @@ github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrap github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d h1:CdDQnGF8Nq9ocOS/xlSptM1N3BbrA6/kmaep5ggwaIA= -github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -637,8 +494,6 @@ github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6J github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/polyfloyd/go-errorlint v0.0.0-20201127212506-19bd8db6546f h1:xAw10KgJqG5NJDfmRqJ05Z0IFblKumjtMeyiOLxj3+4= -github.com/polyfloyd/go-errorlint v0.0.0-20201127212506-19bd8db6546f/go.mod h1:wi9BfjxjF/bwiZ701TzmfKu6UKC357IOAtNr0Td0Lvw= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= @@ -675,17 +530,6 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= -github.com/quasilyte/go-ruleguard v0.2.1-0.20201030093329-408e96760278 h1:5gcJ7tORNCNB2QjOJF+MYjzS9aiWpxhP3gntf7RVrOQ= -github.com/quasilyte/go-ruleguard v0.2.1-0.20201030093329-408e96760278/go.mod h1:2RT/tf0Ce0UDj5y243iWKosQogJd8+1G3Rs2fxmlYnw= -github.com/quasilyte/go-ruleguard v0.3.0 h1:A3OfpsK2ynOTbz/KMi62qWzignjGCOZVChATSf4P+A0= -github.com/quasilyte/go-ruleguard v0.3.0/go.mod h1:p2miAhLp6fERzFNbcuQ4bevXs8rgK//uCHsUDkumITg= -github.com/quasilyte/go-ruleguard/dsl v0.0.0-20210106184943-e47d54850b18/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= -github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mod h1:7JTjp89EGyU1d6XfBiXihJNG37wB2VRkd125Q1u7Plc= -github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 h1:L8QM9bvf68pVdQ3bCFZMDmnt9yqcMBro1pC7F+IPYMY= -github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= -github.com/quasilyte/regex/syntax v0.0.0-20200805063351-8f842688393c h1:+gtJ/Pwj2dgUGlZgTrNFqajGYKZQc7Piqus/S6DK9CE= -github.com/quasilyte/regex/syntax v0.0.0-20200805063351-8f842688393c/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= @@ -698,8 +542,6 @@ github.com/regen-network/protobuf v1.3.2-alpha.regen.4/go.mod h1:/J8/bR1T/NXyIdQ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= @@ -707,23 +549,11 @@ github.com/rs/zerolog v1.20.0 h1:38k9hgtUBdxFwE34yS8rTHmHBa4eN16E4DJlv177LNs= github.com/rs/zerolog v1.20.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryancurrah/gomodguard v1.2.0 h1:YWfhGOrXwLGiqcC/u5EqG6YeS8nh+1fw0HEc85CVZro= -github.com/ryancurrah/gomodguard v1.2.0/go.mod h1:rNqbC4TOIdUDcVMSIpNNAzTbzXAZa6W5lnUepvuMMgQ= -github.com/ryanrolds/sqlclosecheck v0.3.0 h1:AZx+Bixh8zdUBxUA1NxbxVAS78vTPq4rCb8OUZI9xFw= -github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sasha-s/go-deadlock v0.2.0 h1:lMqc+fUb7RrFS3gQLtoQsJ7/6TV/pAIFvBsqX73DK8Y= github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/securego/gosec/v2 v2.6.1 h1:+KCw+uz16FYfFyJ/A5aU6uP7mnrL+j1TbDnk1yN+8R0= -github.com/securego/gosec/v2 v2.6.1/go.mod h1:I76p3NTHBXsGhybUW+cEQ692q2Vp+A0Z6ZLzDIZy+Ao= -github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU= -github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= -github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc= -github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= -github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= @@ -737,11 +567,7 @@ github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIK github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa/go.mod h1:oJyF+mSPHbB5mVY2iO9KV3pTt/QbIkGaO8gQ2WrDbP4= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/sonatard/noctx v0.0.1 h1:VC1Qhl6Oxx9vvWo3UDgrGXYCeKCe3Wbw7qAWL6FrmTY= -github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= -github.com/sourcegraph/go-diff v0.6.1 h1:hmA1LzxW0n1c3Q4YbrFgg4P99GSnebYa3x8gr0HZqLQ= -github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -772,8 +598,6 @@ github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/y github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/ssgreg/nlreturn/v2 v2.1.0 h1:6/s4Rc49L6Uo6RLjhWZGBpWWjfzk2yrf1nIW8m4wgVA= -github.com/ssgreg/nlreturn/v2 v2.1.0/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= @@ -783,7 +607,6 @@ github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As= github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -796,10 +619,6 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca h1:Ld/zXl5t4+D69SiV4JoN7kkfvJdOWlPpfxrzxpLMoUk= github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= -github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ= -github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= -github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b h1:HxLVTlqcHhFAz3nWUcuvpH7WuOMv8LQoCWmruLfFH2U= -github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= github.com/tendermint/btcd v0.1.1 h1:0VcxPfflS2zZ3RiOAHkBiFUcPvbtRj5O7zHmcJWHV7s= @@ -817,43 +636,15 @@ github.com/tendermint/tm-db v0.6.2 h1:DOn8jwCdjJblrCFJbtonEIPD1IuJWpbRUUdR8GWE4R github.com/tendermint/tm-db v0.6.2/go.mod h1:GYtQ67SUvATOcoY8/+x6ylk8Qo02BQyLrAs+yAcLvGI= github.com/tendermint/tm-db v0.6.3 h1:ZkhQcKnB8/2jr5EaZwGndN4owkPsGezW2fSisS9zGbg= github.com/tendermint/tm-db v0.6.3/go.mod h1:lfA1dL9/Y/Y8wwyPp2NMLyn5P5Ptr/gvDFNWtrCWSf8= -github.com/tetafro/godot v1.4.3 h1:pl95xaTCPdCb+l1v+uWrdcY+aiagEg19dv5rfxru57M= -github.com/tetafro/godot v1.4.3/go.mod h1:ah7jjYmOMnIjS9ku2krapvGQrFNtTLo9Z/qB3dGU1eU= -github.com/tetafro/godot v1.4.4 h1:VAtLEoAMmopIzHVWVBrztjVWDeYm1OD/DKqhqXR4828= -github.com/tetafro/godot v1.4.4/go.mod h1:FVDd4JuKliW3UgjswZfJfHq4vAx0bD/Jd5brJjGeaz4= -github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q= -github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= -github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 h1:ig99OeTyDwQWhPe2iw9lwfQVF1KB3Q4fpP3X7/2VBG8= -github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tomarrell/wrapcheck v0.0.0-20200807122107-df9e8bcb914d h1:3EZyvNUMsGD1QA8cu0STNn1L7I77rvhf2IhOcHYQhSw= -github.com/tomarrell/wrapcheck v0.0.0-20200807122107-df9e8bcb914d/go.mod h1:yiFB6fFoV7saXirUGfuK+cPtUh4NX/Hf5y2WC2lehu0= -github.com/tomarrell/wrapcheck v0.0.0-20201130113247-1683564d9756 h1:zV5mu0ESwb+WnzqVaW2z1DdbAP0S46UtjY8DHQupQP4= -github.com/tomarrell/wrapcheck v0.0.0-20201130113247-1683564d9756/go.mod h1:yiFB6fFoV7saXirUGfuK+cPtUh4NX/Hf5y2WC2lehu0= -github.com/tommy-muehle/go-mnd/v2 v2.3.1 h1:a1S4+4HSXDJMgeODJH/t0EEKxcVla6Tasw+Zx9JJMog= -github.com/tommy-muehle/go-mnd/v2 v2.3.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA= -github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= -github.com/ultraware/whitespace v0.0.4 h1:If7Va4cM03mpgrNH9k49/VOicWpGoG70XPBFFODYDsg= -github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/uudashr/gocognit v1.0.1 h1:MoG2fZ0b/Eo7NXoIwCVFLG5JED3qgQz5/NEE+rOsjPs= -github.com/uudashr/gocognit v1.0.1/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.16.0/go.mod h1:YOKImeEosDdBPnxc0gy7INqi3m1zK6A+xl6TwOBhHCA= -github.com/valyala/quicktemplate v1.6.3/go.mod h1:fwPzK2fHuYEODzJ9pkw0ipCPNHZ2tD5KW4lOuSdPKzY= -github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8= github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -916,12 +707,6 @@ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKG golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0 h1:8pl+sMODzuvGJkmj2W4kZihvVb5mKm8pB/X44PIQHv8= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -944,17 +729,13 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 h1:42cLlJJdEh+ySyeUUbEQ5bsTiq8voBeTuweGVkY6Puw= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb h1:eBmm0M9fYhWpKZLjQUUKka/LtIxf46G4fxeEz5KJr9U= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -968,7 +749,6 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -982,7 +762,6 @@ golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1005,21 +784,15 @@ golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201101102859-da207088b7d1 h1:a/mKvvZr9Jcc8oKfcmgzyp7OwF73JPWsQLvH1z2Kxck= -golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM= @@ -1029,28 +802,20 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190307163923-6a08e3108db3/go.mod h1:25r3+/G6/xytQM8iWZKq3Hn0kr0rgFKPUNVEL/dr3z4= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -1061,47 +826,14 @@ golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190916130336-e45ffcd953cc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200110213125-a7a6caa82ab2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200410194907-79a7a3126eef/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200624225443-88f3c62a19ff/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200625211823-6506e20df31f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200812195022-5ae4c3c160a0/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201011145850-ed2f50202694/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201028025901-8cd080b735b3/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201030010431-2feb2bb1ff51/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201114224030-61ea331ec02b/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201118003311-bd56c0adb394/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201230224404-63754364767c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210102185154-773b96fafca2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210104081019-d8d6ddbec6ee/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105210202-9ed45478a130 h1:8qSBr5nyKsEgkP918Pu5FFDZpTtLIjXSo6mrtdVOFfk= -golang.org/x/tools v0.0.0-20210105210202-9ed45478a130/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1214,20 +946,6 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.6 h1:W18jzjh8mfPez+AwGLxmOImucz/IFjpNlrKVnaj2YVc= -honnef.co/go/tools v0.0.1-2020.1.6/go.mod h1:pyyisuGw24ruLjrr1ddx39WE0y9OooInRzEYLhQB2YY= -honnef.co/go/tools v0.1.1 h1:EVDuO03OCZwpV2t/tLLxPmPiomagMoBOgfPt0FM+4IY= -honnef.co/go/tools v0.1.1/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -mvdan.cc/gofumpt v0.1.0 h1:hsVv+Y9UsZ/mFZTxJZuHVI6shSQCtzZ11h1JEFPAZLw= -mvdan.cc/gofumpt v0.1.0/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= -mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I= -mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= -mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo= -mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= -mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7 h1:kAREL6MPwpsk1/PQPFD3Eg7WAQR5mPTWZJaBiG5LDbY= -mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7/go.mod h1:HGC5lll35J70Y5v7vCGb9oLhHoScFwkHDJm/05RdSTc= -mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 h1:HT3e4Krq+IE44tiN36RvVEb6tvqeIdtsVSsxmNPqlFU= -mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7/go.mod h1:hBpJkZE8H/sb+VRFvw2+rBpHNsTBcvSpk61hr8mzXZE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/relayer/channel-tx.go b/relayer/channel-tx.go index af3255aab..30f314123 100644 --- a/relayer/channel-tx.go +++ b/relayer/channel-tx.go @@ -62,8 +62,7 @@ func (c *Chain) CreateOpenChannels(dst *Chain, maxRetries uint64, to time.Durati // In the case of failure, increment the failures counter and exit if this is the 3rd failure case !success: failures++ - str := "retrying transaction..." - c.Log(str) + c.Log("retrying transaction...") time.Sleep(5 * time.Second) if failures > maxRetries { diff --git a/relayer/connection-tx.go b/relayer/connection-tx.go index ca3e69d78..ec3cfc0d8 100644 --- a/relayer/connection-tx.go +++ b/relayer/connection-tx.go @@ -58,8 +58,7 @@ func (c *Chain) CreateOpenConnections(dst *Chain, maxRetries uint64, to time.Dur // increment the failures counter and exit if we used all retry attempts case !success: failed++ - str := ("retrying transaction...") - c.Log(fmt.Sprint(str)) + c.Log("retrying transaction...") time.Sleep(5 * time.Second) if failed > maxRetries { diff --git a/relayer/controller.go b/relayer/controller.go index 2e5adff6f..a4cee4f02 100644 --- a/relayer/controller.go +++ b/relayer/controller.go @@ -4,10 +4,10 @@ import ( "encoding/json" ) -//SendToController is ... +// SendToController is ... var SendToController func(needReply bool, str string) (string, error) -//ControllerUpcall takes action interface type +// ControllerUpcall takes action interface type func ControllerUpcall(action interface{}) (bool, error) { bz, err := json.Marshal(action) if err != nil { diff --git a/relayer/encoding.go b/relayer/encoding.go index 8ecef88bc..181d98f40 100644 --- a/relayer/encoding.go +++ b/relayer/encoding.go @@ -262,7 +262,7 @@ func (pc *ProtoCodec) UnpackAny(any *types.Any, iface interface{}) error { return pc.interfaceRegistry.UnpackAny(any, iface) } -//InterfaceRegistry returns protocodec struct type interfaceRegistry +// InterfaceRegistry returns the ProtoCodec interfaceRegistry func (pc *ProtoCodec) InterfaceRegistry() types.InterfaceRegistry { return pc.interfaceRegistry } diff --git a/relayer/path.go b/relayer/path.go index 7d7377597..e56121a4d 100644 --- a/relayer/path.go +++ b/relayer/path.go @@ -93,7 +93,7 @@ func (p Paths) PathsFromChains(src, dst string) (Paths, error) { return out, nil } -//PathAction is ... +// PathAction is struct type PathAction struct { *Path Type string `json:"type"` diff --git a/relayer/pathEnd.go b/relayer/pathEnd.go index ff4af2bd9..76ba3ee92 100644 --- a/relayer/pathEnd.go +++ b/relayer/pathEnd.go @@ -13,7 +13,7 @@ import ( var ( defaultChainPrefix = commitmenttypes.NewMerklePrefix([]byte("ibc")) defaultDelayPeriod = uint64(0) - //DefaultUpgradePath is .. + // DefaultUpgradePath is the default IBC upgrade path set for an on-chain light client DefaultUpgradePath = []string{"upgrade", "upgradedIBCState"} ) @@ -41,14 +41,14 @@ func OrderFromString(order string) chantypes.Order { } } -//GetOrder is ... +// GetOrder returns the channel order for the path end func (pe *PathEnd) GetOrder() chantypes.Order { return OrderFromString(strings.ToUpper(pe.Order)) } var marshalledChains = map[PathEnd]*Chain{} -//MarshalChain is PathEnd +// MarshalChain is PathEnd func MarshalChain(c *Chain) PathEnd { pe := *c.PathEnd if _, ok := marshalledChains[pe]; !ok { @@ -57,7 +57,7 @@ func MarshalChain(c *Chain) PathEnd { return pe } -//UnmarshalChain returns Marshalled chain +// UnmarshalChain returns Marshalled chain func UnmarshalChain(pe PathEnd) *Chain { if c, ok := marshalledChains[pe]; ok { return c diff --git a/relayer/query.go b/relayer/query.go index 65635e7f8..59140e253 100644 --- a/relayer/query.go +++ b/relayer/query.go @@ -404,7 +404,7 @@ func (c *Chain) QueryUnbondingPeriod() (time.Duration, error) { return res.Params.UnbondingTime, nil } -//QueryUpgradedClient returns upgraded client info +// QueryUpgradedClient returns upgraded client info func (c *Chain) QueryUpgradedClient(height int64) (*codectypes.Any, []byte, clienttypes.Height, error) { req := upgradetypes.QueryCurrentPlanRequest{} @@ -429,7 +429,7 @@ func (c *Chain) QueryUpgradedClient(height int64) (*codectypes.Any, []byte, clie return client, proof, proofHeight, nil } -//QueryUpgradedConsState returns upgraded consensus state and height of client +// QueryUpgradedConsState returns upgraded consensus state and height of client func (c *Chain) QueryUpgradedConsState(height int64) (*codectypes.Any, []byte, clienttypes.Height, error) { req := upgradetypes.QueryUpgradedConsensusStateRequest{ LastHeight: height, diff --git a/relayer/relayMsgs.go b/relayer/relayMsgs.go index 51d93f676..e21ceeddb 100644 --- a/relayer/relayMsgs.go +++ b/relayer/relayMsgs.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -//DeliverMsgsAction is struct +// DeliverMsgsAction is struct type DeliverMsgsAction struct { SrcMsgs []string `json:"src_msgs"` Src PathEnd `json:"src"`