From 3d5780c3432b10b19e4651ffac36af6f31e16be6 Mon Sep 17 00:00:00 2001 From: Alexander Bezobchuk Date: Thu, 6 Jun 2019 11:56:34 -0400 Subject: [PATCH] Merge PR #38: Updates to reflect SDK codec client changes --- cmd/gaiacli/main.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- lcd_test/helpers_test.go | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/gaiacli/main.go b/cmd/gaiacli/main.go index 6581121..0e9247b 100644 --- a/cmd/gaiacli/main.go +++ b/cmd/gaiacli/main.go @@ -141,8 +141,8 @@ func txCmd(cdc *amino.Codec) *cobra.Command { // NOTE: details on the routes added for each module are in the module documentation // NOTE: If making updates here you also need to update the test helper in client/lcd/test_helper.go func registerRoutes(rs *lcd.RestServer) { - client.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc) - app.ModuleBasics.RegisterRESTRoutes(rs.CliCtx, rs.Mux, rs.Cdc) + client.RegisterRoutes(rs.CliCtx, rs.Mux) + app.ModuleBasics.RegisterRESTRoutes(rs.CliCtx, rs.Mux) } func initConfig(cmd *cobra.Command) error { diff --git a/go.mod b/go.mod index f3621b5..eb2dbbc 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.12 require ( github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c // indirect - github.com/cosmos/cosmos-sdk v0.28.2-0.20190605232616-5f9c3fdf8895 + github.com/cosmos/cosmos-sdk v0.28.2-0.20190606154315-3180e68c7b57 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect github.com/google/gofuzz v1.0.0 // indirect github.com/gorilla/mux v1.7.2 // indirect diff --git a/go.sum b/go.sum index 1d8e65f..dc27c36 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8Nz github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cosmos/cosmos-sdk v0.28.2-0.20190605232616-5f9c3fdf8895 h1:JmFq9isbNlpx/afhrMNZc1qwooh80BMw9L3thbZF0HI= -github.com/cosmos/cosmos-sdk v0.28.2-0.20190605232616-5f9c3fdf8895/go.mod h1:MvaJDmjgAK7X1rTnpk8+c6tUFfIZ++iuNCp2sUWzprM= +github.com/cosmos/cosmos-sdk v0.28.2-0.20190606154315-3180e68c7b57 h1:bLViLq/BPtEMhxsYhE5NxxTM664Bt1Z+vM6SJflQXTU= +github.com/cosmos/cosmos-sdk v0.28.2-0.20190606154315-3180e68c7b57/go.mod h1:MvaJDmjgAK7X1rTnpk8+c6tUFfIZ++iuNCp2sUWzprM= github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= 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= diff --git a/lcd_test/helpers_test.go b/lcd_test/helpers_test.go index 3e079f8..e33195f 100644 --- a/lcd_test/helpers_test.go +++ b/lcd_test/helpers_test.go @@ -433,8 +433,8 @@ func startLCD(logger log.Logger, listenAddr string, cdc *codec.Codec, t *testing // NOTE: If making updates here also update cmd/gaia/cmd/gaiacli/main.go func registerRoutes(rs *lcd.RestServer) { - client.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc) - gapp.ModuleBasics.RegisterRESTRoutes(rs.CliCtx, rs.Mux, rs.Cdc) + client.RegisterRoutes(rs.CliCtx, rs.Mux) + gapp.ModuleBasics.RegisterRESTRoutes(rs.CliCtx, rs.Mux) } // Request makes a test LCD test request. It returns a response object and a