From a144ec13d6e75a8f91c291bfcd3c1edc49ad48de Mon Sep 17 00:00:00 2001 From: Wolfgang Welz <welzwo@gmail.com> Date: Mon, 25 Nov 2019 18:27:52 +0100 Subject: [PATCH] Format imports --- packages/database/badger_instance.go | 2 +- plugins/analysis/client/plugin.go | 2 +- plugins/analysis/server/plugin.go | 3 ++- .../instances/entrynodes/instance.go | 4 ++-- .../autopeering/instances/ownpeer/instance.go | 2 +- .../protocol/incoming_request_processor.go | 5 ++--- plugins/autopeering/server/udp/server.go | 5 +++-- plugins/bundleprocessor/bundleprocessor_test.go | 12 ++++-------- plugins/cli/cli.go | 5 ++--- plugins/cli/plugin.go | 5 ++--- plugins/dashboard/tps.go | 12 ++++++------ plugins/metrics/events.go | 2 +- plugins/metrics/plugin.go | 2 +- plugins/tangle/solidifier_test.go | 2 +- plugins/ui/files.go | 17 ++++++++--------- plugins/zeromq/plugin.go | 2 +- 16 files changed, 38 insertions(+), 44 deletions(-) diff --git a/packages/database/badger_instance.go b/packages/database/badger_instance.go index 769da195..fcaae5f5 100644 --- a/packages/database/badger_instance.go +++ b/packages/database/badger_instance.go @@ -1,12 +1,12 @@ package database import ( - "github.com/iotaledger/hive.go/parameter" "os" "sync" "github.com/dgraph-io/badger" "github.com/dgraph-io/badger/options" + "github.com/iotaledger/hive.go/parameter" "github.com/pkg/errors" ) diff --git a/plugins/analysis/client/plugin.go b/plugins/analysis/client/plugin.go index fc882b05..dddf5567 100644 --- a/plugins/analysis/client/plugin.go +++ b/plugins/analysis/client/plugin.go @@ -1,7 +1,6 @@ package client import ( - "github.com/iotaledger/hive.go/parameter" "net" "time" @@ -19,6 +18,7 @@ import ( "github.com/iotaledger/goshimmer/plugins/autopeering/instances/knownpeers" "github.com/iotaledger/goshimmer/plugins/autopeering/types/peer" "github.com/iotaledger/hive.go/events" + "github.com/iotaledger/hive.go/parameter" ) func Run(plugin *node.Plugin) { diff --git a/plugins/analysis/server/plugin.go b/plugins/analysis/server/plugin.go index 35917d4e..07950fa5 100644 --- a/plugins/analysis/server/plugin.go +++ b/plugins/analysis/server/plugin.go @@ -2,6 +2,8 @@ package server import ( "encoding/hex" + "math" + "github.com/iotaledger/goshimmer/packages/daemon" "github.com/iotaledger/goshimmer/packages/network" "github.com/iotaledger/goshimmer/packages/network/tcp" @@ -14,7 +16,6 @@ import ( "github.com/iotaledger/hive.go/events" "github.com/iotaledger/hive.go/parameter" "github.com/pkg/errors" - "math" ) var server *tcp.Server diff --git a/plugins/autopeering/instances/entrynodes/instance.go b/plugins/autopeering/instances/entrynodes/instance.go index aae083c6..0ece60a4 100644 --- a/plugins/autopeering/instances/entrynodes/instance.go +++ b/plugins/autopeering/instances/entrynodes/instance.go @@ -2,16 +2,16 @@ package entrynodes import ( "encoding/hex" - "github.com/iotaledger/goshimmer/plugins/autopeering/parameters" - "github.com/iotaledger/hive.go/parameter" "net" "strconv" "strings" "github.com/iotaledger/goshimmer/packages/identity" "github.com/iotaledger/goshimmer/packages/node" + "github.com/iotaledger/goshimmer/plugins/autopeering/parameters" "github.com/iotaledger/goshimmer/plugins/autopeering/types/peer" "github.com/iotaledger/goshimmer/plugins/autopeering/types/peerlist" + "github.com/iotaledger/hive.go/parameter" ) var INSTANCE *peerlist.PeerList diff --git a/plugins/autopeering/instances/ownpeer/instance.go b/plugins/autopeering/instances/ownpeer/instance.go index 157a5f2d..6fec44f9 100644 --- a/plugins/autopeering/instances/ownpeer/instance.go +++ b/plugins/autopeering/instances/ownpeer/instance.go @@ -1,7 +1,6 @@ package ownpeer import ( - "github.com/iotaledger/hive.go/parameter" "net" "github.com/iotaledger/goshimmer/packages/accountability" @@ -10,6 +9,7 @@ import ( "github.com/iotaledger/goshimmer/plugins/autopeering/saltmanager" "github.com/iotaledger/goshimmer/plugins/autopeering/types/peer" "github.com/iotaledger/goshimmer/plugins/gossip" + "github.com/iotaledger/hive.go/parameter" ) var INSTANCE *peer.Peer diff --git a/plugins/autopeering/protocol/incoming_request_processor.go b/plugins/autopeering/protocol/incoming_request_processor.go index 66493c08..4ceb4569 100644 --- a/plugins/autopeering/protocol/incoming_request_processor.go +++ b/plugins/autopeering/protocol/incoming_request_processor.go @@ -1,20 +1,19 @@ package protocol import ( - "github.com/iotaledger/hive.go/parameter" "math/rand" - "github.com/iotaledger/goshimmer/plugins/autopeering/parameters" - "github.com/iotaledger/goshimmer/packages/node" "github.com/iotaledger/goshimmer/plugins/autopeering/instances/acceptedneighbors" "github.com/iotaledger/goshimmer/plugins/autopeering/instances/knownpeers" "github.com/iotaledger/goshimmer/plugins/autopeering/instances/neighborhood" + "github.com/iotaledger/goshimmer/plugins/autopeering/parameters" "github.com/iotaledger/goshimmer/plugins/autopeering/protocol/constants" "github.com/iotaledger/goshimmer/plugins/autopeering/types/peer" "github.com/iotaledger/goshimmer/plugins/autopeering/types/peerlist" "github.com/iotaledger/goshimmer/plugins/autopeering/types/request" "github.com/iotaledger/hive.go/events" + "github.com/iotaledger/hive.go/parameter" ) func createIncomingRequestProcessor(plugin *node.Plugin) *events.Closure { diff --git a/plugins/autopeering/server/udp/server.go b/plugins/autopeering/server/udp/server.go index 4af9f312..9ab446d6 100644 --- a/plugins/autopeering/server/udp/server.go +++ b/plugins/autopeering/server/udp/server.go @@ -1,6 +1,9 @@ package udp import ( + "math" + "net" + "github.com/iotaledger/goshimmer/packages/daemon" "github.com/iotaledger/goshimmer/packages/network/udp" "github.com/iotaledger/goshimmer/packages/node" @@ -12,8 +15,6 @@ import ( "github.com/iotaledger/hive.go/events" "github.com/iotaledger/hive.go/parameter" "github.com/pkg/errors" - "math" - "net" ) var udpServer = udp.NewServer(int(math.Max(float64(request.MARSHALED_TOTAL_SIZE), float64(response.MARSHALED_TOTAL_SIZE)))) diff --git a/plugins/bundleprocessor/bundleprocessor_test.go b/plugins/bundleprocessor/bundleprocessor_test.go index 99a47471..4c8c1b8e 100644 --- a/plugins/bundleprocessor/bundleprocessor_test.go +++ b/plugins/bundleprocessor/bundleprocessor_test.go @@ -1,22 +1,18 @@ package bundleprocessor import ( - "github.com/iotaledger/hive.go/parameter" "os" "sync" "testing" + "github.com/iotaledger/goshimmer/packages/client" "github.com/iotaledger/goshimmer/packages/model/bundle" "github.com/iotaledger/goshimmer/packages/model/value_transaction" - "github.com/iotaledger/hive.go/events" - - "github.com/iotaledger/goshimmer/plugins/tipselection" - - "github.com/iotaledger/goshimmer/packages/client" - "github.com/iotaledger/goshimmer/packages/node" - "github.com/iotaledger/goshimmer/plugins/tangle" + "github.com/iotaledger/goshimmer/plugins/tipselection" + "github.com/iotaledger/hive.go/events" + "github.com/iotaledger/hive.go/parameter" "github.com/iotaledger/iota.go/consts" "github.com/magiconair/properties/assert" ) diff --git a/plugins/cli/cli.go b/plugins/cli/cli.go index 55106e01..a76b94bc 100644 --- a/plugins/cli/cli.go +++ b/plugins/cli/cli.go @@ -7,9 +7,8 @@ import ( "sort" "strings" - flag "github.com/spf13/pflag" - "github.com/iotaledger/goshimmer/packages/node" + flag "github.com/spf13/pflag" ) var enabledPlugins []string @@ -44,5 +43,5 @@ func printUsage() { fmt.Fprintf(os.Stderr, "\nThe following plugins are enabled by default and can be disabled with -%s:\n %s\n", node.CFG_DISABLE_PLUGINS, getList(enabledPlugins)) fmt.Fprintf(os.Stderr, "The following plugins are disabled by default and can be enabled with -%s:\n %s\n", node.CFG_ENABLE_PLGUINS, getList(disabledPlugins)) - fmt.Fprintf(os.Stderr, "The enabled/disabled plugins can be overriden by altering %s/%s inside config.json\n\n", node.CFG_ENABLE_PLGUINS, node.CFG_DISABLE_PLUGINS) + fmt.Fprintf(os.Stderr, "The enabled/disabled plugins can be overridden by altering %s/%s inside config.json\n\n", node.CFG_ENABLE_PLGUINS, node.CFG_DISABLE_PLUGINS) } diff --git a/plugins/cli/plugin.go b/plugins/cli/plugin.go index c7ac5908..b6678661 100644 --- a/plugins/cli/plugin.go +++ b/plugins/cli/plugin.go @@ -4,11 +4,10 @@ import ( "fmt" "strings" - "github.com/iotaledger/hive.go/events" - flag "github.com/spf13/pflag" - "github.com/iotaledger/goshimmer/packages/node" + "github.com/iotaledger/hive.go/events" "github.com/iotaledger/hive.go/parameter" + flag "github.com/spf13/pflag" ) const ( diff --git a/plugins/dashboard/tps.go b/plugins/dashboard/tps.go index 5c779bb1..5f02375d 100644 --- a/plugins/dashboard/tps.go +++ b/plugins/dashboard/tps.go @@ -72,12 +72,12 @@ func GetStatus() *Status { } uptime += fmt.Sprintf("%02ds ", int(duration.Seconds())%60) - return &Status { - Id: accountability.OwnId().StringIdentifier, - Neighbor: "Neighbors: " + strconv.Itoa(chosenneighbors.INSTANCE.Peers.Len())+" chosen / "+strconv.Itoa(acceptedneighbors.INSTANCE.Peers.Len())+" accepted / "+strconv.Itoa(chosenneighbors.INSTANCE.Peers.Len()+acceptedneighbors.INSTANCE.Peers.Len())+" total", - KnownPeer: "Known Peers: "+ strconv.Itoa(knownpeers.INSTANCE.Peers.Len())+" total / "+strconv.Itoa(neighborhood.INSTANCE.Peers.Len())+" neighborhood", - Uptime: uptime, - } + return &Status{ + Id: accountability.OwnId().StringIdentifier, + Neighbor: "Neighbors: " + strconv.Itoa(chosenneighbors.INSTANCE.Peers.Len()) + " chosen / " + strconv.Itoa(acceptedneighbors.INSTANCE.Peers.Len()) + " accepted / " + strconv.Itoa(chosenneighbors.INSTANCE.Peers.Len()+acceptedneighbors.INSTANCE.Peers.Len()) + " total", + KnownPeer: "Known Peers: " + strconv.Itoa(knownpeers.INSTANCE.Peers.Len()) + " total / " + strconv.Itoa(neighborhood.INSTANCE.Peers.Len()) + " neighborhood", + Uptime: uptime, + } } // ServeWs websocket diff --git a/plugins/metrics/events.go b/plugins/metrics/events.go index df87ebad..03a51d81 100644 --- a/plugins/metrics/events.go +++ b/plugins/metrics/events.go @@ -1,6 +1,6 @@ package metrics -import( +import ( "github.com/iotaledger/hive.go/events" ) diff --git a/plugins/metrics/plugin.go b/plugins/metrics/plugin.go index 6d8aa2fd..121e696c 100644 --- a/plugins/metrics/plugin.go +++ b/plugins/metrics/plugin.go @@ -1,6 +1,6 @@ package metrics -import( +import ( "time" "github.com/iotaledger/goshimmer/packages/daemon" diff --git a/plugins/tangle/solidifier_test.go b/plugins/tangle/solidifier_test.go index b6a1b8bf..c9ba7d77 100644 --- a/plugins/tangle/solidifier_test.go +++ b/plugins/tangle/solidifier_test.go @@ -1,7 +1,6 @@ package tangle import ( - "github.com/iotaledger/hive.go/parameter" "os" "sync" "testing" @@ -10,6 +9,7 @@ import ( "github.com/iotaledger/goshimmer/packages/node" "github.com/iotaledger/goshimmer/plugins/gossip" "github.com/iotaledger/hive.go/events" + "github.com/iotaledger/hive.go/parameter" "github.com/iotaledger/iota.go/trinary" ) diff --git a/plugins/ui/files.go b/plugins/ui/files.go index 3d361194..a336e087 100644 --- a/plugins/ui/files.go +++ b/plugins/ui/files.go @@ -1,7 +1,7 @@ package ui var files = map[string]string{ - "css/styles.css":`/* mobile */ + "css/styles.css": `/* mobile */ html { font-size:12px; } @@ -206,7 +206,7 @@ body.fade { font-size: 0.8rem; } `, - "index.html":`<!DOCTYPE html> + "index.html": `<!DOCTYPE html> <html> <head> @@ -365,7 +365,7 @@ body.fade { </body> </html>`, - "js/forcegraph.js":` + "js/forcegraph.js": ` Vue.component('force-graph', { props:['neighbors', 'me'], data: function() { @@ -423,7 +423,7 @@ Vue.component('force-graph', { '</div>'+ '</div>' })`, - "js/icons.js":` + "js/icons.js": ` Vue.component('iota-icon', { props:['size'], template: '<svg :height="size" :width="size" style="margin-right:10px;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 128 128" xml:space="preserve"><path d="M79.6 24.9c-.1-2.8 2.4-5.4 5.6-5.3 2.8.1 5.1 2.5 5.1 5.4 0 3-2.5 5.3-5.6 5.3-2.8 0-5.1-2.5-5.1-5.4z" fill="#FFF"/><path d="M91 95.4c3 0 5.3 2.3 5.3 5.3s-2.4 5.4-5.4 5.4c-2.9 0-5.3-2.4-5.3-5.4 0-3 2.4-5.3 5.4-5.3z" fill="#FFF"/><path d="M22.4 73.4c-3 0-5.3-2.4-5.3-5.5 0-2.9 2.4-5.2 5.4-5.2 3 0 5.3 2.4 5.3 5.5-.1 2.9-2.5 5.2-5.4 5.2z" fill="#FFF"/><path d="M81.9 39.2c0-2.6 2-4.6 4.6-4.6 2.5 0 4.6 2.1 4.6 4.6 0 2.5-2.1 4.6-4.6 4.6-2.6 0-4.6-2.1-4.6-4.6z" fill="#FFF"/><path d="M33.9 55.1c2.6 0 4.6 2 4.7 4.5 0 2.5-2.1 4.6-4.6 4.6-2.5 0-4.6-2.1-4.6-4.6-.1-2.5 2-4.5 4.5-4.5z" fill="#FFF"/><path d="M98.4 45.4c-2.5 0-4.6-2.1-4.6-4.6 0-2.6 2.1-4.6 4.6-4.6 2.5 0 4.6 2.1 4.6 4.6 0 2.6-2 4.6-4.6 4.6z" fill="#FFF"/><path d="M77.9 99.5c-2.5 0-4.6-2.1-4.6-4.6 0-2.5 2-4.5 4.6-4.6 2.5 0 4.6 2.1 4.6 4.6 0 2.5-2.1 4.6-4.6 4.6z" fill="#FFF"/><path d="M33.9 48.5c0 2.5-2.1 4.6-4.6 4.6-2.5 0-4.5-2.1-4.5-4.6 0-2.5 2.1-4.6 4.6-4.6 2.5-.1 4.6 2 4.5 4.6z" fill="#FFF"/><path d="M70.4 109c-2.5 0-4.5-2-4.5-4.6 0-2.5 2-4.5 4.6-4.6 2.5 0 4.6 2.1 4.6 4.6-.1 2.6-2.1 4.6-4.7 4.6z" fill="#FFF"/><path d="M56.9 97.1c0-2.2 1.7-3.9 3.9-3.9s3.9 1.8 3.9 4-1.8 3.9-3.9 3.9c-2.2 0-3.9-1.8-3.9-4z" fill="#FFF"/><path d="M100.9 52.9c0 2.2-1.8 3.9-3.9 3.9-2.1 0-3.9-1.8-3.9-3.9 0-2.2 1.8-4 3.9-3.9 2.1 0 3.9 1.7 3.9 3.9z" fill="#FFF"/><path d="M44.4 43.7c0 2.2-1.7 3.9-3.9 3.9s-3.9-1.7-3.9-4c0-2.2 1.7-3.9 3.9-3.9 2.3.1 4 1.8 3.9 4z" fill="#FFF"/><path d="M49 54.9c0 2.2-1.7 3.9-3.9 3.9s-3.9-1.7-3.9-3.9 1.7-4 3.9-3.9c2.2 0 3.9 1.7 3.9 3.9z" fill="#FFF"/><path d="M35 33.5c0-2.2 1.8-3.9 3.9-3.9 2.2 0 3.9 1.8 3.9 3.9 0 2.2-1.7 3.9-3.9 3.9S35 35.7 35 33.5z" fill="#FFF"/><path d="M81.1 51.3c0-2.2 1.7-3.9 3.9-3.9s4 1.8 3.9 4c0 2.2-1.8 3.9-3.9 3.9-2.2-.2-3.9-1.9-3.9-4z" fill="#FFF"/><path d="M68.2 83.7c2.1 0 3.9 1.8 3.9 3.9 0 2.2-1.8 3.9-4 3.9s-3.9-1.7-3.9-3.9c.1-2.2 1.9-3.9 4-3.9z" fill="#FFF"/><path d="M56.7 103.6c0 2.2-1.7 3.9-3.9 3.9s-3.9-1.7-3.9-3.9 1.8-4 3.9-3.9c2.2 0 3.9 1.7 3.9 3.9z" fill="#FFF"/><path d="M106.5 60.5c-2.1 0-3.8-1.8-3.9-3.9 0-2.2 1.8-3.9 4-3.9 2.1 0 3.9 1.8 3.9 3.9 0 2.2-1.8 3.9-4 3.9z" fill="#FFF"/><path d="M57.5 89.3c0 1.9-1.5 3.4-3.4 3.3-1.9 0-3.4-1.5-3.4-3.3 0-1.9 1.5-3.4 3.4-3.4s3.4 1.5 3.4 3.4z" fill="#FFF"/><path d="M50.7 38.5c1.9 0 3.3 1.5 3.3 3.3 0 1.8-1.5 3.4-3.3 3.4-1.8 0-3.4-1.5-3.4-3.4.1-1.8 1.6-3.3 3.4-3.3z" fill="#FFF"/><path d="M58.2 79.7c0-1.9 1.4-3.4 3.3-3.4s3.4 1.5 3.4 3.3c0 1.9-1.5 3.3-3.3 3.3-1.9.1-3.4-1.3-3.4-3.2z" fill="#FFF"/><path d="M46.2 99.1c-1.9 0-3.4-1.4-3.4-3.3s1.5-3.3 3.3-3.4c1.9 0 3.4 1.5 3.4 3.4 0 1.8-1.5 3.3-3.3 3.3z" fill="#FFF"/><path d="M84.7 61c0 1.8-1.4 3.3-3.3 3.3s-3.4-1.5-3.3-3.4c0-1.9 1.5-3.3 3.3-3.3 1.9 0 3.3 1.5 3.3 3.4z" fill="#FFF"/><path d="M49.1 35c-1.9 0-3.4-1.4-3.4-3.3s1.5-3.4 3.4-3.4c1.8 0 3.3 1.5 3.4 3.4 0 1.8-1.5 3.3-3.4 3.3z" fill="#FFF"/><path d="M93.4 66c-1.9 0-3.3-1.5-3.3-3.3 0-1.8 1.5-3.3 3.4-3.3s3.3 1.5 3.3 3.4c0 1.8-1.5 3.2-3.4 3.2z" fill="#FFF"/><path d="M55.2 56.4c-1.8 0-3.3-1.5-3.3-3.4 0-1.8 1.6-3.3 3.4-3.3 1.9 0 3.3 1.5 3.3 3.4s-1.5 3.3-3.4 3.3z" fill="#FFF"/><path d="M103 69.6c-1.9-.1-3.3-1.6-3.3-3.5.1-1.8 1.6-3.3 3.4-3.2 1.9.1 3.4 1.6 3.3 3.6-.1 1.8-1.6 3.2-3.4 3.1z" fill="#FFF"/><path d="M64 56.4c-1.6 0-2.9-1.3-2.9-2.9 0-1.6 1.3-2.8 2.9-2.8 1.6 0 2.9 1.3 2.8 2.9.1 1.6-1.1 2.8-2.8 2.8z" fill="#FFF"/><path d="M95.4 73.7c0-1.6 1.2-2.9 2.8-2.9 1.6 0 2.9 1.2 2.9 2.9 0 1.6-1.4 3-2.9 3-1.5-.1-2.8-1.4-2.8-3z" fill="#FFF"/><path d="M60.7 32.2c0 1.6-1.2 2.8-2.9 2.8-1.6 0-2.9-1.3-2.9-2.9 0-1.6 1.3-2.9 3-2.8 1.6 0 2.8 1.3 2.8 2.9z" fill="#FFF"/><path d="M60.4 71.9c0 1.6-1.2 2.8-2.8 2.9-1.7 0-2.9-1.3-2.9-2.9 0-1.6 1.3-2.9 2.9-2.9 1.6 0 2.8 1.3 2.8 2.9z" fill="#FFF"/><path d="M50.2 84.3c-1.6 0-2.9-1.2-2.9-2.8 0-1.6 1.3-2.9 2.9-2.9 1.5 0 2.8 1.3 2.8 2.8 0 1.6-1.2 2.9-2.8 2.9z" fill="#FFF"/><path d="M91.5 70c0 1.6-1.2 2.9-2.9 2.9-1.5 0-2.9-1.4-2.9-2.9 0-1.6 1.3-2.9 2.9-2.9 1.7 0 2.9 1.3 2.9 2.9z" fill="#FFF"/><path d="M76.7 65.5c1.7 0 2.8 1.2 2.9 2.8 0 1.6-1.2 2.9-2.9 2.9-1.6 0-2.9-1.3-2.9-2.9 0-1.6 1.2-2.8 2.9-2.8z" fill="#FFF"/><path d="M45 87.9c0 1.6-1.3 2.9-2.9 2.9-1.6 0-2.9-1.3-2.9-2.9 0-1.6 1.3-2.9 2.9-2.9 1.6 0 2.9 1.3 2.9 2.9z" fill="#FFF"/><path d="M59.5 45.2c-1.6 0-2.9-1.3-2.9-2.9 0-1.5 1.3-2.9 2.9-2.9 1.5 0 2.9 1.3 2.9 2.9 0 1.6-1.3 2.9-2.9 2.9z" fill="#FFF"/><path d="M85.8 75.1c0 1.4-1.1 2.5-2.5 2.5s-2.4-1.1-2.4-2.5 1.1-2.5 2.4-2.5c1.3.1 2.4 1.2 2.5 2.5z" fill="#FFF"/><path d="M58.2 64.6c0 1.4-1.1 2.5-2.4 2.5-1.3 0-2.5-1.2-2.5-2.5s1.2-2.5 2.5-2.5c1.3.1 2.4 1.2 2.4 2.5z" fill="#FFF"/><path d="M40.4 78.2c1.4 0 2.5 1.1 2.4 2.5 0 1.3-1.2 2.5-2.5 2.5-1.4 0-2.5-1.2-2.5-2.6.1-1.4 1.2-2.4 2.6-2.4z" fill="#FFF"/><path d="M71.2 58c-1.4 0-2.5-1-2.5-2.4s1-2.5 2.5-2.5c1.4 0 2.5 1.1 2.5 2.4 0 1.5-1.1 2.5-2.5 2.5z" fill="#FFF"/><path d="M66.7 41.9c1.4 0 2.4 1.1 2.4 2.5s-1.1 2.5-2.4 2.5c-1.4 0-2.5-1.1-2.5-2.5s1.1-2.5 2.5-2.5z" fill="#FFF"/><path d="M50.7 74.2c0 1.4-1.1 2.5-2.4 2.5-1.3 0-2.5-1.2-2.5-2.6 0-1.4 1.1-2.4 2.5-2.4s2.4 1.1 2.4 2.5z" fill="#FFF"/><path d="M71.3 71.1c1.4 0 2.4 1.1 2.4 2.5S72.6 76 71.3 76c-1.4 0-2.5-1.1-2.5-2.5.1-1.4 1.1-2.4 2.5-2.4z" fill="#FFF"/><path d="M95.3 78.8c0 1.4-1 2.5-2.5 2.5-1.4 0-2.4-1.1-2.4-2.5 0-1.3 1.1-2.5 2.4-2.5 1.4 0 2.5 1.1 2.5 2.5z" fill="#FFF"/><path d="M65.1 31.8c1.4 0 2.4 1 2.4 2.4s-1.1 2.5-2.4 2.5c-1.4 0-2.5-1.1-2.5-2.5s1.1-2.4 2.5-2.4z" fill="#FFF"/><path d="M72.7 37.3c0 1.2-1 2.1-2.2 2.1-1.2 0-2.1-1-2.1-2.1 0-1.2.9-2.1 2.1-2.1 1.3 0 2.2.9 2.2 2.1z" fill="#FFF"/><path d="M38.1 74.2c0-1.2.9-2 2.1-2 1.2 0 2.2 1 2.1 2.2 0 1.1-1 2.1-2.1 2.1-1.2 0-2.1-1-2.1-2.3z" fill="#FFF"/><path d="M89.6 82.1c0 1.2-.9 2.2-2.1 2.2-1.2 0-2.2-1-2.2-2.1 0-1.2 1-2.1 2.2-2.1 1.2-.1 2.1.8 2.1 2z" fill="#FFF"/><path d="M50.3 67.9c0 1.2-1 2.1-2.1 2.1-1.2 0-2.1-1-2.1-2.2 0-1.1 1-2.1 2.1-2.1 1.2 0 2.1 1 2.1 2.2z" fill="#FFF"/><path d="M72.2 49.5c-1.2 0-2.1-.9-2.1-2.1 0-1.2.9-2.1 2.1-2.1 1.2 0 2.1.9 2.1 2.1 0 1.3-.9 2.1-2.1 2.1z" fill="#FFF"/><path d="M77.9 76.3c1.2 0 2.1.9 2.1 2.1 0 1.2-1 2.2-2.2 2.2-1.1 0-2-1-2-2.1 0-1.3.9-2.2 2.1-2.2z" fill="#FFF"/><path d="M43.1 69.1c0 1-.8 1.8-1.8 1.8s-1.9-.9-1.9-1.9c0-1 .9-1.8 1.9-1.8 1.1.1 1.8.8 1.8 1.9z" fill="#FFF"/><path d="M84.2 83.8c0 1-.8 1.8-1.8 1.8s-1.8-.9-1.8-1.8c0-1 .8-1.8 1.9-1.8.9 0 1.7.8 1.7 1.8z" fill="#FFF"/><path d="M74.5 39.1c1.1 0 1.9.7 1.9 1.8 0 1-.8 1.8-1.8 1.8s-1.8-.7-1.8-1.8c0-1 .7-1.8 1.7-1.8z" fill="#FFF"/></svg>' @@ -443,7 +443,7 @@ Vue.component('stop-icon', { Vue.component('empty-icon', { template: '<svg></svg>' })`, - "js/initials.js":`var initialData = { + "js/initials.js": `var initialData = { loggedIn: false, connected: false, tabs: ['Logs', 'Spammer', 'Transactions', 'Neighbors'], @@ -458,7 +458,7 @@ Vue.component('empty-icon', { loginError:'', } `, - "js/main.js":`new Vue({ + "js/main.js": `new Vue({ el: '#app', created() { this.init() @@ -618,7 +618,7 @@ Vue.component('empty-icon', { } }, })`, - "js/tpschart.js":`Vue.component('tps-chart', { + "js/tpschart.js": `Vue.component('tps-chart', { props: ['tps'], watch:{ tps: function (val, oldVal) { @@ -900,7 +900,7 @@ var highchartsTheme = { contrastTextColor: '#F0F0F3', maskColor: 'rgba(255,255,255,0.3)' }`, - "js/utils.js":`function uptimeConverter(seconds) { + "js/utils.js": `function uptimeConverter(seconds) { var s = '' var hrs = Math.floor(seconds / 3600); if (hrs) s += hrs+'h ' @@ -992,5 +992,4 @@ function debounce(func, delay) { function sleep(ms) { return new Promise(resolve => setTimeout(resolve, ms)); }`, - } diff --git a/plugins/zeromq/plugin.go b/plugins/zeromq/plugin.go index ce8ad4c0..7b892491 100644 --- a/plugins/zeromq/plugin.go +++ b/plugins/zeromq/plugin.go @@ -1,7 +1,6 @@ package zeromq import ( - "github.com/iotaledger/hive.go/parameter" "strconv" "strings" "time" @@ -11,6 +10,7 @@ import ( "github.com/iotaledger/goshimmer/packages/node" "github.com/iotaledger/goshimmer/plugins/tangle" "github.com/iotaledger/hive.go/events" + "github.com/iotaledger/hive.go/parameter" ) // zeromq logging is disabled by default -- GitLab