Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
d24d10a7
Commit
d24d10a7
authored
Feb 28, 2018
by
Vlad
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
whisper: style fixes
parent
c733792b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
17 deletions
+10
-17
filter.go
whisper/whisperv6/filter.go
+9
-6
filter_test.go
whisper/whisperv6/filter_test.go
+1
-11
No files found.
whisper/whisperv6/filter.go
View file @
d24d10a7
...
...
@@ -44,8 +44,9 @@ type Filter struct {
// Filters represents a collection of filters
type
Filters
struct
{
watchers
map
[
string
]
*
Filter
topicMatcher
map
[
TopicType
]
map
[
*
Filter
]
struct
{}
allTopicsMatcher
map
[
*
Filter
]
struct
{}
topicMatcher
map
[
TopicType
]
map
[
*
Filter
]
struct
{}
// map a topic to the filters that are interested in being notified when a message matches that topic
allTopicsMatcher
map
[
*
Filter
]
struct
{}
// list all the filters that will be notified of a new message, no matter what its topic is
whisper
*
Whisper
mutex
sync
.
RWMutex
...
...
@@ -106,7 +107,9 @@ func (fs *Filters) Uninstall(id string) bool {
return
false
}
// addTopicMatcher adds a filter to the topic matchers
// addTopicMatcher adds a filter to the topic matchers.
// If the filter's Topics array is empty, it will be tried on every topic.
// Otherwise, it will be tried on the topics specified.
func
(
fs
*
Filters
)
addTopicMatcher
(
watcher
*
Filter
)
{
if
len
(
watcher
.
Topics
)
==
0
{
fs
.
allTopicsMatcher
[
watcher
]
=
struct
{}{}
...
...
@@ -133,10 +136,10 @@ func (fs *Filters) removeFromTopicMatchers(watcher *Filter) {
// match a specific topic
func
(
fs
*
Filters
)
getWatchersByTopic
(
topic
TopicType
)
[]
*
Filter
{
res
:=
make
([]
*
Filter
,
0
,
len
(
fs
.
allTopicsMatcher
))
for
watcher
,
_
:=
range
fs
.
allTopicsMatcher
{
for
watcher
:=
range
fs
.
allTopicsMatcher
{
res
=
append
(
res
,
watcher
)
}
for
watcher
,
_
:=
range
fs
.
topicMatcher
[
topic
]
{
for
watcher
:=
range
fs
.
topicMatcher
[
topic
]
{
res
=
append
(
res
,
watcher
)
}
return
res
...
...
whisper/whisperv6/filter_test.go
View file @
d24d10a7
...
...
@@ -313,16 +313,6 @@ func TestMatchEnvelope(t *testing.T) {
if
err
!=
nil
{
t
.
Fatalf
(
"failed Wrap with seed %d: %s."
,
seed
,
err
)
}
match
:=
fsym
.
MatchEnvelope
(
env
)
if
!
match
{
// topic mismatch should have no affect, as topics are handled by topic matchers
t
.
Fatalf
(
"failed MatchEnvelope symmetric with seed %d."
,
seed
)
}
match
=
fasym
.
MatchEnvelope
(
env
)
if
!
match
{
// topic mismatch should have no affect, as topics are handled by topic matchers
t
.
Fatalf
(
"failed MatchEnvelope asymmetric with seed %d."
,
seed
)
}
// encrypt symmetrically
i
:=
mrand
.
Int
()
%
4
...
...
@@ -338,7 +328,7 @@ func TestMatchEnvelope(t *testing.T) {
}
// symmetric + matching topic: match
match
=
fsym
.
MatchEnvelope
(
env
)
match
:
=
fsym
.
MatchEnvelope
(
env
)
if
!
match
{
t
.
Fatalf
(
"failed MatchEnvelope() symmetric with seed %d."
,
seed
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment