diff --git a/rpc/api.go b/rpc/api.go index 90d09d2811..337611114a 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -400,7 +400,7 @@ func (self *EthereumApi) MessagesChanged(id int, reply *interface{}) error { } func (p *EthereumApi) WhisperPost(args *WhisperMessageArgs, reply *interface{}) error { - err := p.xeth().Whisper().Post(args.Payload, args.To, args.From, args.Topic, args.Priority, args.Ttl) + err := p.xeth().Whisper().Post(args.Payload, args.To, args.From, args.Topics, args.Priority, args.Ttl) if err != nil { return err } diff --git a/rpc/args.go b/rpc/args.go index 26a61b1a10..d4d8070608 100644 --- a/rpc/args.go +++ b/rpc/args.go @@ -367,7 +367,7 @@ type WhisperMessageArgs struct { Payload string To string From string - Topic []string + Topics []string Priority uint32 Ttl uint32 } @@ -377,7 +377,7 @@ func (args *WhisperMessageArgs) UnmarshalJSON(b []byte) (err error) { Payload string To string From string - Topic []string + Topics []string Priority string Ttl string } @@ -392,7 +392,7 @@ func (args *WhisperMessageArgs) UnmarshalJSON(b []byte) (err error) { args.Payload = obj[0].Payload args.To = obj[0].To args.From = obj[0].From - args.Topic = obj[0].Topic + args.Topics = obj[0].Topics args.Priority = uint32(ethutil.Big(obj[0].Priority).Int64()) args.Ttl = uint32(ethutil.Big(obj[0].Ttl).Int64()) diff --git a/rpc/args_test.go b/rpc/args_test.go index ec5400f3fc..0276245001 100644 --- a/rpc/args_test.go +++ b/rpc/args_test.go @@ -270,7 +270,7 @@ func TestFilterOptions(t *testing.T) { t.Errorf("Address shoud be %#v but is %#v", expected.Address, args.Address) } - // if expected.Topic != args.Topic { + // if expected.Topics != args.Topics { // t.Errorf("Topic shoud be %#v but is %#v", expected.Topic, args.Topic) // } } @@ -316,7 +316,7 @@ func TestWhisperMessageArgs(t *testing.T) { expected.Payload = "0x68656c6c6f20776f726c64" expected.Priority = 100 expected.Ttl = 100 - expected.Topic = []string{"0x68656c6c6f20776f726c64"} + expected.Topics = []string{"0x68656c6c6f20776f726c64"} args := new(WhisperMessageArgs) if err := json.Unmarshal([]byte(input), &args); err != nil { @@ -343,7 +343,7 @@ func TestWhisperMessageArgs(t *testing.T) { t.Errorf("Priority shoud be %#v but is %#v", expected.Priority, args.Priority) } - // if expected.Topic != args.Topic { + // if expected.Topics != args.Topics { // t.Errorf("Topic shoud be %#v but is %#v", expected.Topic, args.Topic) // } }