fix(net): fix joinNetwork and bootstrap to avoid that different subne…

…ts collapse
science-engineering-art · Jun 11, 2023 · 57c3505 · 57c3505
1 parent 0c6ff53
commit 57c3505
Show file tree

Hide file tree

Showing 9 changed files with 132 additions and 89 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -62,16 +62,16 @@ func main() {
 			defer cancel()
 			sender, err := client.Store(ctx)
 			if err != nil {
-				fmt.Println(err.Error())
+				//fmt.Println(err.Error())
 			}
 			keyHash := utils.GetSha1Hash(data)
 			dataBytes := []byte(data)
-			//fmt.Println("data bytes", dataBytes)
+			////fmt.Println("data bytes", dataBytes)
 			err = sender.Send(&pb.StoreData{Key: keyHash, Value: &pb.Data{Init: 0, End: int64(len(dataBytes)), Buffer: dataBytes}})
 			if err != nil {
-				fmt.Println(err.Error())
+				//fmt.Println(err.Error())
 			}
-			fmt.Println("Stored ID: ", keyHash, "Stored Data:", string(dataBytes))
+			//fmt.Println("Stored ID: ", keyHash, "Stored Data:", string(dataBytes))
 
 		case "ping":
 			if len(input) != 5 {
@@ -204,7 +204,7 @@ func main() {
 			idSender, _ := utils.NewID(bootIp, bootPort)
 			pbNode, err := client.Ping(ctx, &pb.Node{ID: idSender, IP: bootIp, Port: int32(bootPort)})
 			if err != nil {
-				fmt.Println(err)
+				//fmt.Println(err)
 			}
 			fmt.Println("Made Ping from ", bootIp, ":", bootPort, "to", pbNode.IP, ":", pbNode.Port)
 			nearestNodes, _ := fullNodeServer.LookUp(target)

diff --git a/core/dht.go b/core/dht.go
@@ -2,7 +2,6 @@ package core
 
 import (
 	"bytes"
-	"fmt"
 
 	"github.com/science-engineering-art/kademlia-grpc/interfaces"
 	"github.com/science-engineering-art/kademlia-grpc/structs"
@@ -15,14 +14,14 @@ type DHT struct {
 }
 
 func (fn *DHT) Store(key []byte, data *[]byte) error {
-	fmt.Printf("INIT DHT.Store(%v) len(*data)=%d\n", key, len(*data))
-	defer fmt.Printf("END DHT.Store(%v)\n", key)
+	//fmt.Printf("INIT DHT.Store(%v) len(*data)=%d\n", key, len(*data))
+	// defer //fmt.Printf("END DHT.Store(%v)\n", key)
 
-	fmt.Println("Before Storage.Create()")
+	//fmt.Println("Before Storage.Create()")
 	err := fn.Storage.Create(key, data)
-	fmt.Println("After Storage.Create()")
+	//fmt.Println("After Storage.Create()")
 	if err != nil {
-		fmt.Println("ERROR line:23 DHT.Storage.Create()")
+		//fmt.Println("ERROR line:23 DHT.Storage.Create()")
 		return err
 	}
 	return nil
@@ -31,7 +30,7 @@ func (fn *DHT) Store(key []byte, data *[]byte) error {
 func (fn *DHT) FindValue(infoHash *[]byte, start int64, end int64) (value *[]byte, neighbors *[]structs.Node) {
 	value, err := fn.Storage.Read(*infoHash, start, end)
 	if err != nil {
-		//fmt.Println("Find Value error: ", err)
+		////fmt.Println("Find Value error: ", err)
 		neighbors = fn.RoutingTable.GetClosestContacts(structs.Alpha, *infoHash, []*structs.Node{&fn.Node}).Nodes
 		return nil, neighbors
 	}