Commit 8d6313d1 authored by Aviv Eyal's avatar Aviv Eyal Committed by Steven Allen
Browse files

Go frmt proj

parent 4b231df9
...@@ -8,9 +8,9 @@ import ( ...@@ -8,9 +8,9 @@ import (
inet "gx/ipfs/QmbD5yKbXahNvoMqzeuNyKQA9vAs9fUvJg2GXeWU1fVqY5/go-libp2p-net" inet "gx/ipfs/QmbD5yKbXahNvoMqzeuNyKQA9vAs9fUvJg2GXeWU1fVqY5/go-libp2p-net"
p2p "github.com/avive/go-libp2p/examples/multipro/pb"
uuid "github.com/google/uuid" uuid "github.com/google/uuid"
"github.com/ipfs/go-ipfs/thirdparty/assert" "github.com/ipfs/go-ipfs/thirdparty/assert"
p2p "github.com/avive/go-libp2p/examples/multipro/pb"
protobufCodec "github.com/multiformats/go-multicodec/protobuf" protobufCodec "github.com/multiformats/go-multicodec/protobuf"
"gx/ipfs/QmRS46AyqtpJBsf1zmQdeizSDEzo1qkWR7rdEuPFAv8237/go-libp2p-host" "gx/ipfs/QmRS46AyqtpJBsf1zmQdeizSDEzo1qkWR7rdEuPFAv8237/go-libp2p-host"
) )
...@@ -51,7 +51,7 @@ func (e EchoProtocol) onEchoRequest(s inet.Stream) { ...@@ -51,7 +51,7 @@ func (e EchoProtocol) onEchoRequest(s inet.Stream) {
log.Println("Failed to authenticate message") log.Println("Failed to authenticate message")
return return
} else { } else {
log.Println("Authenticated request content was generated by author node :-)") //log.Println("Authenticated request content was generated by author node :-)")
} }
log.Printf("%s: Sending echo response to %s. Message id: %s...", s.Conn().LocalPeer(), s.Conn().RemotePeer(), data.MessageData.Id) log.Printf("%s: Sending echo response to %s. Message id: %s...", s.Conn().LocalPeer(), s.Conn().RemotePeer(), data.MessageData.Id)
...@@ -101,7 +101,7 @@ func (e EchoProtocol) onEchoResponse(s inet.Stream) { ...@@ -101,7 +101,7 @@ func (e EchoProtocol) onEchoResponse(s inet.Stream) {
log.Println("Failed to authenticate message") log.Println("Failed to authenticate message")
return return
} else { } else {
log.Println("Authenticated response content generated by claimed node :-)") //log.Println("Authenticated response content generated by claimed node :-)")
} }
// locate request data and remove it if found // locate request data and remove it if found
......
package main package main
import ( import (
p2p "github.com/avive/go-libp2p/examples/multipro/pb"
"github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/proto"
host "gx/ipfs/QmRS46AyqtpJBsf1zmQdeizSDEzo1qkWR7rdEuPFAv8237/go-libp2p-host" host "gx/ipfs/QmRS46AyqtpJBsf1zmQdeizSDEzo1qkWR7rdEuPFAv8237/go-libp2p-host"
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer" peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
p2p "github.com/avive/go-libp2p/examples/multipro/pb"
"log" "log"
) )
......
...@@ -8,8 +8,8 @@ import ( ...@@ -8,8 +8,8 @@ import (
inet "gx/ipfs/QmbD5yKbXahNvoMqzeuNyKQA9vAs9fUvJg2GXeWU1fVqY5/go-libp2p-net" inet "gx/ipfs/QmbD5yKbXahNvoMqzeuNyKQA9vAs9fUvJg2GXeWU1fVqY5/go-libp2p-net"
uuid "github.com/google/uuid"
p2p "github.com/avive/go-libp2p/examples/multipro/pb" p2p "github.com/avive/go-libp2p/examples/multipro/pb"
uuid "github.com/google/uuid"
protobufCodec "github.com/multiformats/go-multicodec/protobuf" protobufCodec "github.com/multiformats/go-multicodec/protobuf"
"gx/ipfs/QmRS46AyqtpJBsf1zmQdeizSDEzo1qkWR7rdEuPFAv8237/go-libp2p-host" "gx/ipfs/QmRS46AyqtpJBsf1zmQdeizSDEzo1qkWR7rdEuPFAv8237/go-libp2p-host"
) )
...@@ -52,7 +52,7 @@ func (p PingProtocol) onPingRequest(s inet.Stream) { ...@@ -52,7 +52,7 @@ func (p PingProtocol) onPingRequest(s inet.Stream) {
log.Println("Failed to authenticate message") log.Println("Failed to authenticate message")
return return
} else { } else {
log.Println("Authenticated request content was generated by claimed node :-)") //log.Println("Authenticated request content was generated by claimed node :-)")
} }
// generate response message // generate response message
...@@ -100,7 +100,7 @@ func (p PingProtocol) onPingResponse(s inet.Stream) { ...@@ -100,7 +100,7 @@ func (p PingProtocol) onPingResponse(s inet.Stream) {
log.Println("Failed to authenticate message") log.Println("Failed to authenticate message")
return return
} else { } else {
log.Println("Authenticated response content generated by claimed node :-)") //log.Println("Authenticated response content generated by claimed node :-)")
} }
// locate request data and remove it if found // locate request data and remove it if found
......
...@@ -3,12 +3,12 @@ package main ...@@ -3,12 +3,12 @@ package main
import ( import (
"bufio" "bufio"
p2p "github.com/avive/go-libp2p/examples/multipro/pb" p2p "github.com/avive/go-libp2p/examples/multipro/pb"
"github.com/gogo/protobuf/proto"
protobufCodec "github.com/multiformats/go-multicodec/protobuf" protobufCodec "github.com/multiformats/go-multicodec/protobuf"
"gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
inet "gx/ipfs/QmbD5yKbXahNvoMqzeuNyKQA9vAs9fUvJg2GXeWU1fVqY5/go-libp2p-net" inet "gx/ipfs/QmbD5yKbXahNvoMqzeuNyKQA9vAs9fUvJg2GXeWU1fVqY5/go-libp2p-net"
"log" "log"
"time" "time"
"github.com/gogo/protobuf/proto"
"gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
) )
// node version // node version
...@@ -33,7 +33,7 @@ func sendProtoMessage(data proto.Message, s inet.Stream) bool { ...@@ -33,7 +33,7 @@ func sendProtoMessage(data proto.Message, s inet.Stream) bool {
// messageId - unique for requests, copied from request for responses // messageId - unique for requests, copied from request for responses
func NewMessageData(node *Node, messageId string, gossip bool) *p2p.MessageData { func NewMessageData(node *Node, messageId string, gossip bool) *p2p.MessageData {
// this creates a protobuf data for a public key // Create protobufs bin data for a public key
nodePubKey, err := node.Peerstore().PubKey(node.ID()).Bytes() nodePubKey, err := node.Peerstore().PubKey(node.ID()).Bytes()
if err != nil { if err != nil {
...@@ -41,9 +41,9 @@ func NewMessageData(node *Node, messageId string, gossip bool) *p2p.MessageData ...@@ -41,9 +41,9 @@ func NewMessageData(node *Node, messageId string, gossip bool) *p2p.MessageData
} }
return &p2p.MessageData{ClientVersion: clientVersion, return &p2p.MessageData{ClientVersion: clientVersion,
NodeId: peer.IDB58Encode(node.ID()), NodeId: peer.IDB58Encode(node.ID()),
NodePubKey: nodePubKey, NodePubKey: nodePubKey,
Timestamp: time.Now().Unix(), Timestamp: time.Now().Unix(),
Id: messageId, Id: messageId,
Gossip: gossip} Gossip: gossip}
} }
Markdown is supported
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