diff --git a/dapps/valuetransfers/dapp.go b/dapps/valuetransfers/dapp.go index 021e88065982b08524bbf96d12a4f11fb46f90a3..60adff59bb18cc52bec8690144c53a0dd2654bb8 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 fe4fd08a22aa26e6e1513e876f90af26e146078e..8e491be4949927c1eb26e1bb05b1a6632b740108 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 74da7d9d3509308192410f5aa73fd12524d750cd..d8056d6dc213d5ae053b483a43a19886fff8eb35 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)) }