diff --git a/app/app.go b/app/app.go index 72ea7f946d..9f6bf532d5 100644 --- a/app/app.go +++ b/app/app.go @@ -6,9 +6,6 @@ import ( "os" "path/filepath" - gravity "github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity" - gravitykeeper "github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/keeper" - gravitytypes "github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" @@ -91,6 +88,9 @@ import ( "github.com/tendermint/tendermint/libs/log" tmos "github.com/tendermint/tendermint/libs/os" dbm "github.com/tendermint/tm-db" + gravity "github.com/umee-network/Gravity-Bridge/module/x/gravity" + gravitykeeper "github.com/umee-network/Gravity-Bridge/module/x/gravity/keeper" + gravitytypes "github.com/umee-network/Gravity-Bridge/module/x/gravity/types" appparams "github.com/umee-network/umee/app/params" uibctransfer "github.com/umee-network/umee/x/ibctransfer" diff --git a/app/beta/app.go b/app/beta/app.go index c03981a93a..8a4c3eda49 100644 --- a/app/beta/app.go +++ b/app/beta/app.go @@ -4,9 +4,6 @@ import ( "fmt" "io" - gravity "github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity" - gravitykeeper "github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/keeper" - gravitytypes "github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" @@ -88,6 +85,9 @@ import ( "github.com/tendermint/tendermint/libs/log" tmos "github.com/tendermint/tendermint/libs/os" dbm "github.com/tendermint/tm-db" + gravity "github.com/umee-network/Gravity-Bridge/module/x/gravity" + gravitykeeper "github.com/umee-network/Gravity-Bridge/module/x/gravity/keeper" + gravitytypes "github.com/umee-network/Gravity-Bridge/module/x/gravity/types" customante "github.com/umee-network/umee/ante" umeeapp "github.com/umee-network/umee/app" diff --git a/app/modules.go b/app/modules.go index 000d5b1dca..cc3fe0ad55 100644 --- a/app/modules.go +++ b/app/modules.go @@ -5,7 +5,6 @@ import ( "fmt" "time" - gravitytypes "github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" @@ -23,6 +22,7 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + gravitytypes "github.com/umee-network/Gravity-Bridge/module/x/gravity/types" ) // BankModule defines a custom wrapper around the x/bank module's AppModuleBasic diff --git a/cmd/umeed/cmd/root.go b/cmd/umeed/cmd/root.go index 926b8255f7..c47bedcff5 100644 --- a/cmd/umeed/cmd/root.go +++ b/cmd/umeed/cmd/root.go @@ -6,7 +6,6 @@ import ( "strconv" "strings" - bridgecmd "github.com/Gravity-Bridge/Gravity-Bridge/module/cmd/gravity/cmd" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/keys" @@ -22,6 +21,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" tmcli "github.com/tendermint/tendermint/libs/cli" + bridgecmd "github.com/umee-network/Gravity-Bridge/module/cmd/gravity/cmd" "github.com/umee-network/umee/app" umeeappbeta "github.com/umee-network/umee/app/beta" diff --git a/go.mod b/go.mod index a7c32ff82c..c3d6aa1ab6 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/umee-network/umee go 1.17 require ( - github.com/Gravity-Bridge/Gravity-Bridge/module v1.4.1 github.com/cosmos/cosmos-sdk v0.45.1 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/ibc-go/v2 v2.0.3 @@ -23,6 +22,7 @@ require ( github.com/tendermint/starport v0.19.3 github.com/tendermint/tendermint v0.34.14 github.com/tendermint/tm-db v0.6.6 + github.com/umee-network/Gravity-Bridge/module v1.4.2-0.20220217130213-b3cdbcaa3b93 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa google.golang.org/grpc v1.43.0 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b diff --git a/go.sum b/go.sum index 33e0caf828..800e63d51a 100644 --- a/go.sum +++ b/go.sum @@ -110,8 +110,6 @@ 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-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= -github.com/Gravity-Bridge/Gravity-Bridge/module v1.4.1 h1:bcBNyb8bHTG4f5ohw47yEtVxCnFawW2ubVm7ygHIxck= -github.com/Gravity-Bridge/Gravity-Bridge/module v1.4.1/go.mod h1:lYUvMDrp8YFrGLrZlv1nGRNy6jo/3AgDxnb4KoLXpQw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= @@ -505,7 +503,6 @@ github.com/cosmos/iavl v0.17.1/go.mod h1:7aisPZK8yCpQdy3PMvKeO+bhq1NwDjUwjzxwwRO github.com/cosmos/iavl v0.17.2/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w= github.com/cosmos/iavl v0.17.3 h1:s2N819a2olOmiauVa0WAhoIJq9EhSXE9HDBAoR9k+8Y= github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w= -github.com/cosmos/ibc-go v1.2.2 h1:bs6TZ8Es1kycIu2AHlRZ9dzJ+mveqlLN/0sjWtRH88o= github.com/cosmos/ibc-go v1.2.2/go.mod h1:XmYjsRFOs6Q9Cz+CSsX21icNoH27vQKb3squgnCOCbs= github.com/cosmos/ibc-go/v2 v2.0.2/go.mod h1:XUmW7wmubCRhIEAGtMGS+5IjiSSmcAwihoN/yPGd6Kk= github.com/cosmos/ibc-go/v2 v2.0.3 h1:kZ6SAj7hyxoixsLEUBx431bVGiBW22PCHwkWHafWhXs= @@ -1973,6 +1970,8 @@ github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iL 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/umee-network/Gravity-Bridge/module v1.4.2-0.20220217130213-b3cdbcaa3b93 h1:0yEXG9UfKqzuO6TVCGF3LHxghzlzW517/TDVQfgEzJI= +github.com/umee-network/Gravity-Bridge/module v1.4.2-0.20220217130213-b3cdbcaa3b93/go.mod h1:VHkg8J+GfoaMh2uLg4n39DnfHpJsm7SiYJ/VnV2sJwI= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= 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= diff --git a/price-feeder/go.mod b/price-feeder/go.mod index 8bb98f6baa..6bde19dbd8 100644 --- a/price-feeder/go.mod +++ b/price-feeder/go.mod @@ -8,6 +8,7 @@ require ( github.com/cosmos/cosmos-sdk v0.45.1 github.com/go-playground/validator/v10 v10.10.0 github.com/gorilla/mux v1.8.0 + github.com/gorilla/websocket v1.4.2 github.com/justinas/alice v1.2.0 github.com/prometheus/client_golang v1.12.1 github.com/prometheus/common v0.32.1 @@ -17,7 +18,7 @@ require ( github.com/spf13/cobra v1.3.0 github.com/stretchr/testify v1.7.0 github.com/tendermint/tendermint v0.34.14 - github.com/umee-network/umee v0.7.4 + github.com/umee-network/umee v0.7.1-0.20220217130447-abd380e013db golang.org/x/sync v0.0.0-20210220032951-036812b2e83c google.golang.org/grpc v1.43.0 gopkg.in/yaml.v2 v2.4.0 @@ -28,7 +29,6 @@ require ( github.com/99designs/keyring v1.1.6 // indirect github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect github.com/DataDog/zstd v1.4.5 // indirect - github.com/Gravity-Bridge/Gravity-Bridge/module v1.4.1 // indirect github.com/Workiva/go-datastructures v1.0.52 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect @@ -51,7 +51,7 @@ require ( github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac // indirect github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b // indirect - github.com/ethereum/go-ethereum v1.10.15 // indirect + github.com/ethereum/go-ethereum v1.10.16 // indirect github.com/felixge/httpsnoop v1.0.1 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect github.com/go-kit/kit v0.10.0 // indirect @@ -67,7 +67,6 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/gorilla/handlers v1.5.1 // indirect - github.com/gorilla/websocket v1.4.2 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect @@ -115,6 +114,7 @@ require ( github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tendermint/tm-db v0.6.6 // indirect + github.com/umee-network/Gravity-Bridge/module v1.4.2-0.20220217130213-b3cdbcaa3b93 // indirect github.com/zondax/hid v0.9.0 // indirect go.etcd.io/bbolt v1.3.6 // indirect golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect diff --git a/price-feeder/go.sum b/price-feeder/go.sum index 8c1b616602..0649c9411a 100644 --- a/price-feeder/go.sum +++ b/price-feeder/go.sum @@ -79,8 +79,6 @@ 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/Gravity-Bridge/Gravity-Bridge/module v1.4.1 h1:bcBNyb8bHTG4f5ohw47yEtVxCnFawW2ubVm7ygHIxck= -github.com/Gravity-Bridge/Gravity-Bridge/module v1.4.1/go.mod h1:lYUvMDrp8YFrGLrZlv1nGRNy6jo/3AgDxnb4KoLXpQw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= @@ -255,6 +253,7 @@ 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/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= +github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= @@ -300,8 +299,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= github.com/ethereum/go-ethereum v1.9.25/go.mod h1:vMkFiYLHI4tgPw4k2j4MHKoovchFE8plZ0M9VMk4/oM= github.com/ethereum/go-ethereum v1.10.10/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw= -github.com/ethereum/go-ethereum v1.10.15 h1:E9o0kMbD8HXhp7g6UwIwntY05WTDheCGziMhegcBsQw= -github.com/ethereum/go-ethereum v1.10.15/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw= +github.com/ethereum/go-ethereum v1.10.16 h1:3oPrumn0bCW/idjcxMn5YYVCdK7VzJYIvwGZUGLEaoc= +github.com/ethereum/go-ethereum v1.10.16/go.mod h1:Anj6cxczl+AHy63o4X9O8yWNHuN5wMpfb8MAnHkWn7Y= 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= @@ -495,6 +494,7 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= +github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= 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.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= @@ -590,6 +590,7 @@ github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bS github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= +github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= 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= @@ -624,6 +625,7 @@ github.com/justinas/alice v1.2.0/go.mod h1:fN5HRH/reO/zrUflLfTN43t3vXvKzvZIENsNE github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0= github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/karalabe/usb v0.0.0-20211005121534-4c5740d64559/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= +github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d h1:Z+RDyXzjKE0i2sTjZ/b1uxiGtPhFy34Ou/Tk0qwN0kM= github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= @@ -1029,8 +1031,10 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= -github.com/umee-network/umee v0.7.4 h1:hb5U8QN+IZPcDdVnLulvy1AGxgovXGbsGXVOlcg9PhQ= -github.com/umee-network/umee v0.7.4/go.mod h1:1jcjXMEOvosXPSOpOPHb5axPoaUWBFZS8RbWMmjXyl0= +github.com/umee-network/Gravity-Bridge/module v1.4.2-0.20220217130213-b3cdbcaa3b93 h1:0yEXG9UfKqzuO6TVCGF3LHxghzlzW517/TDVQfgEzJI= +github.com/umee-network/Gravity-Bridge/module v1.4.2-0.20220217130213-b3cdbcaa3b93/go.mod h1:VHkg8J+GfoaMh2uLg4n39DnfHpJsm7SiYJ/VnV2sJwI= +github.com/umee-network/umee v0.7.1-0.20220217130447-abd380e013db h1:KmS8S9TcFMP+R4JdwC4gSZJKsklKt8PUDfLMSXyWSmU= +github.com/umee-network/umee v0.7.1-0.20220217130447-abd380e013db/go.mod h1:QaAkPYVHDOro93fDkkA6Dqj1FrlnAN9KUO92o73kRgY= 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/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= diff --git a/tests/e2e/e2e_setup_test.go b/tests/e2e/e2e_setup_test.go index 30fe3e4451..37e6fdd8e8 100644 --- a/tests/e2e/e2e_setup_test.go +++ b/tests/e2e/e2e_setup_test.go @@ -17,7 +17,6 @@ import ( "testing" "time" - gravitytypes "github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/types" "github.com/cosmos/cosmos-sdk/server" srvconfig "github.com/cosmos/cosmos-sdk/server/config" sdk "github.com/cosmos/cosmos-sdk/types" @@ -32,6 +31,7 @@ import ( tmconfig "github.com/tendermint/tendermint/config" tmjson "github.com/tendermint/tendermint/libs/json" rpchttp "github.com/tendermint/tendermint/rpc/client/http" + gravitytypes "github.com/umee-network/Gravity-Bridge/module/x/gravity/types" "github.com/umee-network/umee/app" leveragetypes "github.com/umee-network/umee/x/leverage/types" diff --git a/tests/e2e/e2e_util_test.go b/tests/e2e/e2e_util_test.go index 3e882b660b..048184ab88 100644 --- a/tests/e2e/e2e_util_test.go +++ b/tests/e2e/e2e_util_test.go @@ -11,7 +11,6 @@ import ( "strconv" "time" - gravitytypes "github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/types" "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" @@ -19,6 +18,7 @@ import ( ethcmn "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/ethclient" "github.com/ory/dockertest/v3/docker" + gravitytypes "github.com/umee-network/Gravity-Bridge/module/x/gravity/types" ) func (s *IntegrationTestSuite) deployERC20Token(baseDenom string) string { diff --git a/tests/e2e/validator.go b/tests/e2e/validator.go index 8dfd627c3d..f51325e2ba 100644 --- a/tests/e2e/validator.go +++ b/tests/e2e/validator.go @@ -7,7 +7,6 @@ import ( "path" "path/filepath" - gravitytypes "github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/types" sdkcrypto "github.com/cosmos/cosmos-sdk/crypto" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/hd" @@ -24,6 +23,7 @@ import ( tmos "github.com/tendermint/tendermint/libs/os" "github.com/tendermint/tendermint/p2p" "github.com/tendermint/tendermint/privval" + gravitytypes "github.com/umee-network/Gravity-Bridge/module/x/gravity/types" umeeappbeta "github.com/umee-network/umee/app/beta" ) diff --git a/tests/simulation/state.go b/tests/simulation/state.go index b666a5c57c..0afed81b1e 100644 --- a/tests/simulation/state.go +++ b/tests/simulation/state.go @@ -8,7 +8,6 @@ import ( "math/rand" "time" - gravitytypes "github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/types" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" "github.com/cosmos/cosmos-sdk/simapp" @@ -21,6 +20,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" tmjson "github.com/tendermint/tendermint/libs/json" tmtypes "github.com/tendermint/tendermint/types" + gravitytypes "github.com/umee-network/Gravity-Bridge/module/x/gravity/types" umeeapp "github.com/umee-network/umee/app" umeeappbeta "github.com/umee-network/umee/app/beta" diff --git a/x/ibctransfer/keeper/keeper_test.go b/x/ibctransfer/keeper/keeper_test.go index 19e36a103d..9df6616e5b 100644 --- a/x/ibctransfer/keeper/keeper_test.go +++ b/x/ibctransfer/keeper/keeper_test.go @@ -5,7 +5,6 @@ import ( "strings" "testing" - gravitytypes "github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/types" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -18,6 +17,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/tendermint/tendermint/crypto" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + gravitytypes "github.com/umee-network/Gravity-Bridge/module/x/gravity/types" umeeapp "github.com/umee-network/umee/app" "github.com/umee-network/umee/tests/util" diff --git a/x/leverage/client/tests/cli_test.go b/x/leverage/client/tests/cli_test.go index bfcc0ee2b8..d96bb87fb0 100644 --- a/x/leverage/client/tests/cli_test.go +++ b/x/leverage/client/tests/cli_test.go @@ -6,9 +6,9 @@ package tests import ( "testing" - gravitytypes "github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" + gravitytypes "github.com/umee-network/Gravity-Bridge/module/x/gravity/types" umeeappbeta "github.com/umee-network/umee/app/beta" ) diff --git a/x/oracle/client/tests/cli_test.go b/x/oracle/client/tests/cli_test.go index bfcc0ee2b8..d96bb87fb0 100644 --- a/x/oracle/client/tests/cli_test.go +++ b/x/oracle/client/tests/cli_test.go @@ -6,9 +6,9 @@ package tests import ( "testing" - gravitytypes "github.com/Gravity-Bridge/Gravity-Bridge/module/x/gravity/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" + gravitytypes "github.com/umee-network/Gravity-Bridge/module/x/gravity/types" umeeappbeta "github.com/umee-network/umee/app/beta" )