Skip to content
Snippets Groups Projects
Commit 4702cc22 authored by Hans Moog's avatar Hans Moog
Browse files

Refactor: reverted some previous changes from debugging

parent 7f26a9dc
No related branches found
No related tags found
No related merge requests found
package serialize
import (
"reflect"
"unsafe"
)
type SerializedObject struct {
readOffset int
}
func (so *SerializedObject) SerializeInt(int int) []byte {
hdr := reflect.SliceHeader{Data: uintptr(unsafe.Pointer(&int)), Len: 8, Cap: 8}
return *(*[]byte)(unsafe.Pointer(&hdr))
}
package storageprefix package storageprefix
var ( var (
Mainnet = []byte{88} MainNet = []byte{0}
TangleTransaction = []byte{1} TangleTransaction = []byte{1}
TangleTransactionMetadata = []byte{2} TangleTransactionMetadata = []byte{2}
......
...@@ -16,7 +16,9 @@ import ( ...@@ -16,7 +16,9 @@ import (
"github.com/iotaledger/hive.go/logger" "github.com/iotaledger/hive.go/logger"
"github.com/iotaledger/hive.go/node" "github.com/iotaledger/hive.go/node"
"github.com/iotaledger/goshimmer/packages/netutil"
"github.com/iotaledger/goshimmer/plugins/autopeering/local" "github.com/iotaledger/goshimmer/plugins/autopeering/local"
"github.com/iotaledger/goshimmer/plugins/cli"
"github.com/iotaledger/goshimmer/plugins/config" "github.com/iotaledger/goshimmer/plugins/config"
"github.com/iotaledger/goshimmer/plugins/gossip" "github.com/iotaledger/goshimmer/plugins/gossip"
) )
...@@ -159,19 +161,17 @@ func parseEntryNodes() (result []*peer.Peer, err error) { ...@@ -159,19 +161,17 @@ func parseEntryNodes() (result []*peer.Peer, err error) {
} }
func checkConnection(localAddr *net.UDPAddr, self *peer.Peer) { func checkConnection(localAddr *net.UDPAddr, self *peer.Peer) {
/* peering := self.Services().Get(service.PeeringKey)
peering := self.Services().Get(service.PeeringKey) remoteAddr, err := net.ResolveUDPAddr(peering.Network(), peering.String())
remoteAddr, err := net.ResolveUDPAddr(peering.Network(), peering.String()) if err != nil {
if err != nil { panic(err)
panic(err) }
}
// do not check the address as a NAT may change them for local connections // do not check the address as a NAT may change them for local connections
err = netutil.CheckUDP(localAddr, remoteAddr, false, true) err = netutil.CheckUDP(localAddr, remoteAddr, false, true)
if err != nil { if err != nil {
log.Errorf("Error testing service: %s", err) log.Errorf("Error testing service: %s", err)
log.Panicf("Please check that %s is publicly reachable at %s/%s", log.Panicf("Please check that %s is publicly reachable at %s/%s",
cli.AppName, peering.String(), peering.Network()) cli.AppName, peering.String(), peering.Network())
} }
*/
} }
...@@ -4,6 +4,7 @@ import ( ...@@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"net" "net"
"strconv" "strconv"
"sync"
"github.com/iotaledger/hive.go/autopeering/peer" "github.com/iotaledger/hive.go/autopeering/peer"
"github.com/iotaledger/hive.go/autopeering/peer/service" "github.com/iotaledger/hive.go/autopeering/peer/service"
...@@ -13,6 +14,7 @@ import ( ...@@ -13,6 +14,7 @@ import (
gp "github.com/iotaledger/goshimmer/packages/gossip" gp "github.com/iotaledger/goshimmer/packages/gossip"
"github.com/iotaledger/goshimmer/packages/gossip/server" "github.com/iotaledger/goshimmer/packages/gossip/server"
"github.com/iotaledger/goshimmer/plugins/autopeering/local" "github.com/iotaledger/goshimmer/plugins/autopeering/local"
"github.com/iotaledger/goshimmer/plugins/cli"
"github.com/iotaledger/goshimmer/plugins/config" "github.com/iotaledger/goshimmer/plugins/config"
"github.com/iotaledger/goshimmer/plugins/tangle" "github.com/iotaledger/goshimmer/plugins/tangle"
) )
...@@ -82,27 +84,25 @@ func start(shutdownSignal <-chan struct{}) { ...@@ -82,27 +84,25 @@ func start(shutdownSignal <-chan struct{}) {
} }
func checkConnection(srv *server.TCP, self *peer.Peer) { func checkConnection(srv *server.TCP, self *peer.Peer) {
/* var wg sync.WaitGroup
var wg sync.WaitGroup wg.Add(1)
wg.Add(1) go func() {
go func() { defer wg.Done()
defer wg.Done() conn, err := srv.AcceptPeer(self)
conn, err := srv.AcceptPeer(self)
if err != nil {
return
}
_ = conn.Close()
}()
conn, err := srv.DialPeer(self)
if err != nil { if err != nil {
log.Errorf("Error testing: %s", err) return
addr := self.Services().Get(service.GossipKey)
log.Panicf("Please check that %s is publicly reachable at %s/%s",
cli.AppName, addr.String(), addr.Network())
} }
_ = conn.Close() _ = conn.Close()
wg.Wait() }()
*/ conn, err := srv.DialPeer(self)
if err != nil {
log.Errorf("Error testing: %s", err)
addr := self.Services().Get(service.GossipKey)
log.Panicf("Please check that %s is publicly reachable at %s/%s",
cli.AppName, addr.String(), addr.Network())
}
_ = conn.Close()
wg.Wait()
} }
func getTransaction(transactionId transaction.Id) (bytes []byte, err error) { func getTransaction(transactionId transaction.Id) (bytes []byte, err error) {
......
...@@ -38,7 +38,7 @@ func configure(*node.Plugin) { ...@@ -38,7 +38,7 @@ func configure(*node.Plugin) {
TransactionParser = transactionparser.New() TransactionParser = transactionparser.New()
TransactionRequester = transactionrequester.New() TransactionRequester = transactionrequester.New()
TipSelector = tipselector.New() TipSelector = tipselector.New()
Instance = tangle.New(database.GetBadgerInstance(), storageprefix.Mainnet) Instance = tangle.New(database.GetBadgerInstance(), storageprefix.MainNet)
// setup TransactionParser // setup TransactionParser
TransactionParser.Events.TransactionParsed.Attach(events.NewClosure(func(transaction *transaction.Transaction) { TransactionParser.Events.TransactionParsed.Attach(events.NewClosure(func(transaction *transaction.Transaction) {
......
...@@ -10,7 +10,7 @@ import ( ...@@ -10,7 +10,7 @@ import (
var transactionSpammer *spammer.Spammer var transactionSpammer *spammer.Spammer
var PLUGIN = node.NewPlugin("Spammer", node.Enabled, configure) var PLUGIN = node.NewPlugin("Spammer", node.Disabled, configure)
func configure(plugin *node.Plugin) { func configure(plugin *node.Plugin) {
transactionSpammer = spammer.New(tangle.Instance, tangle.TipSelector) transactionSpammer = spammer.New(tangle.Instance, tangle.TipSelector)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment