Skip to content

Commit

Permalink
Update import paths and address cosmos#292
Browse files Browse the repository at this point in the history
  • Loading branch information
jackzampolin committed Oct 27, 2020
1 parent fc7c51b commit 990bcdf
Show file tree
Hide file tree
Showing 27 changed files with 37 additions and 35 deletions.
2 changes: 1 addition & 1 deletion AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ contributions under the terms of the [Apache License, Version 2.0]
* Jack Zampolin (@jackzampolin)

[Apache License, Version 2.0]: https://www.apache.org/licenses/LICENSE-2.0
[LICENSE]: https://github.com/ovrclk/relayer/blob/master/LICENSE
[LICENSE]: https://github.com/cosmos/relayer/blob/master/LICENSE
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ all: ci-lint install
# Build / Install
###############################################################################

LD_FLAGS = -X github.com/ovrclk/relayer/cmd.Version=$(VERSION) \
-X github.com/ovrclk/relayer/cmd.Commit=$(COMMIT) \
-X github.com/ovrclk/relayer/cmd.SDKCommit=$(SDKCOMMIT) \
-X github.com/ovrclk/relayer/cmd.GaiaCommit=$(GAIACOMMIT)
LD_FLAGS = -X github.com/cosmos/relayer/cmd.Version=$(VERSION) \
-X github.com/cosmos/relayer/cmd.Commit=$(COMMIT) \
-X github.com/cosmos/relayer/cmd.SDKCommit=$(SDKCOMMIT) \
-X github.com/cosmos/relayer/cmd.GaiaCommit=$(GAIACOMMIT)

BUILD_FLAGS := -ldflags '$(LD_FLAGS)'

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

![GOZ](./docs/images/github-repo-banner.png)

![Relayer Build](https://github.com/ovrclk/relayer/workflows/Build%20then%20run%20CI%20Chains/badge.svg)
![Relayer Build](https://github.com/cosmos/relayer/workflows/Build%20then%20run%20CI%20Chains/badge.svg)

The Cosmos IBC `relayer` package contains a basic relayer implementation that is
meant for users wishing to relay packets/data between sets of IBC enabled chains.
Expand All @@ -27,7 +27,7 @@ If you would like to join a relayer testnet, please [check out the instructions]
| chain | tests | supported ports |
|-------|--------|----------------|
| [`gaia`](https://github.com/cosmos/gaia) | ![gaia](https://github.com/ovrclk/relayer/workflows/TESTING%20-%20gaia%20to%20gaia%20integration/badge.svg) | `transfer` |
| [`gaia`](https://github.com/cosmos/gaia) | ![gaia](https://github.com/cosmos/relayer/workflows/TESTING%20-%20gaia%20to%20gaia%20integration/badge.svg) | `transfer` |

## Demoing the Relayer

Expand Down
3 changes: 2 additions & 1 deletion cmd/chains.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/spf13/cobra"
"gopkg.in/yaml.v2"

"github.com/ovrclk/relayer/relayer"
"github.com/cosmos/relayer/relayer"
)

const (
Expand Down Expand Up @@ -268,6 +268,7 @@ func chainsAddDirCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "add-dir [dir]",
Aliases: []string{"ad"},
Args: cobra.ExactArgs(1),
Short: `Add new chains to the configuration file from a directory
full of chain configuration, useful for adding testnet configurations`,
RunE: func(cmd *cobra.Command, args []string) (err error) {
Expand Down
3 changes: 2 additions & 1 deletion cmd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"time"

"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/ovrclk/relayer/relayer"
"github.com/cosmos/relayer/relayer"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"gopkg.in/yaml.v2"
Expand Down Expand Up @@ -146,6 +146,7 @@ func configAddDirCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "add-dir [dir]",
Aliases: []string{"ad"},
Args: cobra.ExactArgs(1),
Short: `Add new chains and paths to the configuration file from a
directory full of chain and path configuration, useful for adding testnet configurations`,
RunE: func(cmd *cobra.Command, args []string) (err error) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/cosmos/cosmos-sdk/crypto/hd"
"github.com/spf13/cobra"

"github.com/ovrclk/relayer/relayer"
"github.com/cosmos/relayer/relayer"
)

// keysCmd represents the keys command
Expand Down
2 changes: 1 addition & 1 deletion cmd/light.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/cosmos/cosmos-sdk/client/flags"
tmclient "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
"github.com/ovrclk/relayer/relayer"
"github.com/cosmos/relayer/relayer"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/paths.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"
conntypes "github.com/cosmos/cosmos-sdk/x/ibc/core/03-connection/types"
chantypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types"
"github.com/ovrclk/relayer/relayer"
"github.com/cosmos/relayer/relayer"
"github.com/spf13/cobra"
"gopkg.in/yaml.v2"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/cosmos/cosmos-sdk/x/auth/types"
clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"
tmclient "github.com/cosmos/cosmos-sdk/x/ibc/light-clients/07-tendermint/types"
"github.com/ovrclk/relayer/relayer"
"github.com/cosmos/relayer/relayer"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/raw.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"
"github.com/ovrclk/relayer/relayer"
"github.com/cosmos/relayer/relayer"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"os/signal"
"syscall"

"github.com/ovrclk/relayer/relayer"
"github.com/cosmos/relayer/relayer"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/strategy.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strconv"

"github.com/ovrclk/relayer/relayer"
"github.com/cosmos/relayer/relayer"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/testnets.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"time"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/relayer/relayer"
"github.com/gorilla/mux"
"github.com/ovrclk/relayer/relayer"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"strings"

"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/ovrclk/relayer/relayer"
"github.com/cosmos/relayer/relayer"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/xfer.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/spf13/cobra"

"github.com/ovrclk/relayer/relayer"
"github.com/cosmos/relayer/relayer"
)

// NOTE: These commands are registered over in cmd/raw.go
Expand Down
2 changes: 1 addition & 1 deletion dev-env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#/bin/bash -e

RELAYER_DIR="$GOPATH/src/github.com/ovrclk/relayer"
RELAYER_DIR="$GOPATH/src/github.com/cosmos/relayer"
RELAYER_CONF="$HOME/.relayer"
GAIA_CONF="$(pwd)/data"

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/ovrclk/relayer
module github.com/cosmos/relayer

go 1.14

Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.
*/
package main

import "github.com/ovrclk/relayer/cmd"
import "github.com/cosmos/relayer/cmd"

func main() {
cmd.Execute()
Expand Down
2 changes: 1 addition & 1 deletion scripts/config-relayer
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [[ ! -x "$(which jq)" ]]; then
exit 1
fi

RELAYER_DIR="$GOPATH/src/github.com/ovrclk/relayer"
RELAYER_DIR="$GOPATH/src/github.com/cosmos/relayer"
RELAYER_CONF="$HOME/.relayer"
GAIA_CONF="$RELAYER_DIR/data"

Expand Down
2 changes: 1 addition & 1 deletion scripts/config-relayer-akash
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [[ ! -x "$(which jq)" ]]; then
exit 1
fi

RELAYER_DIR="$GOPATH/src/github.com/ovrclk/relayer"
RELAYER_DIR="$GOPATH/src/github.com/cosmos/relayer"
RELAYER_CONF="$HOME/.relayer"
GAIA_CONF="$RELAYER_DIR/data"

Expand Down
2 changes: 1 addition & 1 deletion scripts/config-three
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [[ ! -x "$(which jq)" ]]; then
exit 1
fi

RELAYER_DIR="$GOPATH/src/github.com/ovrclk/relayer"
RELAYER_DIR="$GOPATH/src/github.com/cosmos/relayer"
RELAYER_CONF="$HOME/.relayer"
GAIA_CONF="$RELAYER_DIR/data"

Expand Down
2 changes: 1 addition & 1 deletion scripts/four-chainz
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if [[ ! -x "$(which docker-compose)" ]]; then
exit 1
fi

RELAYER_DIR="$GOPATH/src/github.com/ovrclk/relayer"
RELAYER_DIR="$GOPATH/src/github.com/cosmos/relayer"
RELAYER_CONF="$HOME/.relayer"
ENV_FILE="$RELAYER_DIR/.env"

Expand Down
2 changes: 1 addition & 1 deletion test/relayer_gaia_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ovrclk/relayer/relayer"
"github.com/cosmos/relayer/relayer"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion test/test_chains.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/cosmos/cosmos-sdk/server"
"github.com/stretchr/testify/require"

ry "github.com/ovrclk/relayer/relayer"
ry "github.com/cosmos/relayer/relayer"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion test/test_queries.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
clientypes "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client/types"
"github.com/stretchr/testify/require"

ry "github.com/ovrclk/relayer/relayer"
ry "github.com/cosmos/relayer/relayer"
)

// testClientPair tests that the client for src on dst and dst on src are the only clients on those chains
Expand Down
4 changes: 2 additions & 2 deletions test/test_setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
dc "github.com/ory/dockertest/v3/docker"
"github.com/stretchr/testify/require"

"github.com/ovrclk/relayer/relayer"
ry "github.com/ovrclk/relayer/relayer"
"github.com/cosmos/relayer/relayer"
ry "github.com/cosmos/relayer/relayer"
)

// spinUpTestChains is to be passed any number of test chains with given configuration options
Expand Down
8 changes: 4 additions & 4 deletions testnets/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ echo 'export GOPATH=$HOME/go' >> ~/.profile
echo 'export GOBIN=$GOPATH/bin' >> ~/.profile
echo 'export PATH=$PATH:/usr/local/go/bin:$GOBIN' >> ~/.profile
echo "export GAIA=\$GOPATH/src/github.com/cosmos/gaia" >> ~/.profile
echo "export RELAYER=\$GOPATH/src/github.com/ovrclk/relayer" >> ~/.profile
echo "export RELAYER=\$GOPATH/src/github.com/cosmos/relayer" >> ~/.profile
source ~/.profile

# Set these variables to different values that are specific to your chain
Expand All @@ -101,7 +101,7 @@ export ACCOUNT_PREFIX=cosmos

# Start by downloading and installing both gaia and the relayer
mkdir -p $(dirname $GAIA) && git clone https://github.com/cosmos/gaia $GAIA && cd $GAIA && git checkout $GAIASHA && make install
mkdir -p $(dirname $RELAYER) && git clone https://github.com/ovrclk/relayer $RELAYER && cd $RELAYER && make install
mkdir -p $(dirname $RELAYER) && git clone https://github.com/cosmos/relayer $RELAYER && cd $RELAYER && make install

# Now its time to configure both the relayer and gaia, start with the relayer
cd
Expand Down Expand Up @@ -144,8 +144,8 @@ Once you have your server (you could deploy the relayer on a different machine a

```bash
# install the relayer
export RELAYER=$GOPATH/src/github.com/ovrclk/relayer
mkdir -p $(dirname $RELAYER) && git clone [email protected]:ovrclk/relayer $RELAYER && cd $RELAYER
export RELAYER=$GOPATH/src/github.com/cosmos/relayer
mkdir -p $(dirname $RELAYER) && git clone [email protected]:cosmos/relayer $RELAYER && cd $RELAYER
make install

# then to configure your local relayer to talk to your remote chain
Expand Down

0 comments on commit 990bcdf

Please sign in to comment.