diff options
author | lash <nolash@users.noreply.github.com> | 2018-12-01 14:07:18 +0800 |
---|---|---|
committer | Viktor TrĂ³n <viktor.tron@gmail.com> | 2018-12-01 14:07:18 +0800 |
commit | 085f89172f0af9d9685d228ad163d639041f1217 (patch) | |
tree | 5b7d0533a0e3dd99252e1285f2b97f02ea7fbcc9 | |
parent | 54abb97e3be4fb2d6f557758aaa3a8291b0979fe (diff) | |
download | dexon-085f89172f0af9d9685d228ad163d639041f1217.tar dexon-085f89172f0af9d9685d228ad163d639041f1217.tar.gz dexon-085f89172f0af9d9685d228ad163d639041f1217.tar.bz2 dexon-085f89172f0af9d9685d228ad163d639041f1217.tar.lz dexon-085f89172f0af9d9685d228ad163d639041f1217.tar.xz dexon-085f89172f0af9d9685d228ad163d639041f1217.tar.zst dexon-085f89172f0af9d9685d228ad163d639041f1217.zip |
swarm/pss: Add same api interface for all Send* methods (#18218)
-rw-r--r-- | swarm/pss/api.go | 4 | ||||
-rw-r--r-- | swarm/pss/pss_test.go | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/swarm/pss/api.go b/swarm/pss/api.go index dd55b2a70..587382d72 100644 --- a/swarm/pss/api.go +++ b/swarm/pss/api.go @@ -164,6 +164,10 @@ func (pssapi *API) SendSym(symkeyhex string, topic Topic, msg hexutil.Bytes) err return pssapi.Pss.SendSym(symkeyhex, topic, msg[:]) } +func (pssapi *API) SendRaw(addr hexutil.Bytes, topic Topic, msg hexutil.Bytes) error { + return pssapi.Pss.SendRaw(PssAddress(addr), topic, msg[:]) +} + func (pssapi *API) GetPeerTopics(pubkeyhex string) ([]Topic, error) { topics, _, err := pssapi.Pss.GetPublickeyPeers(pubkeyhex) return topics, err diff --git a/swarm/pss/pss_test.go b/swarm/pss/pss_test.go index 32404aaaf..72f62acd9 100644 --- a/swarm/pss/pss_test.go +++ b/swarm/pss/pss_test.go @@ -1064,7 +1064,7 @@ func testSendRaw(t *testing.T) { // send and verify delivery lmsg := []byte("plugh") - err = clients[1].Call(nil, "pss_sendRaw", loaddrhex, topic, lmsg) + err = clients[1].Call(nil, "pss_sendRaw", loaddrhex, topic, hexutil.Encode(lmsg)) if err != nil { t.Fatal(err) } @@ -1077,7 +1077,7 @@ func testSendRaw(t *testing.T) { t.Fatalf("test message (left) timed out: %v", cerr) } rmsg := []byte("xyzzy") - err = clients[0].Call(nil, "pss_sendRaw", roaddrhex, topic, rmsg) + err = clients[0].Call(nil, "pss_sendRaw", roaddrhex, topic, hexutil.Encode(rmsg)) if err != nil { t.Fatal(err) } |