Merge upstream

cosmos · May 21, 2019 · 5ff5446 · 5ff5446
1 parent c70fbb9
commit 5ff5446
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/cmd/gaiacli/main.go b/cmd/gaiacli/main.go
@@ -176,7 +176,7 @@ func registerRoutes(rs *lcd.RestServer) {
 	dist.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc, distcmd.StoreKey)
 	staking.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc, rs.KeyBase)
 	slashing.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc, rs.KeyBase)
-	gov.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc, paramsrest.ProposalRESTHandler(rs.CliCtx, rs.Cdc))
+	gov.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc, paramsrest.ProposalRESTHandler(rs.CliCtx, rs.Cdc), dist.ProposalRESTHandler(rs.CliCtx, rs.Cdc))
 	mintrest.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc)
 }
 

diff --git a/go.mod b/go.mod
@@ -36,6 +36,6 @@ require (
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )
 
-replace github.com/cosmos/cosmos-sdk => github.com/cryptiumlabs/cosmos-sdk-proposal-7 v0.28.2-0.20190520164151-6e1dbddad494
+replace github.com/cosmos/cosmos-sdk => github.com/cryptiumlabs/cosmos-sdk-proposal-7 v0.28.2-0.20190521082256-a74daafffb48
 
 replace golang.org/x/crypto => github.com/tendermint/crypto v0.0.0-20180820045704-3764759f34a5
diff --git a/go.sum b/go.sum
@@ -51,6 +51,8 @@ github.com/cryptiumlabs/cosmos-sdk-proposal-7 v0.28.2-0.20190520160852-d04c9a31f
 github.com/cryptiumlabs/cosmos-sdk-proposal-7 v0.28.2-0.20190520160852-d04c9a31f93b/go.mod h1:I62zQ9u72HHY+V5gNVG2oHyyKJTnD2ZT/CJRr4j3JG0=
 github.com/cryptiumlabs/cosmos-sdk-proposal-7 v0.28.2-0.20190520164151-6e1dbddad494 h1:VGyzIwhwokBg7kayaM8DisP8+E7xzAL21dHbNuxdkg8=
 github.com/cryptiumlabs/cosmos-sdk-proposal-7 v0.28.2-0.20190520164151-6e1dbddad494/go.mod h1:asKfALbDgAL4BGwQdoYwEyfRIPHL20mA2Esan1ELVB4=
+github.com/cryptiumlabs/cosmos-sdk-proposal-7 v0.28.2-0.20190521082256-a74daafffb48 h1:cq/bdnH53zrVCLuJxHGNIpvmO01qorN1fqUAAKifvn0=
+github.com/cryptiumlabs/cosmos-sdk-proposal-7 v0.28.2-0.20190521082256-a74daafffb48/go.mod h1:asKfALbDgAL4BGwQdoYwEyfRIPHL20mA2Esan1ELVB4=
 github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

diff --git a/lcd_test/helpers_test.go b/lcd_test/helpers_test.go
@@ -40,7 +40,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	distr "github.com/cosmos/cosmos-sdk/x/distribution"
 	distrrest "github.com/cosmos/cosmos-sdk/x/distribution/client/rest"
-	distrcutils "github.com/cosmos/cosmos-sdk/x/distribution/client/utils"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	"github.com/cosmos/cosmos-sdk/x/gov"
 	govrest "github.com/cosmos/cosmos-sdk/x/gov/client/rest"
@@ -439,7 +438,7 @@ func registerRoutes(rs *lcd.RestServer) {
 	distrrest.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc, distr.StoreKey)
 	stakingrest.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc, rs.KeyBase)
 	slashingrest.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc, rs.KeyBase)
-	govrest.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc, paramsrest.ProposalRESTHandler(rs.CliCtx, rs.Cdc))
+	govrest.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc, paramsrest.ProposalRESTHandler(rs.CliCtx, rs.Cdc), distrrest.ProposalRESTHandler(rs.CliCtx, rs.Cdc))
 	mintrest.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc)
 }
 
@@ -1234,7 +1233,7 @@ func doSubmitCommunityPoolSpendProposal(
 	from := acc.GetAddress().String()
 
 	baseReq := rest.NewBaseReq(from, "", chainID, "", "", accnum, sequence, fees, nil, false)
-	pr := distrcutils.CommunityPoolSpendProposalReq{
+	pr := distrrest.CommunityPoolSpendProposalReq{
 		BaseReq:     baseReq,
 		Title:       "Test",
 		Description: "test",