Skip to content
Snippets Groups Projects
Unverified Commit c75a9cfa authored by capossele's avatar capossele
Browse files

:recycle: Refactor

parent 871d4bf6
No related branches found
No related tags found
No related merge requests found
...@@ -72,8 +72,6 @@ var ( ...@@ -72,8 +72,6 @@ var (
valueObjectFactory *tangle.ValueObjectFactory valueObjectFactory *tangle.ValueObjectFactory
valueObjectFactoryOnce sync.Once valueObjectFactoryOnce sync.Once
SignatureFilter *tangle.SignatureFilter
) )
// App gets the plugin instance. // App gets the plugin instance.
...@@ -171,8 +169,7 @@ func configure(_ *node.Plugin) { ...@@ -171,8 +169,7 @@ func configure(_ *node.Plugin) {
})) }))
// register SignatureFilter in Parser // register SignatureFilter in Parser
SignatureFilter = tangle.NewSignatureFilter() messagelayer.MessageParser().AddMessageFilter(tangle.NewSignatureFilter())
messagelayer.MessageParser().AddMessageFilter(SignatureFilter)
// subscribe to message-layer // subscribe to message-layer
messagelayer.Tangle().Events.MessageSolid.Attach(events.NewClosure(onReceiveMessageFromMessageLayer)) messagelayer.Tangle().Events.MessageSolid.Attach(events.NewClosure(onReceiveMessageFromMessageLayer))
......
...@@ -21,11 +21,6 @@ type MessageParser struct { ...@@ -21,11 +21,6 @@ type MessageParser struct {
messageFiltersModified typeutils.AtomicBool messageFiltersModified typeutils.AtomicBool
bytesFiltersMutex sync.Mutex bytesFiltersMutex sync.Mutex
messageFiltersMutex 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. // New creates a new message parser.
...@@ -47,10 +42,8 @@ func New() (result *MessageParser) { ...@@ -47,10 +42,8 @@ func New() (result *MessageParser) {
} }
// add builtin filters // add builtin filters
result.RecentlySeenBytesFilter = builtinfilters.NewRecentlySeenBytesFilter() result.AddBytesFilter(builtinfilters.NewRecentlySeenBytesFilter())
result.AddBytesFilter(result.RecentlySeenBytesFilter) result.AddMessageFilter(builtinfilters.NewMessageSignatureFilter())
result.MessageSignatureFilter = builtinfilters.NewMessageSignatureFilter()
result.AddMessageFilter(result.MessageSignatureFilter)
return return
} }
......
...@@ -30,7 +30,6 @@ func run(*node.Plugin) { ...@@ -30,7 +30,6 @@ func run(*node.Plugin) {
log.Infof("%s started: difficult=%d", PluginName, difficulty) log.Infof("%s started: difficult=%d", PluginName, difficulty)
messagelayer.MessageParser().PowFilter = builtinfilters.NewPowFilter(worker, difficulty) messagelayer.MessageParser().AddBytesFilter(builtinfilters.NewPowFilter(worker, difficulty))
messagelayer.MessageParser().AddBytesFilter(messagelayer.MessageParser().PowFilter)
messagelayer.MessageFactory().SetWorker(messagefactory.WorkerFunc(DoPOW)) messagelayer.MessageFactory().SetWorker(messagefactory.WorkerFunc(DoPOW))
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment