aboutsummaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-03-11 23:56:44 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-03-11 23:56:44 +0800
commit90f34ed40a1b3c87073d7e2e13b5515cc4cb3940 (patch)
tree6e4bde8570711504da9443be8c9662effe198679 /rpc
parent9e89c803f124e98530067c409a67c03d7ab99ef3 (diff)
downloadgo-tangerine-90f34ed40a1b3c87073d7e2e13b5515cc4cb3940.tar
go-tangerine-90f34ed40a1b3c87073d7e2e13b5515cc4cb3940.tar.gz
go-tangerine-90f34ed40a1b3c87073d7e2e13b5515cc4cb3940.tar.bz2
go-tangerine-90f34ed40a1b3c87073d7e2e13b5515cc4cb3940.tar.lz
go-tangerine-90f34ed40a1b3c87073d7e2e13b5515cc4cb3940.tar.xz
go-tangerine-90f34ed40a1b3c87073d7e2e13b5515cc4cb3940.tar.zst
go-tangerine-90f34ed40a1b3c87073d7e2e13b5515cc4cb3940.zip
Rename Topic to Topics
Diffstat (limited to 'rpc')
-rw-r--r--rpc/api.go2
-rw-r--r--rpc/args.go6
-rw-r--r--rpc/args_test.go6
3 files changed, 7 insertions, 7 deletions
diff --git a/rpc/api.go b/rpc/api.go
index 90d09d281..337611114 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 26a61b1a1..d4d807060 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 ec5400f3f..027624500 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)
// }
}