From 15efbce3f86bac01c113651b487acc87ad66f80e Mon Sep 17 00:00:00 2001
From: capossele <angelocapossele@gmail.com>
Date: Fri, 17 Jul 2020 14:49:50 +0100
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Disable=20filter=20workerp?=
=?UTF-8?q?ools?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../packages/tangle/signature_filter.go | 42 +++++++++----------
.../message_signature_filter.go | 14 +++----
.../builtinfilters/pow_filter.go | 14 +++----
.../recently_seen_bytes_filter.go | 14 +++----
4 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/dapps/valuetransfers/packages/tangle/signature_filter.go b/dapps/valuetransfers/packages/tangle/signature_filter.go
index 8e02c332..a8e77e1f 100644
--- a/dapps/valuetransfers/packages/tangle/signature_filter.go
+++ b/dapps/valuetransfers/packages/tangle/signature_filter.go
@@ -28,33 +28,33 @@ func NewSignatureFilter() *SignatureFilter {
// Filter get's called whenever a new message is received. It rejects the message, if the message is not a valid value
// message.
func (filter *SignatureFilter) Filter(message *message.Message, peer *peer.Peer) {
- filter.workerPool.Submit(func() {
- // accept message if the message is not a value message (it will be checked by other filters)
- valuePayload := message.Payload()
- if valuePayload.Type() != payload.Type {
- filter.getAcceptCallback()(message, peer)
+ // filter.workerPool.Submit(func() {
+ // accept message if the message is not a value message (it will be checked by other filters)
+ valuePayload := message.Payload()
+ if valuePayload.Type() != payload.Type {
+ filter.getAcceptCallback()(message, peer)
- return
- }
+ return
+ }
- // reject if the payload can not be casted to a ValuePayload (invalid payload)
- typeCastedValuePayload, ok := valuePayload.(*payload.Payload)
- if !ok {
- filter.getRejectCallback()(message, errors.New("invalid value message"), peer)
+ // reject if the payload can not be casted to a ValuePayload (invalid payload)
+ typeCastedValuePayload, ok := valuePayload.(*payload.Payload)
+ if !ok {
+ filter.getRejectCallback()(message, errors.New("invalid value message"), peer)
- return
- }
+ return
+ }
- // reject message if it contains a transaction with invalid signatures
- if !typeCastedValuePayload.Transaction().SignaturesValid() {
- filter.getRejectCallback()(message, errors.New("invalid transaction signatures"), peer)
+ // reject message if it contains a transaction with invalid signatures
+ if !typeCastedValuePayload.Transaction().SignaturesValid() {
+ filter.getRejectCallback()(message, errors.New("invalid transaction signatures"), peer)
- return
- }
+ return
+ }
- // if all previous checks passed: accept message
- filter.getAcceptCallback()(message, peer)
- })
+ // if all previous checks passed: accept message
+ filter.getAcceptCallback()(message, peer)
+ // })
}
// OnAccept registers the given callback as the acceptance function of the filter.
diff --git a/packages/binary/messagelayer/messageparser/builtinfilters/message_signature_filter.go b/packages/binary/messagelayer/messageparser/builtinfilters/message_signature_filter.go
index 25220254..887673dd 100644
--- a/packages/binary/messagelayer/messageparser/builtinfilters/message_signature_filter.go
+++ b/packages/binary/messagelayer/messageparser/builtinfilters/message_signature_filter.go
@@ -29,13 +29,13 @@ func NewMessageSignatureFilter() *MessageSignatureFilter {
}
func (filter *MessageSignatureFilter) Filter(msg *message.Message, peer *peer.Peer) {
- filter.workerPool.Submit(func() {
- if msg.VerifySignature() {
- filter.getAcceptCallback()(msg, peer)
- return
- }
- filter.getRejectCallback()(msg, ErrInvalidSignature, peer)
- })
+ // filter.workerPool.Submit(func() {
+ if msg.VerifySignature() {
+ filter.getAcceptCallback()(msg, peer)
+ return
+ }
+ filter.getRejectCallback()(msg, ErrInvalidSignature, peer)
+ // })
}
func (filter *MessageSignatureFilter) OnAccept(callback func(msg *message.Message, peer *peer.Peer)) {
diff --git a/packages/binary/messagelayer/messageparser/builtinfilters/pow_filter.go b/packages/binary/messagelayer/messageparser/builtinfilters/pow_filter.go
index 8b53d340..c27e82cf 100644
--- a/packages/binary/messagelayer/messageparser/builtinfilters/pow_filter.go
+++ b/packages/binary/messagelayer/messageparser/builtinfilters/pow_filter.go
@@ -39,13 +39,13 @@ func NewPowFilter(worker *pow.Worker, difficulty int) *PowFilter {
// Filter checks whether the given bytes pass the PoW validation and calls the corresponding callback.
func (f *PowFilter) Filter(msgBytes []byte, p *peer.Peer) {
- f.workerPool.Submit(func() {
- if err := f.validate(msgBytes); err != nil {
- f.reject(msgBytes, err, p)
- return
- }
- f.accept(msgBytes, p)
- })
+ // f.workerPool.Submit(func() {
+ if err := f.validate(msgBytes); err != nil {
+ f.reject(msgBytes, err, p)
+ return
+ }
+ f.accept(msgBytes, p)
+ // })
}
// OnAccept registers the given callback as the acceptance function of the filter.
diff --git a/packages/binary/messagelayer/messageparser/builtinfilters/recently_seen_bytes_filter.go b/packages/binary/messagelayer/messageparser/builtinfilters/recently_seen_bytes_filter.go
index db1d9686..42b44ede 100644
--- a/packages/binary/messagelayer/messageparser/builtinfilters/recently_seen_bytes_filter.go
+++ b/packages/binary/messagelayer/messageparser/builtinfilters/recently_seen_bytes_filter.go
@@ -31,13 +31,13 @@ func NewRecentlySeenBytesFilter() *RecentlySeenBytesFilter {
}
func (filter *RecentlySeenBytesFilter) Filter(bytes []byte, peer *peer.Peer) {
- filter.workerPool.Submit(func() {
- if filter.bytesFilter.Add(bytes) {
- filter.getAcceptCallback()(bytes, peer)
- return
- }
- filter.getRejectCallback()(bytes, ErrReceivedDuplicateBytes, peer)
- })
+ // filter.workerPool.Submit(func() {
+ if filter.bytesFilter.Add(bytes) {
+ filter.getAcceptCallback()(bytes, peer)
+ return
+ }
+ filter.getRejectCallback()(bytes, ErrReceivedDuplicateBytes, peer)
+ // })
}
func (filter *RecentlySeenBytesFilter) OnAccept(callback func(bytes []byte, peer *peer.Peer)) {
--
GitLab