forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 07:06:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

whisper: functions renamed

Browse source
This commit is contained in:
Vlad 2017-04-22 22:46:07 +02:00
parent 4abacbbb92
commit dd25b630a8
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
whisper/whisperv5/api.go
View file

@ -271,7 +271,7 @@ func (api *PublicWhisperAPI) Unsubscribe(id string) {
// GetSubscriptionMessages retrieves all the new messages matched by the corresponding // GetSubscriptionMessages retrieves all the new messages matched by the corresponding
// subscription filter since the last retrieval. // subscription filter since the last retrieval.
func (api *PublicWhisperAPI) GetSubscriptionMessages(id string) []*WhisperMessage { func (api *PublicWhisperAPI) GetNewSubscriptionMessages(id string) []*WhisperMessage {
f := api.whisper.GetFilter(id) f := api.whisper.GetFilter(id)
if f != nil { if f != nil {
newMail := f.Retrieve() newMail := f.Retrieve()
@ -282,7 +282,7 @@ func (api *PublicWhisperAPI) GetSubscriptionMessages(id string) []*WhisperMessag
// GetMessages retrieves all the floating messages that match a specific subscription filter. // GetMessages retrieves all the floating messages that match a specific subscription filter.
// It is likely to be called once per session, right after Subscribe call. // It is likely to be called once per session, right after Subscribe call.
func (api *PublicWhisperAPI) GetMessages(id string) []*WhisperMessage { func (api *PublicWhisperAPI) GetFloatingMessages(id string) []*WhisperMessage {
all := api.whisper.Messages(id) all := api.whisper.Messages(id)
return toWhisperMessages(all) return toWhisperMessages(all)
} }
@ -475,7 +475,6 @@ type WhisperMessage struct {
// NewWhisperMessage converts an internal message into an API version. // NewWhisperMessage converts an internal message into an API version.
func NewWhisperMessage(message *ReceivedMessage) *WhisperMessage { func NewWhisperMessage(message *ReceivedMessage) *WhisperMessage {
msg := WhisperMessage{ msg := WhisperMessage{
Topic: common.ToHex(message.Topic[:]),
Payload: common.ToHex(message.Payload), Payload: common.ToHex(message.Payload),
Padding: common.ToHex(message.Padding), Padding: common.ToHex(message.Padding),
Timestamp: message.Sent, Timestamp: message.Sent,
@ -484,11 +483,20 @@ func NewWhisperMessage(message *ReceivedMessage) *WhisperMessage {
Hash: common.ToHex(message.EnvelopeHash.Bytes()), Hash: common.ToHex(message.EnvelopeHash.Bytes()),
} }
if len(message.Topic) == TopicLength {
msg.Topic = common.ToHex(message.Topic[:])
}
if message.Dst != nil { if message.Dst != nil {
msg.Dst = common.ToHex(crypto.FromECDSAPub(message.Dst)) b := crypto.FromECDSAPub(message.Dst)
if b != nil {
msg.Dst = common.ToHex(b)
}
} }
if isMessageSigned(message.Raw[0]) { if isMessageSigned(message.Raw[0]) {
msg.Src = common.ToHex(crypto.FromECDSAPub(message.SigToPubKey())) b := crypto.FromECDSAPub(message.SigToPubKey())
if b != nil {
msg.Src = common.ToHex(b)
}
} }
return &msg return &msg
} }

4
whisper/whisperv5/api_test.go
View file

@ -43,7 +43,7 @@ func TestBasic(t *testing.T) {
t.Fatalf("wrong version: %d.", ver) t.Fatalf("wrong version: %d.", ver)
} }
mail := api.GetSubscriptionMessages("non-existent-id") mail := api.GetNewSubscriptionMessages("non-existent-id")
if len(mail) != 0 { if len(mail) != 0 {
t.Fatalf("failed GetFilterChanges: premature result") t.Fatalf("failed GetFilterChanges: premature result")
} }
@ -282,7 +282,7 @@ func waitForMessages(api *PublicWhisperAPI, id string, target int) []*WhisperMes
// timeout: 2 seconds // timeout: 2 seconds
result := make([]*WhisperMessage, 0, target) result := make([]*WhisperMessage, 0, target)
for i := 0; i < 100; i++ { for i := 0; i < 100; i++ {
mail := api.GetSubscriptionMessages(id) mail := api.GetNewSubscriptionMessages(id)
if len(mail) > 0 { if len(mail) > 0 {
for _, m := range mail { for _, m := range mail {
result = append(result, m) result = append(result, m)