forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 01:13:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

whisper/whisperv5: gofmt -w -s

Browse source
This commit is contained in:
Felix Lange 2017-10-06 16:02:30 +02:00
parent 2d0c32149d
commit 55e87184e7
5 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
whisper/whisperv5/api.go
View file

@ -104,7 +104,7 @@ func (api *PublicWhisperAPI) Info(ctx context.Context) Info {
stats := api.w.Stats() stats := api.w.Stats()
return Info{ return Info{
Memory: stats.memoryUsed, Memory: stats.memoryUsed,
Messages: len(api.w.messageQueue) + len(api.w.p2pMsgQueue), Messages: len(api.w.messageQueue) + len(api.w.p2pMsgQueue),
MinPow: api.w.MinPow(), MinPow: api.w.MinPow(),
MaxMessageSize: api.w.MaxMessageSize(), MaxMessageSize: api.w.MaxMessageSize(),
} }

2
whisper/whisperv5/config.go
View file

@ -25,5 +25,3 @@ var DefaultConfig = Config{
MaxMessageSize: DefaultMaxMessageSize, MaxMessageSize: DefaultMaxMessageSize,
MinimumAcceptedPOW: DefaultMinimumPoW, MinimumAcceptedPOW: DefaultMinimumPoW,
} }
var ()

2
whisper/whisperv5/filter.go
View file

@ -70,7 +70,7 @@ func (fs *Filters) Install(watcher *Filter) (string, error) {
} }
if watcher.expectsSymmetricEncryption() { if watcher.expectsSymmetricEncryption() {
watcher.SymKeyHash = crypto.Keccak256Hash(watcher.KeySym); watcher.SymKeyHash = crypto.Keccak256Hash(watcher.KeySym)
} }
fs.watchers[id] = watcher fs.watchers[id] = watcher

22
whisper/whisperv5/filter_test.go
View file

@ -149,7 +149,7 @@ func TestInstallSymKeyGeneratesHash(t *testing.T) {
_, err := filters.Install(filter) _, err := filters.Install(filter)
if err != nil { if err != nil {
t.Fatalf("Error installing the filter: %s", err); t.Fatalf("Error installing the filter: %s", err)
} }
for i, b := range filter.SymKeyHash { for i, b := range filter.SymKeyHash {
@ -174,30 +174,30 @@ func TestInstallIdenticalFilters(t *testing.T) {
PoW: filter1.PoW, PoW: filter1.PoW,
AllowP2P: filter1.AllowP2P, AllowP2P: filter1.AllowP2P,
Messages: make(map[common.Hash]*ReceivedMessage), Messages: make(map[common.Hash]*ReceivedMessage),
}; }
_, err := filters.Install(filter1) _, err := filters.Install(filter1)
if err != nil { if err != nil {
t.Fatalf("Error installing the first filter with seed %d: %s", seed, err); t.Fatalf("Error installing the first filter with seed %d: %s", seed, err)
} }
_, err = filters.Install(filter2) _, err = filters.Install(filter2)
if err != nil { if err != nil {
t.Fatalf("Error installing the second filter with seed %d: %s", seed, err); t.Fatalf("Error installing the second filter with seed %d: %s", seed, err)
} }
params, err := generateMessageParams() params, err := generateMessageParams()
if err != nil { if err != nil {
t.Fatalf("Error generating message parameters with seed %d: %s", seed, err); t.Fatalf("Error generating message parameters with seed %d: %s", seed, err)
} }
params.KeySym = filter1.KeySym params.KeySym = filter1.KeySym
params.Topic = BytesToTopic(filter1.Topics[0]) params.Topic = BytesToTopic(filter1.Topics[0])
filter1.Src = &params.Src.PublicKey; filter1.Src = &params.Src.PublicKey
filter2.Src = &params.Src.PublicKey; filter2.Src = &params.Src.PublicKey
sentMessage, err := NewSentMessage(params) sentMessage, err := NewSentMessage(params)
if err != nil { if err != nil {
@ -212,19 +212,19 @@ func TestInstallIdenticalFilters(t *testing.T) {
t.Fatalf("failed to Open with filter1") t.Fatalf("failed to Open with filter1")
} }
if ! filter1.MatchEnvelope(env) { if !filter1.MatchEnvelope(env) {
t.Fatalf("failed matching with the first filter") t.Fatalf("failed matching with the first filter")
} }
if ! filter2.MatchEnvelope(env) { if !filter2.MatchEnvelope(env) {
t.Fatalf("failed matching with the first filter") t.Fatalf("failed matching with the first filter")
} }
if ! filter1.MatchMessage(msg) { if !filter1.MatchMessage(msg) {
t.Fatalf("failed matching with the second filter") t.Fatalf("failed matching with the second filter")
} }
if ! filter2.MatchMessage(msg) { if !filter2.MatchMessage(msg) {
t.Fatalf("failed matching with the second filter") t.Fatalf("failed matching with the second filter")
} }
} }

2
whisper/whisperv5/whisper_test.go
View file

@ -650,7 +650,7 @@ func TestSymmetricSendCycle(t *testing.T) {
PoW: filter1.PoW, PoW: filter1.PoW,
AllowP2P: filter1.AllowP2P, AllowP2P: filter1.AllowP2P,
Messages: make(map[common.Hash]*ReceivedMessage), Messages: make(map[common.Hash]*ReceivedMessage),
}; }
params, err := generateMessageParams() params, err := generateMessageParams()
if err != nil { if err != nil {