From e7777cc7ca936f3240be6115e8bae36fa2977466 Mon Sep 17 00:00:00 2001 From: rigelrozanski Date: Tue, 13 Mar 2018 01:37:50 +0100 Subject: [PATCH] cool module renames --- examples/basecoin/app/app.go | 8 +-- examples/basecoin/app/app_test.go | 16 +++--- examples/basecoin/cmd/basecli/main.go | 2 +- examples/basecoin/x/cool/commands/cooltx.go | 6 +-- examples/basecoin/x/cool/handler.go | 18 +++---- examples/basecoin/x/cool/mapper.go | 2 +- examples/basecoin/x/cool/types.go | 56 ++++++++++----------- 7 files changed, 54 insertions(+), 54 deletions(-) diff --git a/examples/basecoin/app/app.go b/examples/basecoin/app/app.go index bb6308d8c0..77816ba40c 100644 --- a/examples/basecoin/app/app.go +++ b/examples/basecoin/app/app.go @@ -81,14 +81,14 @@ func MakeCodec() *wire.Codec { const msgTypeSend = 0x1 const msgTypeIssue = 0x2 - const msgTypeCool = 0x3 - const msgTypeSetCool = 0x4 + const msgTypeQuiz = 0x3 + const msgTypeSetTrend = 0x4 var _ = oldwire.RegisterInterface( struct{ sdk.Msg }{}, oldwire.ConcreteType{bank.SendMsg{}, msgTypeSend}, oldwire.ConcreteType{bank.IssueMsg{}, msgTypeIssue}, - oldwire.ConcreteType{cool.CoolMsg{}, msgTypeCool}, - oldwire.ConcreteType{cool.SetCoolMsg{}, msgTypeSetCool}, + oldwire.ConcreteType{cool.QuizMsg{}, msgTypeQuiz}, + oldwire.ConcreteType{cool.SetTrendMsg{}, msgTypeSetTrend}, ) const accTypeApp = 0x1 diff --git a/examples/basecoin/app/app_test.go b/examples/basecoin/app/app_test.go index dbc4e00543..0c8771626a 100644 --- a/examples/basecoin/app/app_test.go +++ b/examples/basecoin/app/app_test.go @@ -33,17 +33,17 @@ var ( Outputs: []bank.Output{bank.NewOutput(addr2, coins)}, } - coolMsg1 = cool.CoolMsg{ - Sender: addr1, - CoolerThanCool: "icecold", + coolMsg1 = cool.QuizMsg{ + Sender: addr1, + CoolAnswer: "icecold", } - coolMsg2 = cool.CoolMsg{ - Sender: addr1, - CoolerThanCool: "icecold", + coolMsg2 = cool.QuizMsg{ + Sender: addr1, + CoolAnswer: "icecold", } - setCoolMsg = cool.SetCoolMsg{ + setTrendMsg = cool.SetTrendMsg{ Sender: addr1, Cool: "goodbye", } @@ -65,7 +65,7 @@ func TestMsgs(t *testing.T) { }{ {sendMsg}, {coolMsg1}, - {setCoolMsg}, + {setTrendMsg}, } chainID := "" diff --git a/examples/basecoin/cmd/basecli/main.go b/examples/basecoin/cmd/basecli/main.go index 5985c9677f..74f45dc7e6 100644 --- a/examples/basecoin/cmd/basecli/main.go +++ b/examples/basecoin/cmd/basecli/main.go @@ -62,7 +62,7 @@ func main() { )...) basecliCmd.AddCommand( client.PostCommands( - coolcmd.SetCoolTxCmd(cdc), + coolcmd.SetTrendTxCmd(cdc), )...) // add proxy, version and key info diff --git a/examples/basecoin/x/cool/commands/cooltx.go b/examples/basecoin/x/cool/commands/cooltx.go index fe5f6a625f..128307be8d 100644 --- a/examples/basecoin/x/cool/commands/cooltx.go +++ b/examples/basecoin/x/cool/commands/cooltx.go @@ -29,7 +29,7 @@ func CoolTxCmd(cdc *wire.Codec) *cobra.Command { } // create the message - msg := cool.NewCoolMsg(from, args[0]) + msg := cool.NewQuizMsg(from, args[0]) // build and sign the transaction, then broadcast to Tendermint res, err := builder.SignBuildBroadcast(msg, cdc) @@ -44,7 +44,7 @@ func CoolTxCmd(cdc *wire.Codec) *cobra.Command { } // set what cool transaction -func SetCoolTxCmd(cdc *wire.Codec) *cobra.Command { +func SetTrendTxCmd(cdc *wire.Codec) *cobra.Command { return &cobra.Command{ Use: "setcool [answer]", Short: "You're so cool, tell us what is cool!", @@ -60,7 +60,7 @@ func SetCoolTxCmd(cdc *wire.Codec) *cobra.Command { } // create the message - msg := cool.NewSetCoolMsg(from, args[0]) + msg := cool.NewSetTrendMsg(from, args[0]) // build and sign the transaction, then broadcast to Tendermint res, err := builder.SignBuildBroadcast(msg, cdc) diff --git a/examples/basecoin/x/cool/handler.go b/examples/basecoin/x/cool/handler.go index 72a2979bc0..b8f3134fca 100644 --- a/examples/basecoin/x/cool/handler.go +++ b/examples/basecoin/x/cool/handler.go @@ -22,10 +22,10 @@ import ( func NewHandler(ck bank.CoinKeeper, cm Mapper) sdk.Handler { return func(ctx sdk.Context, msg sdk.Msg) sdk.Result { switch msg := msg.(type) { - case SetCoolMsg: - return handleSetCoolMsg(ctx, cm, msg) - case CoolMsg: - return handleCoolMsg(ctx, ck, cm, msg) + case SetTrendMsg: + return handleSetTrendMsg(ctx, cm, msg) + case QuizMsg: + return handleQuizMsg(ctx, ck, cm, msg) default: errMsg := fmt.Sprintf("Unrecognized cool Msg type: %v", reflect.TypeOf(msg).Name()) return sdk.ErrUnknownRequest(errMsg).Result() @@ -34,22 +34,22 @@ func NewHandler(ck bank.CoinKeeper, cm Mapper) sdk.Handler { } // Handle CoolMsg This is the engine of your module -func handleSetCoolMsg(ctx sdk.Context, cm Mapper, msg SetCoolMsg) sdk.Result { - cm.SetCool(ctx, msg.Cool) +func handleSetTrendMsg(ctx sdk.Context, cm Mapper, msg SetTrendMsg) sdk.Result { + cm.SetTrend(ctx, msg.Cool) return sdk.Result{} } // Handle CoolMsg This is the engine of your module -func handleCoolMsg(ctx sdk.Context, ck bank.CoinKeeper, cm Mapper, msg CoolMsg) sdk.Result { +func handleQuizMsg(ctx sdk.Context, ck bank.CoinKeeper, cm Mapper, msg QuizMsg) sdk.Result { whatsCool := cm.GetCool(ctx) // set default if nothing is set //if whatsCool == "" { - //cm.SetCool(ctx, "icecold") + //cm.SetTrend(ctx, "icecold") //} - if msg.CoolerThanCool == whatsCool { + if msg.CoolAnswer == whatsCool { bonusCoins := sdk.Coins{{whatsCool, 69}} _, err := ck.AddCoins(ctx, msg.Sender, bonusCoins) diff --git a/examples/basecoin/x/cool/mapper.go b/examples/basecoin/x/cool/mapper.go index 9c4d2667bb..7122465891 100644 --- a/examples/basecoin/x/cool/mapper.go +++ b/examples/basecoin/x/cool/mapper.go @@ -24,7 +24,7 @@ func (am Mapper) GetCool(ctx sdk.Context) string { } // Implements sdk.AccountMapper. -func (am Mapper) SetCool(ctx sdk.Context, whatscool string) { +func (am Mapper) SetTrend(ctx sdk.Context, whatscool string) { store := ctx.KVStore(am.key) store.Set(coolKey, []byte(whatscool)) } diff --git a/examples/basecoin/x/cool/types.go b/examples/basecoin/x/cool/types.go index 7f80f968ad..f721bfa19b 100644 --- a/examples/basecoin/x/cool/types.go +++ b/examples/basecoin/x/cool/types.go @@ -10,32 +10,32 @@ import ( // A really cool msg type, these fields are can be entirely arbitrary and // custom to your message -type SetCoolMsg struct { +type SetTrendMsg struct { Sender sdk.Address Cool string } // New cool message -func NewSetCoolMsg(sender sdk.Address, cool string) SetCoolMsg { - return SetCoolMsg{ +func NewSetTrendMsg(sender sdk.Address, cool string) SetTrendMsg { + return SetTrendMsg{ Sender: sender, Cool: cool, } } // enforce the msg type at compile time -var _ sdk.Msg = SetCoolMsg{} +var _ sdk.Msg = SetTrendMsg{} // nolint -func (msg SetCoolMsg) Type() string { return "cool" } -func (msg SetCoolMsg) Get(key interface{}) (value interface{}) { return nil } -func (msg SetCoolMsg) GetSigners() []sdk.Address { return []sdk.Address{msg.Sender} } -func (msg SetCoolMsg) String() string { - return fmt.Sprintf("SetCoolMsg{Sender: %v, Cool: %v}", msg.Sender, msg.Cool) +func (msg SetTrendMsg) Type() string { return "cool" } +func (msg SetTrendMsg) Get(key interface{}) (value interface{}) { return nil } +func (msg SetTrendMsg) GetSigners() []sdk.Address { return []sdk.Address{msg.Sender} } +func (msg SetTrendMsg) String() string { + return fmt.Sprintf("SetTrendMsg{Sender: %v, Cool: %v}", msg.Sender, msg.Cool) } // Validate Basic is used to quickly disqualify obviously invalid messages quickly -func (msg SetCoolMsg) ValidateBasic() sdk.Error { +func (msg SetTrendMsg) ValidateBasic() sdk.Error { if len(msg.Sender) == 0 { return sdk.ErrUnrecognizedAddress(msg.Sender).Trace("") } @@ -49,7 +49,7 @@ func (msg SetCoolMsg) ValidateBasic() sdk.Error { } // Get the bytes for the message signer to sign on -func (msg SetCoolMsg) GetSignBytes() []byte { +func (msg SetTrendMsg) GetSignBytes() []byte { b, err := json.Marshal(msg) if err != nil { panic(err) @@ -59,34 +59,34 @@ func (msg SetCoolMsg) GetSignBytes() []byte { //_______________________________________________________________________ -// A really cool msg type, these fields are can be entirely arbitrary and -// custom to your message -type TestYourCoolnessMsg struct { - Sender sdk.Address - CoolerThanCool string +// A message type to quiz how cool you are. these fields are can be entirely +// arbitrary and custom to your message +type QuizMsg struct { + Sender sdk.Address + CoolAnswer string } // New cool message -func NewTestYourCoolnessMsg(sender sdk.Address, coolerthancool string) TestYourCoolnessMsg { - return TestYourCoolnessMsg{ - Sender: sender, - CoolerThanCool: coolerthancool, +func NewQuizMsg(sender sdk.Address, coolerthancool string) QuizMsg { + return QuizMsg{ + Sender: sender, + CoolAnswer: coolerthancool, } } // enforce the msg type at compile time -var _ sdk.Msg = TestYourCoolnessMsg{} +var _ sdk.Msg = QuizMsg{} // nolint -func (msg TestYourCoolnessMsg) Type() string { return "cool" } -func (msg TestYourCoolnessMsg) Get(key interface{}) (value interface{}) { return nil } -func (msg TestYourCoolnessMsg) GetSigners() []sdk.Address { return []sdk.Address{msg.Sender} } -func (msg TestYourCoolnessMsg) String() string { - return fmt.Sprintf("TestYourCoolnessMsg{Sender: %v, CoolerThanCool: %v}", msg.Sender, msg.CoolerThanCool) +func (msg QuizMsg) Type() string { return "cool" } +func (msg QuizMsg) Get(key interface{}) (value interface{}) { return nil } +func (msg QuizMsg) GetSigners() []sdk.Address { return []sdk.Address{msg.Sender} } +func (msg QuizMsg) String() string { + return fmt.Sprintf("QuizMsg{Sender: %v, CoolAnswer: %v}", msg.Sender, msg.CoolAnswer) } // Validate Basic is used to quickly disqualify obviously invalid messages quickly -func (msg TestYourCoolnessMsg) ValidateBasic() sdk.Error { +func (msg QuizMsg) ValidateBasic() sdk.Error { if len(msg.Sender) == 0 { return sdk.ErrUnrecognizedAddress(msg.Sender).Trace("") } @@ -94,7 +94,7 @@ func (msg TestYourCoolnessMsg) ValidateBasic() sdk.Error { } // Get the bytes for the message signer to sign on -func (msg TestYourCoolnessMsg) GetSignBytes() []byte { +func (msg QuizMsg) GetSignBytes() []byte { b, err := json.Marshal(msg) if err != nil { panic(err)