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

Fix linter errors and warnings

parent e573579b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 142 additions and 149 deletions
.golangci.yml
+ 0
− 2
View file @ 69d38bd5
......@@ -4,8 +4,6 @@ run:
linters-settings:
gofmt:
simplify: true
goimports:
local-prefixes: github.com/iotaledger/goshimmer
golint:
min-confidence: 0.9
gocyclo:
......
packages/database/database.go
+ 5
− 4
View file @ 69d38bd5
......@@ -78,14 +78,16 @@ func (this *databaseImpl) Set(key []byte, value []byte) error {
}
func (this *databaseImpl) Contains(key []byte) (bool, error) {
if err := this.db.View(func(txn *badger.Txn) error {
err := this.db.View(func(txn *badger.Txn) error {
_, err := txn.Get(key)
if err != nil {
return err
}
return nil
}); err == ErrKeyNotFound {
})
if err == ErrKeyNotFound {
return false, nil
} else {
return err == nil, err
......@@ -94,9 +96,8 @@ func (this *databaseImpl) Contains(key []byte) (bool, error) {
func (this *databaseImpl) Get(key []byte) ([]byte, error) {
var result []byte = nil
var err error = nil
err = this.db.View(func(txn *badger.Txn) error {
err := this.db.View(func(txn *badger.Txn) error {
item, err := txn.Get(key)
if err != nil {
return err
......
packages/datastructure/doubly_linked_list_test.go
+ 4
− 8
View file @ 69d38bd5
......@@ -29,11 +29,9 @@ func TestDelete(t *testing.T) {
t.Error(err)
}
firstEntry, err := doublyLinkedList.GetFirst()
if err != nil {
if firstEntry, err := doublyLinkedList.GetFirst(); err != nil {
t.Error(err)
}
if firstEntry != 13 {
} else if firstEntry != 13 {
t.Error("first entry should be 13 after delete")
}
......@@ -41,11 +39,9 @@ func TestDelete(t *testing.T) {
t.Error(err)
}
lastEntry, err := doublyLinkedList.GetLast()
if err != nil {
if lastEntry, err := doublyLinkedList.GetLast(); err != nil {
t.Error(err)
}
if lastEntry != 15 {
} else if lastEntry != 15 {
t.Error("last entry should be 15 after delete")
}
......
packages/iac/iac.go
+ 1
− 1
View file @ 69d38bd5
......@@ -7,7 +7,7 @@ import (
)
func Decode(trinary ternary.Trinary) (result *Area, err errors.IdentifiableError) {
if olcCode, conversionErr := OLCCodeFromTrinary(trinary); err != nil {
if olcCode, conversionErr := OLCCodeFromTrinary(trinary); conversionErr != nil {
err = conversionErr
} else {
if codeArea, olcErr := olc.Decode(olcCode); olcErr == nil {
......
packages/transaction/constants.go
+ 1
− 1
View file @ 69d38bd5
......@@ -41,5 +41,5 @@ const (
NONCE_END = NONCE_OFFSET + NONCE_SIZE
// the full size of a transaction
MARSHALLED_TOTAL_SIZE = NONCE_END
MARSHALED_TOTAL_SIZE = NONCE_END
)
packages/transaction/transaction.go
+ 1
− 1
View file @ 69d38bd5
......@@ -49,7 +49,7 @@ func FromTrits(trits ternary.Trits, optionalHash ...ternary.Trits) *Transaction
}
func FromBytes(bytes []byte) *Transaction {
transaction := FromTrits(ternary.BytesToTrits(bytes)[:MARSHALLED_TOTAL_SIZE])
transaction := FromTrits(ternary.BytesToTrits(bytes)[:MARSHALED_TOTAL_SIZE])
transaction.Bytes = bytes
return transaction
......
packages/typeconversion/typeconversion.go
+ 1
− 1
View file @ 69d38bd5
......@@ -8,7 +8,7 @@ import (
func BytesToString(b []byte) string {
bh := (*reflect.SliceHeader)(unsafe.Pointer(&b))
return *(*string)(unsafe.Pointer(&reflect.StringHeader{bh.Data, bh.Len}))
return *(*string)(unsafe.Pointer(&reflect.StringHeader{Data: bh.Data, Len: bh.Len}))
}
func StringToBytes(str string) []byte {
......
plugins/analysis/server/constants.go
+ 5
− 5
View file @ 69d38bd5
......@@ -16,9 +16,9 @@ const (
STATE_INITIAL = byte(255)
STATE_INITIAL_ADDNODE = byte(254)
STATE_CONSECUTIVE = byte(253)
STATE_PING = ping.MARSHALLED_PACKET_HEADER
STATE_ADD_NODE = addnode.MARSHALLED_PACKET_HEADER
STATE_REMOVE_NODE = removenode.MARSHALLED_PACKET_HEADER
STATE_CONNECT_NODES = connectnodes.MARSHALLED_PACKET_HEADER
STATE_DISCONNECT_NODES = disconnectnodes.MARSHALLED_PACKET_HEADER
STATE_PING = ping.MARSHALED_PACKET_HEADER
STATE_ADD_NODE = addnode.MARSHALED_PACKET_HEADER
STATE_REMOVE_NODE = removenode.MARSHALED_PACKET_HEADER
STATE_CONNECT_NODES = connectnodes.MARSHALED_PACKET_HEADER
STATE_DISCONNECT_NODES = disconnectnodes.MARSHALED_PACKET_HEADER
)
plugins/analysis/server/plugin.go
+ 32
− 32
View file @ 69d38bd5
......@@ -73,11 +73,11 @@ func HandleConnection(conn *network.ManagedConnection) {
conn.Events.Close.Attach(onDisconnect)
maxPacketsSize := getMaxPacketSize(
ping.MARSHALLED_TOTAL_SIZE,
addnode.MARSHALLED_TOTAL_SIZE,
removenode.MARSHALLED_TOTAL_SIZE,
connectnodes.MARSHALLED_TOTAL_SIZE,
disconnectnodes.MARSHALLED_PACKET_HEADER,
ping.MARSHALED_TOTAL_SIZE,
addnode.MARSHALED_TOTAL_SIZE,
removenode.MARSHALED_TOTAL_SIZE,
connectnodes.MARSHALED_TOTAL_SIZE,
disconnectnodes.MARSHALED_PACKET_HEADER,
)
go conn.Read(make([]byte, maxPacketsSize))
......@@ -112,19 +112,19 @@ func processIncomingPacket(connectionState *byte, receiveBuffer *[]byte, conn *n
switch *connectionState {
case STATE_ADD_NODE:
*receiveBuffer = make([]byte, addnode.MARSHALLED_TOTAL_SIZE)
*receiveBuffer = make([]byte, addnode.MARSHALED_TOTAL_SIZE)
case STATE_PING:
*receiveBuffer = make([]byte, ping.MARSHALLED_TOTAL_SIZE)
*receiveBuffer = make([]byte, ping.MARSHALED_TOTAL_SIZE)
case STATE_CONNECT_NODES:
*receiveBuffer = make([]byte, connectnodes.MARSHALLED_TOTAL_SIZE)
*receiveBuffer = make([]byte, connectnodes.MARSHALED_TOTAL_SIZE)
case STATE_DISCONNECT_NODES:
*receiveBuffer = make([]byte, disconnectnodes.MARSHALLED_TOTAL_SIZE)
*receiveBuffer = make([]byte, disconnectnodes.MARSHALED_TOTAL_SIZE)
case STATE_REMOVE_NODE:
*receiveBuffer = make([]byte, removenode.MARSHALLED_TOTAL_SIZE)
*receiveBuffer = make([]byte, removenode.MARSHALED_TOTAL_SIZE)
}
}
......@@ -162,28 +162,28 @@ func parsePackageHeader(data []byte) (ConnectionState, []byte, error) {
var receiveBuffer []byte
switch data[0] {
case ping.MARSHALLED_PACKET_HEADER:
receiveBuffer = make([]byte, ping.MARSHALLED_TOTAL_SIZE)
case ping.MARSHALED_PACKET_HEADER:
receiveBuffer = make([]byte, ping.MARSHALED_TOTAL_SIZE)
connectionState = STATE_PING
case addnode.MARSHALLED_PACKET_HEADER:
receiveBuffer = make([]byte, addnode.MARSHALLED_TOTAL_SIZE)
case addnode.MARSHALED_PACKET_HEADER:
receiveBuffer = make([]byte, addnode.MARSHALED_TOTAL_SIZE)
connectionState = STATE_ADD_NODE
case connectnodes.MARSHALLED_PACKET_HEADER:
receiveBuffer = make([]byte, connectnodes.MARSHALLED_TOTAL_SIZE)
case connectnodes.MARSHALED_PACKET_HEADER:
receiveBuffer = make([]byte, connectnodes.MARSHALED_TOTAL_SIZE)
connectionState = STATE_CONNECT_NODES
case disconnectnodes.MARSHALLED_PACKET_HEADER:
receiveBuffer = make([]byte, disconnectnodes.MARSHALLED_TOTAL_SIZE)
case disconnectnodes.MARSHALED_PACKET_HEADER:
receiveBuffer = make([]byte, disconnectnodes.MARSHALED_TOTAL_SIZE)
connectionState = STATE_DISCONNECT_NODES
case removenode.MARSHALLED_PACKET_HEADER:
receiveBuffer = make([]byte, removenode.MARSHALLED_TOTAL_SIZE)
case removenode.MARSHALED_PACKET_HEADER:
receiveBuffer = make([]byte, removenode.MARSHALED_TOTAL_SIZE)
connectionState = STATE_REMOVE_NODE
......@@ -195,11 +195,11 @@ func parsePackageHeader(data []byte) (ConnectionState, []byte, error) {
}
func processIncomingAddNodePacket(connectionState *byte, receiveBuffer *[]byte, conn *network.ManagedConnection, data []byte, offset *int, connectedNodeId *string) {
remainingCapacity := int(math.Min(float64(addnode.MARSHALLED_TOTAL_SIZE-*offset), float64(len(data))))
remainingCapacity := int(math.Min(float64(addnode.MARSHALED_TOTAL_SIZE-*offset), float64(len(data))))
copy((*receiveBuffer)[*offset:], data[:remainingCapacity])
if *offset+len(data) < addnode.MARSHALLED_TOTAL_SIZE {
if *offset+len(data) < addnode.MARSHALED_TOTAL_SIZE {
*offset += len(data)
} else {
if addNodePacket, err := addnode.Unmarshal(*receiveBuffer); err != nil {
......@@ -222,18 +222,18 @@ func processIncomingAddNodePacket(connectionState *byte, receiveBuffer *[]byte,
*connectionState = STATE_CONSECUTIVE
if *offset+len(data) > addnode.MARSHALLED_TOTAL_SIZE {
if *offset+len(data) > addnode.MARSHALED_TOTAL_SIZE {
processIncomingPacket(connectionState, receiveBuffer, conn, data[remainingCapacity:], offset, connectedNodeId)
}
}
}
func processIncomingPingPacket(connectionState *byte, receiveBuffer *[]byte, conn *network.ManagedConnection, data []byte, offset *int, connectedNodeId *string) {
remainingCapacity := int(math.Min(float64(ping.MARSHALLED_TOTAL_SIZE-*offset), float64(len(data))))
remainingCapacity := int(math.Min(float64(ping.MARSHALED_TOTAL_SIZE-*offset), float64(len(data))))
copy((*receiveBuffer)[*offset:], data[:remainingCapacity])
if *offset+len(data) < ping.MARSHALLED_TOTAL_SIZE {
if *offset+len(data) < ping.MARSHALED_TOTAL_SIZE {
*offset += len(data)
} else {
if _, err := ping.Unmarshal(*receiveBuffer); err != nil {
......@@ -246,18 +246,18 @@ func processIncomingPingPacket(connectionState *byte, receiveBuffer *[]byte, con
*connectionState = STATE_CONSECUTIVE
if *offset+len(data) > ping.MARSHALLED_TOTAL_SIZE {
if *offset+len(data) > ping.MARSHALED_TOTAL_SIZE {
processIncomingPacket(connectionState, receiveBuffer, conn, data[remainingCapacity:], offset, connectedNodeId)
}
}
}
func processIncomingConnectNodesPacket(connectionState *byte, receiveBuffer *[]byte, conn *network.ManagedConnection, data []byte, offset *int, connectedNodeId *string) {
remainingCapacity := int(math.Min(float64(connectnodes.MARSHALLED_TOTAL_SIZE-*offset), float64(len(data))))
remainingCapacity := int(math.Min(float64(connectnodes.MARSHALED_TOTAL_SIZE-*offset), float64(len(data))))
copy((*receiveBuffer)[*offset:], data[:remainingCapacity])
if *offset+len(data) < connectnodes.MARSHALLED_TOTAL_SIZE {
if *offset+len(data) < connectnodes.MARSHALED_TOTAL_SIZE {
*offset += len(data)
} else {
if connectNodesPacket, err := connectnodes.Unmarshal(*receiveBuffer); err != nil {
......@@ -275,18 +275,18 @@ func processIncomingConnectNodesPacket(connectionState *byte, receiveBuffer *[]b
*connectionState = STATE_CONSECUTIVE
if *offset+len(data) > connectnodes.MARSHALLED_TOTAL_SIZE {
if *offset+len(data) > connectnodes.MARSHALED_TOTAL_SIZE {
processIncomingPacket(connectionState, receiveBuffer, conn, data[remainingCapacity:], offset, connectedNodeId)
}
}
}
func processIncomingDisconnectNodesPacket(connectionState *byte, receiveBuffer *[]byte, conn *network.ManagedConnection, data []byte, offset *int, connectedNodeId *string) {
remainingCapacity := int(math.Min(float64(disconnectnodes.MARSHALLED_TOTAL_SIZE-*offset), float64(len(data))))
remainingCapacity := int(math.Min(float64(disconnectnodes.MARSHALED_TOTAL_SIZE-*offset), float64(len(data))))
copy((*receiveBuffer)[*offset:], data[:remainingCapacity])
if *offset+len(data) < disconnectnodes.MARSHALLED_TOTAL_SIZE {
if *offset+len(data) < disconnectnodes.MARSHALED_TOTAL_SIZE {
*offset += len(data)
} else {
if disconnectNodesPacket, err := disconnectnodes.Unmarshal(*receiveBuffer); err != nil {
......@@ -304,7 +304,7 @@ func processIncomingDisconnectNodesPacket(connectionState *byte, receiveBuffer *
*connectionState = STATE_CONSECUTIVE
if *offset+len(data) > disconnectnodes.MARSHALLED_TOTAL_SIZE {
if *offset+len(data) > disconnectnodes.MARSHALED_TOTAL_SIZE {
processIncomingPacket(connectionState, receiveBuffer, conn, data[remainingCapacity:], offset, connectedNodeId)
}
}
......
plugins/analysis/types/addnode/constants.go
+ 8
− 8
View file @ 69d38bd5
package addnode
const (
MARSHALLED_PACKET_HEADER = 0x01
MARSHALED_PACKET_HEADER = 0x01
MARSHALLED_PACKET_HEADER_START = 0
MARSHALLED_PACKET_HEADER_SIZE = 1
MARSHALLED_PACKET_HEADER_END = MARSHALLED_PACKET_HEADER_START + MARSHALLED_PACKET_HEADER_SIZE
MARSHALED_PACKET_HEADER_START = 0
MARSHALED_PACKET_HEADER_SIZE = 1
MARSHALED_PACKET_HEADER_END = MARSHALED_PACKET_HEADER_START + MARSHALED_PACKET_HEADER_SIZE
MARSHALLED_ID_START = MARSHALLED_PACKET_HEADER_END
MARSHALLED_ID_SIZE = 20
MARSHALLED_ID_END = MARSHALLED_ID_START + MARSHALLED_ID_SIZE
MARSHALED_ID_START = MARSHALED_PACKET_HEADER_END
MARSHALED_ID_SIZE = 20
MARSHALED_ID_END = MARSHALED_ID_START + MARSHALED_ID_SIZE
MARSHALLED_TOTAL_SIZE = MARSHALLED_ID_END
MARSHALED_TOTAL_SIZE = MARSHALED_ID_END
)
plugins/analysis/types/addnode/packet.go
+ 9
− 9
View file @ 69d38bd5
......@@ -7,24 +7,24 @@ type Packet struct {
}
func Unmarshal(data []byte) (*Packet, error) {
if len(data) < MARSHALLED_TOTAL_SIZE || data[0] != MARSHALLED_PACKET_HEADER {
if len(data) < MARSHALED_TOTAL_SIZE || data[0] != MARSHALED_PACKET_HEADER {
return nil, errors.New("malformed add node packet")
}
unmarshalledPackage := &Packet{
NodeId: make([]byte, MARSHALLED_ID_SIZE),
unmarshaledPackage := &Packet{
NodeId: make([]byte, MARSHALED_ID_SIZE),
}
copy(unmarshalledPackage.NodeId, data[MARSHALLED_ID_START:MARSHALLED_ID_END])
copy(unmarshaledPackage.NodeId, data[MARSHALED_ID_START:MARSHALED_ID_END])
return unmarshalledPackage, nil
return unmarshaledPackage, nil
}
func (packet *Packet) Marshal() []byte {
marshalledPackage := make([]byte, MARSHALLED_TOTAL_SIZE)
marshaledPackage := make([]byte, MARSHALED_TOTAL_SIZE)
marshalledPackage[MARSHALLED_PACKET_HEADER_START] = MARSHALLED_PACKET_HEADER
copy(marshalledPackage[MARSHALLED_ID_START:MARSHALLED_ID_END], packet.NodeId[:MARSHALLED_ID_SIZE])
marshaledPackage[MARSHALED_PACKET_HEADER_START] = MARSHALED_PACKET_HEADER
copy(marshaledPackage[MARSHALED_ID_START:MARSHALED_ID_END], packet.NodeId[:MARSHALED_ID_SIZE])
return marshalledPackage
return marshaledPackage
}
plugins/analysis/types/connectnodes/constants.go
+ 11
− 11
View file @ 69d38bd5
package connectnodes
const (
MARSHALLED_PACKET_HEADER = 0x03
MARSHALED_PACKET_HEADER = 0x03
MARSHALLED_PACKET_HEADER_START = 0
MARSHALLED_PACKET_HEADER_SIZE = 1
MARSHALLED_PACKET_HEADER_END = MARSHALLED_PACKET_HEADER_START + MARSHALLED_PACKET_HEADER_SIZE
MARSHALED_PACKET_HEADER_START = 0
MARSHALED_PACKET_HEADER_SIZE = 1
MARSHALED_PACKET_HEADER_END = MARSHALED_PACKET_HEADER_START + MARSHALED_PACKET_HEADER_SIZE
MARSHALLED_SOURCE_ID_START = MARSHALLED_PACKET_HEADER_END
MARSHALLED_SOURCE_ID_SIZE = 20
MARSHALLED_SOURCE_ID_END = MARSHALLED_SOURCE_ID_START + MARSHALLED_SOURCE_ID_SIZE
MARSHALED_SOURCE_ID_START = MARSHALED_PACKET_HEADER_END
MARSHALED_SOURCE_ID_SIZE = 20
MARSHALED_SOURCE_ID_END = MARSHALED_SOURCE_ID_START + MARSHALED_SOURCE_ID_SIZE
MARSHALLED_TARGET_ID_START = MARSHALLED_SOURCE_ID_END
MARSHALLED_TARGET_ID_SIZE = 20
MARSHALLED_TARGET_ID_END = MARSHALLED_TARGET_ID_START + MARSHALLED_TARGET_ID_SIZE
MARSHALED_TARGET_ID_START = MARSHALED_SOURCE_ID_END
MARSHALED_TARGET_ID_SIZE = 20
MARSHALED_TARGET_ID_END = MARSHALED_TARGET_ID_START + MARSHALED_TARGET_ID_SIZE
MARSHALLED_TOTAL_SIZE = MARSHALLED_TARGET_ID_END
MARSHALED_TOTAL_SIZE = MARSHALED_TARGET_ID_END
)
plugins/analysis/types/connectnodes/packet.go
+ 12
− 12
View file @ 69d38bd5
......@@ -8,27 +8,27 @@ type Packet struct {
}
func Unmarshal(data []byte) (*Packet, error) {
if len(data) < MARSHALLED_TOTAL_SIZE || data[0] != MARSHALLED_PACKET_HEADER {
if len(data) < MARSHALED_TOTAL_SIZE || data[0] != MARSHALED_PACKET_HEADER {
return nil, errors.New("malformed connect nodes packet")
}
unmarshalledPackage := &Packet{
SourceId: make([]byte, MARSHALLED_SOURCE_ID_SIZE),
TargetId: make([]byte, MARSHALLED_TARGET_ID_SIZE),
unmarshaledPackage := &Packet{
SourceId: make([]byte, MARSHALED_SOURCE_ID_SIZE),
TargetId: make([]byte, MARSHALED_TARGET_ID_SIZE),
}
copy(unmarshalledPackage.SourceId, data[MARSHALLED_SOURCE_ID_START:MARSHALLED_SOURCE_ID_END])
copy(unmarshalledPackage.TargetId, data[MARSHALLED_TARGET_ID_START:MARSHALLED_TARGET_ID_END])
copy(unmarshaledPackage.SourceId, data[MARSHALED_SOURCE_ID_START:MARSHALED_SOURCE_ID_END])
copy(unmarshaledPackage.TargetId, data[MARSHALED_TARGET_ID_START:MARSHALED_TARGET_ID_END])
return unmarshalledPackage, nil
return unmarshaledPackage, nil
}
func (packet *Packet) Marshal() []byte {
marshalledPackage := make([]byte, MARSHALLED_TOTAL_SIZE)
marshaledPackage := make([]byte, MARSHALED_TOTAL_SIZE)
marshalledPackage[MARSHALLED_PACKET_HEADER_START] = MARSHALLED_PACKET_HEADER
copy(marshalledPackage[MARSHALLED_SOURCE_ID_START:MARSHALLED_SOURCE_ID_END], packet.SourceId[:MARSHALLED_SOURCE_ID_SIZE])
copy(marshalledPackage[MARSHALLED_TARGET_ID_START:MARSHALLED_TARGET_ID_END], packet.TargetId[:MARSHALLED_TARGET_ID_SIZE])
marshaledPackage[MARSHALED_PACKET_HEADER_START] = MARSHALED_PACKET_HEADER
copy(marshaledPackage[MARSHALED_SOURCE_ID_START:MARSHALED_SOURCE_ID_END], packet.SourceId[:MARSHALED_SOURCE_ID_SIZE])
copy(marshaledPackage[MARSHALED_TARGET_ID_START:MARSHALED_TARGET_ID_END], packet.TargetId[:MARSHALED_TARGET_ID_SIZE])
return marshalledPackage
return marshaledPackage
}
plugins/analysis/types/disconnectnodes/constants.go
+ 11
− 11
View file @ 69d38bd5
package disconnectnodes
const (
MARSHALLED_PACKET_HEADER = 0x04
MARSHALED_PACKET_HEADER = 0x04
MARSHALLED_PACKET_HEADER_START = 0
MARSHALLED_PACKET_HEADER_SIZE = 1
MARSHALLED_PACKET_HEADER_END = MARSHALLED_PACKET_HEADER_START + MARSHALLED_PACKET_HEADER_SIZE
MARSHALED_PACKET_HEADER_START = 0
MARSHALED_PACKET_HEADER_SIZE = 1
MARSHALED_PACKET_HEADER_END = MARSHALED_PACKET_HEADER_START + MARSHALED_PACKET_HEADER_SIZE
MARSHALLED_SOURCE_ID_START = MARSHALLED_PACKET_HEADER_END
MARSHALLED_SOURCE_ID_SIZE = 20
MARSHALLED_SOURCE_ID_END = MARSHALLED_SOURCE_ID_START + MARSHALLED_SOURCE_ID_SIZE
MARSHALED_SOURCE_ID_START = MARSHALED_PACKET_HEADER_END
MARSHALED_SOURCE_ID_SIZE = 20
MARSHALED_SOURCE_ID_END = MARSHALED_SOURCE_ID_START + MARSHALED_SOURCE_ID_SIZE
MARSHALLED_TARGET_ID_START = MARSHALLED_SOURCE_ID_END
MARSHALLED_TARGET_ID_SIZE = 20
MARSHALLED_TARGET_ID_END = MARSHALLED_TARGET_ID_START + MARSHALLED_TARGET_ID_SIZE
MARSHALED_TARGET_ID_START = MARSHALED_SOURCE_ID_END
MARSHALED_TARGET_ID_SIZE = 20
MARSHALED_TARGET_ID_END = MARSHALED_TARGET_ID_START + MARSHALED_TARGET_ID_SIZE
MARSHALLED_TOTAL_SIZE = MARSHALLED_TARGET_ID_END
MARSHALED_TOTAL_SIZE = MARSHALED_TARGET_ID_END
)
plugins/analysis/types/disconnectnodes/packet.go
+ 12
− 12
View file @ 69d38bd5
......@@ -8,27 +8,27 @@ type Packet struct {
}
func Unmarshal(data []byte) (*Packet, error) {
if len(data) < MARSHALLED_TOTAL_SIZE || data[0] != MARSHALLED_PACKET_HEADER {
if len(data) < MARSHALED_TOTAL_SIZE || data[0] != MARSHALED_PACKET_HEADER {
return nil, errors.New("malformed disconnect nodes packet")
}
unmarshalledPackage := &Packet{
SourceId: make([]byte, MARSHALLED_SOURCE_ID_SIZE),
TargetId: make([]byte, MARSHALLED_TARGET_ID_SIZE),
unmarshaledPackage := &Packet{
SourceId: make([]byte, MARSHALED_SOURCE_ID_SIZE),
TargetId: make([]byte, MARSHALED_TARGET_ID_SIZE),
}
copy(unmarshalledPackage.SourceId, data[MARSHALLED_SOURCE_ID_START:MARSHALLED_SOURCE_ID_END])
copy(unmarshalledPackage.TargetId, data[MARSHALLED_TARGET_ID_START:MARSHALLED_TARGET_ID_END])
copy(unmarshaledPackage.SourceId, data[MARSHALED_SOURCE_ID_START:MARSHALED_SOURCE_ID_END])
copy(unmarshaledPackage.TargetId, data[MARSHALED_TARGET_ID_START:MARSHALED_TARGET_ID_END])
return unmarshalledPackage, nil
return unmarshaledPackage, nil
}
func (packet *Packet) Marshal() []byte {
marshalledPackage := make([]byte, MARSHALLED_TOTAL_SIZE)
marshaledPackage := make([]byte, MARSHALED_TOTAL_SIZE)
marshalledPackage[MARSHALLED_PACKET_HEADER_START] = MARSHALLED_PACKET_HEADER
copy(marshalledPackage[MARSHALLED_SOURCE_ID_START:MARSHALLED_SOURCE_ID_END], packet.SourceId[:MARSHALLED_SOURCE_ID_SIZE])
copy(marshalledPackage[MARSHALLED_TARGET_ID_START:MARSHALLED_TARGET_ID_END], packet.TargetId[:MARSHALLED_TARGET_ID_SIZE])
marshaledPackage[MARSHALED_PACKET_HEADER_START] = MARSHALED_PACKET_HEADER
copy(marshaledPackage[MARSHALED_SOURCE_ID_START:MARSHALED_SOURCE_ID_END], packet.SourceId[:MARSHALED_SOURCE_ID_SIZE])
copy(marshaledPackage[MARSHALED_TARGET_ID_START:MARSHALED_TARGET_ID_END], packet.TargetId[:MARSHALED_TARGET_ID_SIZE])
return marshalledPackage
return marshaledPackage
}
plugins/analysis/types/ping/constants.go
+ 5
− 5
View file @ 69d38bd5
package ping
const (
MARSHALLED_PACKET_HEADER = 0x00
MARSHALED_PACKET_HEADER = 0x00
MARSHALLED_PACKET_HEADER_START = 0
MARSHALLED_PACKET_HEADER_SIZE = 1
MARSHALLED_PACKET_HEADER_END = MARSHALLED_PACKET_HEADER_START + MARSHALLED_PACKET_HEADER_SIZE
MARSHALED_PACKET_HEADER_START = 0
MARSHALED_PACKET_HEADER_SIZE = 1
MARSHALED_PACKET_HEADER_END = MARSHALED_PACKET_HEADER_START + MARSHALED_PACKET_HEADER_SIZE
MARSHALLED_TOTAL_SIZE = MARSHALLED_PACKET_HEADER_END
MARSHALED_TOTAL_SIZE = MARSHALED_PACKET_HEADER_END
)
plugins/analysis/types/ping/packet.go
+ 6
− 6
View file @ 69d38bd5
......@@ -5,19 +5,19 @@ import "github.com/pkg/errors"
type Packet struct{}
func Unmarshal(data []byte) (*Packet, error) {
if len(data) < MARSHALLED_TOTAL_SIZE || data[MARSHALLED_PACKET_HEADER_START] != MARSHALLED_PACKET_HEADER {
if len(data) < MARSHALED_TOTAL_SIZE || data[MARSHALED_PACKET_HEADER_START] != MARSHALED_PACKET_HEADER {
return nil, errors.New("malformed ping packet")
}
unmarshalledPacket := &Packet{}
unmarshaledPacket := &Packet{}
return unmarshalledPacket, nil
return unmarshaledPacket, nil
}
func (packet *Packet) Marshal() []byte {
marshalledPackage := make([]byte, MARSHALLED_TOTAL_SIZE)
marshaledPackage := make([]byte, MARSHALED_TOTAL_SIZE)
marshalledPackage[MARSHALLED_PACKET_HEADER_START] = MARSHALLED_PACKET_HEADER
marshaledPackage[MARSHALED_PACKET_HEADER_START] = MARSHALED_PACKET_HEADER
return marshalledPackage
return marshaledPackage
}
plugins/analysis/types/removenode/constants.go
+ 8
− 8
View file @ 69d38bd5
package removenode
const (
MARSHALLED_PACKET_HEADER = 0x02
MARSHALED_PACKET_HEADER = 0x02
MARSHALLED_PACKET_HEADER_START = 0
MARSHALLED_PACKET_HEADER_SIZE = 1
MARSHALLED_PACKET_HEADER_END = MARSHALLED_PACKET_HEADER_START + MARSHALLED_PACKET_HEADER_SIZE
MARSHALED_PACKET_HEADER_START = 0
MARSHALED_PACKET_HEADER_SIZE = 1
MARSHALED_PACKET_HEADER_END = MARSHALED_PACKET_HEADER_START + MARSHALED_PACKET_HEADER_SIZE
MARSHALLED_ID_START = MARSHALLED_PACKET_HEADER_END
MARSHALLED_ID_SIZE = 20
MARSHALLED_ID_END = MARSHALLED_ID_START + MARSHALLED_ID_SIZE
MARSHALED_ID_START = MARSHALED_PACKET_HEADER_END
MARSHALED_ID_SIZE = 20
MARSHALED_ID_END = MARSHALED_ID_START + MARSHALED_ID_SIZE
MARSHALLED_TOTAL_SIZE = MARSHALLED_ID_END
MARSHALED_TOTAL_SIZE = MARSHALED_ID_END
)
plugins/analysis/types/removenode/packet.go
+ 9
− 9
View file @ 69d38bd5
......@@ -7,24 +7,24 @@ type Packet struct {
}
func Unmarshal(data []byte) (*Packet, error) {
if len(data) < MARSHALLED_TOTAL_SIZE || data[0] != MARSHALLED_PACKET_HEADER {
if len(data) < MARSHALED_TOTAL_SIZE || data[0] != MARSHALED_PACKET_HEADER {
return nil, errors.New("malformed remove node packet")
}
unmarshalledPackage := &Packet{
NodeId: make([]byte, MARSHALLED_ID_SIZE),
unmarshaledPackage := &Packet{
NodeId: make([]byte, MARSHALED_ID_SIZE),
}
copy(unmarshalledPackage.NodeId, data[MARSHALLED_ID_START:MARSHALLED_ID_END])
copy(unmarshaledPackage.NodeId, data[MARSHALED_ID_START:MARSHALED_ID_END])
return unmarshalledPackage, nil
return unmarshaledPackage, nil
}
func (packet *Packet) Marshal() []byte {
marshalledPackage := make([]byte, MARSHALLED_TOTAL_SIZE)
marshaledPackage := make([]byte, MARSHALED_TOTAL_SIZE)
marshalledPackage[MARSHALLED_PACKET_HEADER_START] = MARSHALLED_PACKET_HEADER
copy(marshalledPackage[MARSHALLED_ID_START:MARSHALLED_ID_END], packet.NodeId[:MARSHALLED_ID_SIZE])
marshaledPackage[MARSHALED_PACKET_HEADER_START] = MARSHALED_PACKET_HEADER
copy(marshaledPackage[MARSHALED_ID_START:MARSHALED_ID_END], packet.NodeId[:MARSHALED_ID_SIZE])
return marshalledPackage
return marshaledPackage
}
plugins/analysis/webinterface/recordedevents/recorded_events.go
+ 1
− 3
View file @ 69d38bd5
......@@ -9,8 +9,6 @@ import (
"github.com/iotaledger/goshimmer/plugins/analysis/webinterface/types"
)
var recordedEvents = make([]types.EventHandlersConsumer, 0)
var nodes = make(map[string]bool)
var links = make(map[string]map[string]bool)
......@@ -84,7 +82,7 @@ func Replay(handlers *types.EventHandlers) {
}
for sourceId, targetMap := range links {
for targetId, _ := range targetMap {
for targetId := range targetMap {
handlers.ConnectNodes(sourceId, targetId)
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment