cleanup and debugging info removed

beaconchain/beaconchain.go

@@ -52,8 +52,7 @@ func generateIDCKeys() kyber.Point {
 //AcceptConnections welcomes new connections
 func (IDC *BeaconChain) AcceptConnections(b []byte) {
 	NewNode := node.DeserializeNode(b)
-	Node := &node.Node{SelfPeer: NewNode.SelfPeer, IDCPeer: NewNode.IDCPeer}
+	fmt.Println(NewNode)
-	IDC.registerNode(Node) //This copies lock value of sync.mutex, we need to have a way around it by creating auxiliary data struct.
 }
 
 func (IDC *BeaconChain) registerNode(Node *node.Node) {

beaconchain/beaconchain_handler.go

@@ -61,57 +61,3 @@ func (IDC *BeaconChain) BeaconChainHandler(conn net.Conn) {
 
 	}
 }
-
-// TODO(alok): You removed pow package.
-// func (IDC *IdentityChain) registerIdentity(msgPayload []byte) {
-// 	payload, err := proto_identity.GetIdentityMessagePayload(msgPayload)
-// 	if err != nil {
-// 		IDC.log.Error("identity payload not read")
-// 	} else {
-// 		fmt.Println("identity payload read")
-// 	}
-// 	fmt.Println("we are now registering identities")
-// 	offset := 0
-// 	proof := payload[offset : offset+32]
-// 	offset = offset + 32
-// 	Node := node.DeserializeWaitNode(payload[offset:])
-// 	req := IDC.PowMap[Node.Self]
-// 	ok, err := pow.Check(req, string(proof), []byte(""))
-// 	fmt.Println(err)
-// 	if ok {
-// 		fmt.Println("Proof of work accepted")
-// 		IDC.PendingIdentities = append(IDC.PendingIdentities, Node)
-// 		fmt.Println(len(IDC.PendingIdentities)) //Fix why IDC does not have log working.
-// 	} else {
-// 		fmt.Println("identity proof of work not accepted")
-// 	}
-// }
-
-// func (IDC *IdentityChain) acceptNewConnection(msgPayload []byte) {
-
-// 	identityPayload, err := proto_identity.GetIdentityMessagePayload(msgPayload)
-// 	if err != nil {
-// 		fmt.Println("There was a error in reading the identity payload")
-// 	} else {
-// 		fmt.Println("accepted new connection")
-// 	}
-// 	fmt.Println("Sleeping for 2 secs ...")
-// 	time.Sleep(2 * time.Second)
-// 	Node := node.DeserializeWaitNode(identityPayload)
-// 	buffer := bytes.NewBuffer([]byte{})
-// 	src := rand.NewSource(time.Now().UnixNano())
-// 	rnd := rand.New(src)
-// 	challengeNonce := int((rnd.Int31()))
-// 	req := pow.NewRequest(5, []byte(strconv.Itoa(challengeNonce)))
-// 	IDC.PowMap[Node.Self] = req
-// 	buffer.Write([]byte(req))
-// 	// 32 byte block hash
-// 	// buffer.Write(prevBlockHash)
-// 	// The message is missing previous BlockHash, this is because we don't actively maintain a identitychain
-// 	// This canbe included in the fulfill request.
-// 	// Message should be encrypted and then signed to follow PKE.
-// 	//IDC should accept node publickey, encrypt the nonce and blockhash
-// 	// Then sign the message by own private key and send the message back.
-// 	msgToSend := proto_identity.ConstructIdentityMessage(proto_identity.Register, buffer.Bytes())
-// 	p2p.SendMessage(Node.Self, msgToSend)
-// }

node/node.go

@@ -134,6 +134,8 @@ func (node *Node) countNumTransactionsInBlockchain() int {
 func (node *Node) ConnectBeaconChain() {
 	Nnode := &NetworkNode{SelfPeer: node.SelfPeer, IDCPeer: node.IDCPeer}
 	msg := node.SerializeNode(Nnode)
+	fmt.Println("message payload from node side")
+	fmt.Println(msg)
 	msgToSend := proto_identity.ConstructIdentityMessage(proto_identity.Register, msg)
 	p2p.SendMessage(node.IDCPeer, msgToSend)
 }
@@ -150,7 +152,7 @@ func (node *Node) SerializeNode(nnode *NetworkNode) []byte {
 		fmt.Println("ERROR", err)
 		//node.log.Error("Could not serialize node")
 	}
-	//err = encoder.Encode(node.IDCPeer)
+
 	return result.Bytes()
 }
 
@@ -163,10 +165,6 @@ func DeserializeNode(d []byte) *NetworkNode {
 	if err != nil {
 		log.Error("Could not de-serialize node 1")
 	}
-	// err = decoder.Decode(&wn.IDCPeer)
-	// if err != nil {
-	// 	log.Error("Could not de-serialize node 2")
-	// }
 	return &wn
 }