From c75a9cfa780011de0d429cef99e4a8c81659357d Mon Sep 17 00:00:00 2001
From: capossele <angelocapossele@gmail.com>
Date: Fri, 17 Jul 2020 15:45:17 +0100
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
dapps/valuetransfers/dapp.go | 5 +----
.../messagelayer/messageparser/message_parser.go | 11 ++---------
plugins/pow/plugin.go | 3 +--
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/dapps/valuetransfers/dapp.go b/dapps/valuetransfers/dapp.go
index 021e8806..60adff59 100644
--- a/dapps/valuetransfers/dapp.go
+++ b/dapps/valuetransfers/dapp.go
@@ -72,8 +72,6 @@ var (
valueObjectFactory *tangle.ValueObjectFactory
valueObjectFactoryOnce sync.Once
-
- SignatureFilter *tangle.SignatureFilter
)
// App gets the plugin instance.
@@ -171,8 +169,7 @@ func configure(_ *node.Plugin) {
}))
// register SignatureFilter in Parser
- SignatureFilter = tangle.NewSignatureFilter()
- messagelayer.MessageParser().AddMessageFilter(SignatureFilter)
+ messagelayer.MessageParser().AddMessageFilter(tangle.NewSignatureFilter())
// subscribe to message-layer
messagelayer.Tangle().Events.MessageSolid.Attach(events.NewClosure(onReceiveMessageFromMessageLayer))
diff --git a/packages/binary/messagelayer/messageparser/message_parser.go b/packages/binary/messagelayer/messageparser/message_parser.go
index fe4fd08a..8e491be4 100644
--- a/packages/binary/messagelayer/messageparser/message_parser.go
+++ b/packages/binary/messagelayer/messageparser/message_parser.go
@@ -21,11 +21,6 @@ type MessageParser struct {
messageFiltersModified typeutils.AtomicBool
bytesFiltersMutex sync.Mutex
messageFiltersMutex sync.Mutex
-
- // only used for workerpool debugging
- MessageSignatureFilter *builtinfilters.MessageSignatureFilter
- PowFilter *builtinfilters.PowFilter
- RecentlySeenBytesFilter *builtinfilters.RecentlySeenBytesFilter
}
// New creates a new message parser.
@@ -47,10 +42,8 @@ func New() (result *MessageParser) {
}
// add builtin filters
- result.RecentlySeenBytesFilter = builtinfilters.NewRecentlySeenBytesFilter()
- result.AddBytesFilter(result.RecentlySeenBytesFilter)
- result.MessageSignatureFilter = builtinfilters.NewMessageSignatureFilter()
- result.AddMessageFilter(result.MessageSignatureFilter)
+ result.AddBytesFilter(builtinfilters.NewRecentlySeenBytesFilter())
+ result.AddMessageFilter(builtinfilters.NewMessageSignatureFilter())
return
}
diff --git a/plugins/pow/plugin.go b/plugins/pow/plugin.go
index 74da7d9d..d8056d6d 100644
--- a/plugins/pow/plugin.go
+++ b/plugins/pow/plugin.go
@@ -30,7 +30,6 @@ func run(*node.Plugin) {
log.Infof("%s started: difficult=%d", PluginName, difficulty)
- messagelayer.MessageParser().PowFilter = builtinfilters.NewPowFilter(worker, difficulty)
- messagelayer.MessageParser().AddBytesFilter(messagelayer.MessageParser().PowFilter)
+ messagelayer.MessageParser().AddBytesFilter(builtinfilters.NewPowFilter(worker, difficulty))
messagelayer.MessageFactory().SetWorker(messagefactory.WorkerFunc(DoPOW))
}
--
GitLab