Skip to content
Snippets Groups Projects
Commit c7496bf6 authored by Wolfgang Welz's avatar Wolfgang Welz
Browse files

refactor: remove unnecessary plugin parameters

parent e4447dbd
No related branches found
No related tags found
No related merge requests found
......@@ -5,7 +5,6 @@ import (
"github.com/iotaledger/goshimmer/packages/datastructure"
"github.com/iotaledger/goshimmer/packages/errors"
"github.com/iotaledger/goshimmer/packages/model/approvers"
"github.com/iotaledger/hive.go/node"
"github.com/iotaledger/hive.go/typeutils"
"github.com/iotaledger/iota.go/trinary"
)
......@@ -75,7 +74,7 @@ const (
var approversDatabase database.Database
func configureApproversDatabase(plugin *node.Plugin) {
func configureApproversDatabase() {
if db, err := database.Get("approvers"); err != nil {
panic(err)
} else {
......
......@@ -5,7 +5,6 @@ import (
"github.com/iotaledger/goshimmer/packages/datastructure"
"github.com/iotaledger/goshimmer/packages/errors"
"github.com/iotaledger/goshimmer/packages/model/bundle"
"github.com/iotaledger/hive.go/node"
"github.com/iotaledger/hive.go/typeutils"
"github.com/iotaledger/iota.go/trinary"
)
......@@ -79,7 +78,7 @@ const (
var bundleDatabase database.Database
func configureBundleDatabase(plugin *node.Plugin) {
func configureBundleDatabase() {
if db, err := database.Get("bundle"); err != nil {
panic(err)
} else {
......
......@@ -10,16 +10,16 @@ import (
var PLUGIN = node.NewPlugin("Tangle", node.Enabled, configure, run)
var log = logger.NewLogger("Tangle")
func configure(plugin *node.Plugin) {
configureTransactionDatabase(plugin)
configureTransactionMetaDataDatabase(plugin)
configureApproversDatabase(plugin)
configureBundleDatabase(plugin)
configureSolidifier(plugin)
func configure(*node.Plugin) {
configureTransactionDatabase()
configureTransactionMetaDataDatabase()
configureApproversDatabase()
configureBundleDatabase()
configureSolidifier()
}
func run(plugin *node.Plugin) {
runSolidifier(plugin)
func run(*node.Plugin) {
runSolidifier()
}
// endregion ///////////////////////////////////////////////////////////////////////////////////////////////////////////
......@@ -13,7 +13,6 @@ import (
"github.com/iotaledger/goshimmer/packages/workerpool"
"github.com/iotaledger/hive.go/daemon"
"github.com/iotaledger/hive.go/events"
"github.com/iotaledger/hive.go/node"
"github.com/iotaledger/iota.go/trinary"
)
......@@ -26,9 +25,9 @@ var (
unsolidTxs *UnsolidTxs
)
func configureSolidifier(plugin *node.Plugin) {
func configureSolidifier() {
workerPool = workerpool.New(func(task workerpool.Task) {
processMetaTransaction(plugin, task.Param(0).(*meta_transaction.MetaTransaction))
processMetaTransaction(task.Param(0).(*meta_transaction.MetaTransaction))
task.Return(nil)
}, workerpool.WorkerCount(WORKER_COUNT), workerpool.QueueSize(10000))
......@@ -46,7 +45,7 @@ func configureSolidifier(plugin *node.Plugin) {
}))
}
func runSolidifier(plugin *node.Plugin) {
func runSolidifier() {
log.Info("Starting Solidifier ...")
daemon.BackgroundWorker("Tangle Solidifier", func(shutdownSignal <-chan struct{}) {
......@@ -54,7 +53,7 @@ func runSolidifier(plugin *node.Plugin) {
workerPool.Start()
<-shutdownSignal
log.Info("Stopping Solidifier ...")
workerPool.Stop()
workerPool.StopAndWait()
log.Info("Stopping Solidifier ... done")
})
}
......@@ -169,7 +168,7 @@ func propagateSolidity(transactionHash trinary.Trytes) errors.IdentifiableError
return nil
}
func processMetaTransaction(plugin *node.Plugin, metaTransaction *meta_transaction.MetaTransaction) {
func processMetaTransaction(metaTransaction *meta_transaction.MetaTransaction) {
var newTransaction bool
if tx, err := GetTransaction(metaTransaction.GetHash(), func(transactionHash trinary.Trytes) *value_transaction.ValueTransaction {
newTransaction = true
......@@ -179,11 +178,11 @@ func processMetaTransaction(plugin *node.Plugin, metaTransaction *meta_transacti
log.Errorf("Unable to load transaction %s: %s", metaTransaction.GetHash(), err.Error())
} else if newTransaction {
updateUnsolidTxs(tx)
processTransaction(plugin, tx)
processTransaction(tx)
}
}
func processTransaction(plugin *node.Plugin, transaction *value_transaction.ValueTransaction) {
func processTransaction(transaction *value_transaction.ValueTransaction) {
Events.TransactionStored.Trigger(transaction)
transactionHash := transaction.GetHash()
......
......@@ -5,7 +5,6 @@ import (
"github.com/iotaledger/goshimmer/packages/datastructure"
"github.com/iotaledger/goshimmer/packages/errors"
"github.com/iotaledger/goshimmer/packages/model/value_transaction"
"github.com/iotaledger/hive.go/node"
"github.com/iotaledger/hive.go/typeutils"
"github.com/iotaledger/iota.go/trinary"
)
......@@ -76,7 +75,7 @@ const (
var transactionDatabase database.Database
func configureTransactionDatabase(plugin *node.Plugin) {
func configureTransactionDatabase() {
if db, err := database.Get("transaction"); err != nil {
panic(err)
} else {
......
......@@ -5,7 +5,6 @@ import (
"github.com/iotaledger/goshimmer/packages/datastructure"
"github.com/iotaledger/goshimmer/packages/errors"
"github.com/iotaledger/goshimmer/packages/model/transactionmetadata"
"github.com/iotaledger/hive.go/node"
"github.com/iotaledger/hive.go/typeutils"
"github.com/iotaledger/iota.go/trinary"
)
......@@ -76,7 +75,7 @@ const (
var transactionMetadataDatabase database.Database
func configureTransactionMetaDataDatabase(plugin *node.Plugin) {
func configureTransactionMetaDataDatabase() {
if db, err := database.Get("transactionMetadata"); err != nil {
panic(err)
} else {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment