Repository: cosmos/relayer
Pull request #633 (2022-03-28 20:57:29)

concatenate `v2` to the module name & fix import paths
Changed the module in `go.mod` from `github.com/cosmos/relayer` to `github.com/cosmos/relayer/v2`
Changed the import paths appropriately as well across the codebase 


Patch:
diff --git a/clib/main.go b/clib/main.go
index df8a129..8048b36 100644
--- a/clib/main.go
+++ b/clib/main.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/cosmos/relayer/cmd"
-	"github.com/cosmos/relayer/relayer"
+	"github.com/cosmos/relayer/v2/cmd"
+	"github.com/cosmos/relayer/v2/relayer"
 )
 
 type goReturn = struct {
diff --git a/cmd/appstate.go b/cmd/appstate.go
index 2140abf..1091894 100644
--- a/cmd/appstate.go
+++ b/cmd/appstate.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/cosmos/relayer/relayer"
+	"github.com/cosmos/relayer/v2/relayer"
 	"github.com/spf13/viper"
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v3"
diff --git a/cmd/chains.go b/cmd/chains.go
index cdcef46..52a5547 100644
--- a/cmd/chains.go
+++ b/cmd/chains.go
@@ -9,8 +9,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/cosmos/relayer/relayer"
-	"github.com/cosmos/relayer/relayer/provider/cosmos"
+	"github.com/cosmos/relayer/v2/relayer"
+	"github.com/cosmos/relayer/v2/relayer/provider/cosmos"
 	"github.com/spf13/cobra"
 	registry "github.com/strangelove-ventures/lens/client/chain_registry"
 	"go.uber.org/zap"
diff --git a/cmd/config.go b/cmd/config.go
index c022cf1..1820276 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -31,9 +31,9 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/cosmos/relayer/relayer"
-	"github.com/cosmos/relayer/relayer/provider"
-	"github.com/cosmos/relayer/relayer/provider/cosmos"
+	"github.com/cosmos/relayer/v2/relayer"
+	"github.com/cosmos/relayer/v2/relayer/provider"
+	"github.com/cosmos/relayer/v2/relayer/provider/cosmos"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v3"
diff --git a/cmd/paths.go b/cmd/paths.go
index c30d590..59e2c5f 100644
--- a/cmd/paths.go
+++ b/cmd/paths.go
@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/cosmos/relayer/relayer"
+	"github.com/cosmos/relayer/v2/relayer"
 	"github.com/go-git/go-git/v5"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v3"
diff --git a/cmd/query.go b/cmd/query.go
index ced321c..db333c2 100644
--- a/cmd/query.go
+++ b/cmd/query.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported"
-	"github.com/cosmos/relayer/helpers"
-	"github.com/cosmos/relayer/relayer"
+	"github.com/cosmos/relayer/v2/helpers"
+	"github.com/cosmos/relayer/v2/relayer"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/start.go b/cmd/start.go
index 9f195a6..3c5651e 100644
--- a/cmd/start.go
+++ b/cmd/start.go
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/avast/retry-go/v4"
-	"github.com/cosmos/relayer/relayer"
+	"github.com/cosmos/relayer/v2/relayer"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
diff --git a/cmd/tx.go b/cmd/tx.go
index e4e3a25..8df9c35 100644
--- a/cmd/tx.go
+++ b/cmd/tx.go
@@ -11,7 +11,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
 	"github.com/cosmos/ibc-go/v3/modules/core/exported"
-	"github.com/cosmos/relayer/relayer"
+	"github.com/cosmos/relayer/v2/relayer"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 )
diff --git a/go.mod b/go.mod
index e2c7c29..22e0e08 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/cosmos/relayer
+module github.com/cosmos/relayer/v2
 
 go 1.17
 
diff --git a/helpers/query.go b/helpers/query.go
index 2a9cc3e..4e04780 100644
--- a/helpers/query.go
+++ b/helpers/query.go
@@ -6,7 +6,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported"
-	"github.com/cosmos/relayer/relayer"
+	"github.com/cosmos/relayer/v2/relayer"
 )
 
 // QueryBalance is a helper function for query balance
diff --git a/main.go b/main.go
index 50ab0e9..2dd1b6e 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,6 @@
 package main
 
-import "github.com/cosmos/relayer/cmd"
+import "github.com/cosmos/relayer/v2/cmd"
 
 func main() {
 	cmd.Execute()
diff --git a/relayer/chain.go b/relayer/chain.go
index a7b6061..2d33f86 100644
--- a/relayer/chain.go
+++ b/relayer/chain.go
@@ -33,7 +33,7 @@ import (
 	"github.com/cosmos/ibc-go/v3/modules/apps/transfer"
 	ibc "github.com/cosmos/ibc-go/v3/modules/core"
 	clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
-	"github.com/cosmos/relayer/relayer/provider"
+	"github.com/cosmos/relayer/v2/relayer/provider"
 	"github.com/gogo/protobuf/proto"
 	"go.uber.org/zap"
 )
diff --git a/relayer/channel.go b/relayer/channel.go
index 1de56e0..9d4baf0 100644
--- a/relayer/channel.go
+++ b/relayer/channel.go
@@ -10,7 +10,7 @@ import (
 	chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
 	host "github.com/cosmos/ibc-go/v3/modules/core/24-host"
 	"github.com/cosmos/ibc-go/v3/modules/core/exported"
-	"github.com/cosmos/relayer/relayer/provider"
+	"github.com/cosmos/relayer/v2/relayer/provider"
 	"go.uber.org/zap"
 )
 
diff --git a/relayer/client.go b/relayer/client.go
index f904221..94ed4e1 100644
--- a/relayer/client.go
+++ b/relayer/client.go
@@ -8,7 +8,7 @@ import (
 	"github.com/avast/retry-go/v4"
 	clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
 	ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported"
-	"github.com/cosmos/relayer/relayer/provider"
+	"github.com/cosmos/relayer/v2/relayer/provider"
 	"go.uber.org/zap"
 )
 
diff --git a/relayer/connection.go b/relayer/connection.go
index 877f7b8..e57357b 100644
--- a/relayer/connection.go
+++ b/relayer/connection.go
@@ -8,7 +8,7 @@ import (
 	"github.com/avast/retry-go/v4"
 	conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types"
 	"github.com/cosmos/ibc-go/v3/modules/core/exported"
-	"github.com/cosmos/relayer/relayer/provider"
+	"github.com/cosmos/relayer/v2/relayer/provider"
 	"go.uber.org/zap"
 )
 
diff --git a/relayer/log-chain.go b/relayer/log-chain.go
index e72bc51..044dd16 100644
--- a/relayer/log-chain.go
+++ b/relayer/log-chain.go
@@ -3,8 +3,8 @@ package relayer
 import (
 	"fmt"
 
-	"github.com/cosmos/relayer/relayer/provider"
-	"github.com/cosmos/relayer/relayer/provider/cosmos"
+	"github.com/cosmos/relayer/v2/relayer/provider"
+	"github.com/cosmos/relayer/v2/relayer/provider/cosmos"
 	"go.uber.org/zap"
 
 	conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types"
diff --git a/relayer/naive-strategy.go b/relayer/naive-strategy.go
index d170eca..2f5aa45 100644
--- a/relayer/naive-strategy.go
+++ b/relayer/naive-strategy.go
@@ -7,7 +7,7 @@ import (
 	"github.com/avast/retry-go/v4"
 	chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
 	ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported"
-	"github.com/cosmos/relayer/relayer/provider"
+	"github.com/cosmos/relayer/v2/relayer/provider"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 )
diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go
index f826af9..c384496 100644
--- a/relayer/packet-tx.go
+++ b/relayer/packet-tx.go
@@ -7,7 +7,7 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
-	"github.com/cosmos/relayer/relayer/provider"
+	"github.com/cosmos/relayer/v2/relayer/provider"
 )
 
 //nolint:lll
diff --git a/relayer/provider/cosmos/log.go b/relayer/provider/cosmos/log.go
index 626d099..b85af50 100644
--- a/relayer/provider/cosmos/log.go
+++ b/relayer/provider/cosmos/log.go
@@ -2,7 +2,7 @@ package cosmos
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/relayer/relayer/provider"
+	"github.com/cosmos/relayer/v2/relayer/provider"
 	"go.uber.org/zap"
 )
 
diff --git a/relayer/provider/cosmos/provider.go b/relayer/provider/cosmos/provider.go
index 1748553..da0037c 100644
--- a/relayer/provider/cosmos/provider.go
+++ b/relayer/provider/cosmos/provider.go
@@ -26,7 +26,7 @@ import (
 	host "github.com/cosmos/ibc-go/v3/modules/core/24-host"
 	ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported"
 	tmclient "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
-	"github.com/cosmos/relayer/relayer/provider"
+	"github.com/cosmos/relayer/v2/relayer/provider"
 	"github.com/gogo/protobuf/proto"
 	"github.com/pkg/errors"
 	lens "github.com/strangelove-ventures/lens/client"
diff --git a/relayer/provider/cosmos/relayer_packets.go b/relayer/provider/cosmos/relayer_packets.go
index 1abae83..8908aa5 100644
--- a/relayer/provider/cosmos/relayer_packets.go
+++ b/relayer/provider/cosmos/relayer_packets.go
@@ -6,7 +6,7 @@ import (
 
 	clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
 	chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
-	"github.com/cosmos/relayer/relayer/provider"
+	"github.com/cosmos/relayer/v2/relayer/provider"
 )
 
 var (
diff --git a/relayer/query.go b/relayer/query.go
index a7d2743..bb38e07 100644
--- a/relayer/query.go
+++ b/relayer/query.go
@@ -11,7 +11,7 @@ import (
 	chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
 	ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported"
 	tmclient "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
-	"github.com/cosmos/relayer/relayer/provider"
+	"github.com/cosmos/relayer/v2/relayer/provider"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 )
diff --git a/relayer/relayMsgs.go b/relayer/relayMsgs.go
index b7c08ec..3d480ba 100644
--- a/relayer/relayMsgs.go
+++ b/relayer/relayMsgs.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cosmos/relayer/relayer/provider"
-	"github.com/cosmos/relayer/relayer/provider/cosmos"
+	"github.com/cosmos/relayer/v2/relayer/provider"
+	"github.com/cosmos/relayer/v2/relayer/provider/cosmos"
 	"go.uber.org/zap"
 )
 


Test patch:
diff --git a/_test/relayer_chain_test.go b/_test/relayer_chain_test.go
index 9fc7477..ae5ef61 100644
--- a/_test/relayer_chain_test.go
+++ b/_test/relayer_chain_test.go
@@ -12,8 +12,8 @@ import (
 	ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
 	ibctesting "github.com/cosmos/ibc-go/v3/testing"
 	ibctestingmock "github.com/cosmos/ibc-go/v3/testing/mock"
-	"github.com/cosmos/relayer/cmd"
-	"github.com/cosmos/relayer/relayer"
+	"github.com/cosmos/relayer/v2/cmd"
+	"github.com/cosmos/relayer/v2/relayer"
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/crypto/tmhash"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
diff --git a/_test/test_chains.go b/_test/test_chains.go
index da86b26..7d79f74 100644
--- a/_test/test_chains.go
+++ b/_test/test_chains.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/cosmos/cosmos-sdk/server"
-	"github.com/cosmos/relayer/relayer"
-	"github.com/cosmos/relayer/relayer/provider/cosmos"
+	"github.com/cosmos/relayer/v2/relayer"
+	"github.com/cosmos/relayer/v2/relayer/provider/cosmos"
 	dc "github.com/ory/dockertest/v3/docker"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
diff --git a/_test/test_queries.go b/_test/test_queries.go
index bfbc3f8..8ac062a 100644
--- a/_test/test_queries.go
+++ b/_test/test_queries.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/avast/retry-go/v4"
 	clientypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
-	"github.com/cosmos/relayer/relayer"
+	"github.com/cosmos/relayer/v2/relayer"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/_test/test_setup.go b/_test/test_setup.go
index 8ef3d4c..afbdac9 100644
--- a/_test/test_setup.go
+++ b/_test/test_setup.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cosmos/relayer/relayer"
+	"github.com/cosmos/relayer/v2/relayer"
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
 
diff --git a/cmd/chains_test.go b/cmd/chains_test.go
index 30a5f6e..9faddcd 100644
--- a/cmd/chains_test.go
+++ b/cmd/chains_test.go
@@ -7,8 +7,8 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/cosmos/relayer/cmd"
-	"github.com/cosmos/relayer/relayer/provider/cosmos"
+	"github.com/cosmos/relayer/v2/cmd"
+	"github.com/cosmos/relayer/v2/relayer/provider/cosmos"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/keys_test.go b/cmd/keys_test.go
index 1322fd4..1221869 100644
--- a/cmd/keys_test.go
+++ b/cmd/keys_test.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client/keys"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
-	"github.com/cosmos/relayer/cmd"
-	"github.com/cosmos/relayer/relayer/provider/cosmos"
+	"github.com/cosmos/relayer/v2/cmd"
+	"github.com/cosmos/relayer/v2/relayer/provider/cosmos"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/cmd/system_test.go b/cmd/system_test.go
index 65d9590..b3b2fd0 100644
--- a/cmd/system_test.go
+++ b/cmd/system_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/cosmos/relayer/cmd"
+	"github.com/cosmos/relayer/v2/cmd"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest"