Skip to content

Commit 08158dd

Browse files
committed
fix test
1 parent 8025fd2 commit 08158dd

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

x/tokenfactory/types/msgs.go

+6-7
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,15 @@ func NewMsgChangeAdmin(sender, denom, newAdmin string) *MsgChangeAdmin {
161161
}
162162

163163
func (m MsgChangeAdmin) Validate(accAddrCodec address.Codec) error {
164-
if addr, err := accAddrCodec.StringToBytes(m.Sender); err != nil {
164+
if _, err := accAddrCodec.StringToBytes(m.Sender); err != nil {
165165
return err
166-
} else if len(addr) == 0 {
167-
return ErrEmptySender
168166
}
169167

170-
if addr, err := accAddrCodec.StringToBytes(m.NewAdmin); err != nil {
171-
return err
172-
} else if len(addr) == 0 {
173-
return ErrEmptyNewAdmin
168+
// allow empty address
169+
if len(m.NewAdmin) > 0 {
170+
if _, err := accAddrCodec.StringToBytes(m.NewAdmin); err != nil {
171+
return err
172+
}
174173
}
175174

176175
if _, _, err := DeconstructDenom(accAddrCodec, m.Denom); err != nil {

x/tokenfactory/types/msgs_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -374,39 +374,39 @@ func TestMsgChangeAdmin(t *testing.T) {
374374

375375
tests := []struct {
376376
name string
377-
msg func() *types.MsgChangeAdmin
377+
msg func() types.MsgChangeAdmin
378378
expectPass bool
379379
}{
380380
{
381381
name: "proper msg",
382-
msg: func() *types.MsgChangeAdmin {
383-
msg := baseMsg
382+
msg: func() types.MsgChangeAdmin {
383+
msg := *baseMsg
384384
return msg
385385
},
386386
expectPass: true,
387387
},
388388
{
389389
name: "empty sender",
390-
msg: func() *types.MsgChangeAdmin {
391-
msg := baseMsg
390+
msg: func() types.MsgChangeAdmin {
391+
msg := *baseMsg
392392
msg.Sender = ""
393393
return msg
394394
},
395395
expectPass: false,
396396
},
397397
{
398398
name: "empty newAdmin",
399-
msg: func() *types.MsgChangeAdmin {
400-
msg := baseMsg
399+
msg: func() types.MsgChangeAdmin {
400+
msg := *baseMsg
401401
msg.NewAdmin = ""
402402
return msg
403403
},
404-
expectPass: false,
404+
expectPass: true,
405405
},
406406
{
407407
name: "invalid denom",
408-
msg: func() *types.MsgChangeAdmin {
409-
msg := baseMsg
408+
msg: func() types.MsgChangeAdmin {
409+
msg := *baseMsg
410410
msg.Denom = "bitcoin"
411411
return msg
412412
},

0 commit comments

Comments
 (0)