gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui/qt/qwhisper, whisper, xeth: polish topic filter, fix wildcards

Browse Source
This commit is contained in:
Péter Szilágyi
2015-04-22 12:50:48 +03:00
parent ae4bfc3cfb
commit db615a85ec
7 changed files with 215 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
whisper/topic.go
View File

@ -11,6 +11,8 @@ import "github.com/ethereum/go-ethereum/crypto"
type Topic [4]byte
// NewTopic creates a topic from the 4 byte prefix of the SHA3 hash of the data.
//
// Note, empty topics are considered the wildcard, and cannot be used in messages.
func NewTopic(data []byte) Topic {
prefix := [4]byte{}
copy(prefix[:], crypto.Sha3(data)[:4])
@ -27,26 +29,6 @@ func NewTopics(data ...[]byte) []Topic {
return topics
}
// NewTopicFilter creates a 2D topic array used by whisper.Filter from binary
// data elements.
func NewTopicFilter(data ...[][]byte) [][]Topic {
filter := make([][]Topic, len(data))
for i, condition := range data {
filter[i] = NewTopics(condition...)
}
return filter
}
// NewTopicFilterFlat creates a 2D topic array used by whisper.Filter from flat
// binary data elements.
func NewTopicFilterFlat(data ...[]byte) [][]Topic {
filter := make([][]Topic, len(data))
for i, element := range data {
filter[i] = []Topic{NewTopic(element)}
}
return filter
}
// NewTopicFromString creates a topic using the binary data contents of the
// specified string.
func NewTopicFromString(data string) Topic {
@ -63,26 +45,6 @@ func NewTopicsFromStrings(data ...string) []Topic {
return topics
}
// NewTopicFilterFromStrings creates a 2D topic array used by whisper.Filter
// from textual data elements.
func NewTopicFilterFromStrings(data ...[]string) [][]Topic {
filter := make([][]Topic, len(data))
for i, condition := range data {
filter[i] = NewTopicsFromStrings(condition...)
}
return filter
}
// NewTopicFilterFromStringsFlat creates a 2D topic array used by whisper.Filter from flat
// binary data elements.
func NewTopicFilterFromStringsFlat(data ...string) [][]Topic {
filter := make([][]Topic, len(data))
for i, element := range data {
filter[i] = []Topic{NewTopicFromString(element)}
}
return filter
}
// String converts a topic byte array to a string representation.
func (self *Topic) String() string {
return string(self[:])