Provide golem-messages version in Hello

golemfactory · Jan 17, 2018 · fc08c5c · fc08c5c
1 parent 6ec01c7
commit fc08c5c
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 40 deletions.
diff --git a/bootstrap/message.go b/bootstrap/message.go
@@ -190,17 +190,18 @@ const (
 
 type MessageHello struct {
 	BaseMessage
-	Port           uint64      `msg_slot:"port"`
-	NodeName       string      `msg_slot:"node_name"`
-	ClientKeyId    string      `msg_slot:"client_key_id"`
-	NodeInfo       *Node       `msg_slot:"node_info"`
-	RandVal        float64     `msg_slot:"rand_val"`
-	Metadata       interface{} `msg_slot:"metadata"`
-	SolveChallange bool        `msg_slot:"solve_challenge"`
-	Challange      interface{} `msg_slot:"challenge"`
-	Difficulty     uint64      `msg_slot:"difficulty"`
-	ProtoId        uint64      `msg_slot:"proto_id"`
-	ClientVer      string      `msg_slot:"client_ver"`
+	Port                 uint64      `msg_slot:"port"`
+	NodeName             string      `msg_slot:"node_name"`
+	ClientKeyId          string      `msg_slot:"client_key_id"`
+	NodeInfo             *Node       `msg_slot:"node_info"`
+	RandVal              float64     `msg_slot:"rand_val"`
+	Metadata             interface{} `msg_slot:"metadata"`
+	SolveChallange       bool        `msg_slot:"solve_challenge"`
+	Challange            interface{} `msg_slot:"challenge"`
+	Difficulty           uint64      `msg_slot:"difficulty"`
+	ProtoId              uint64      `msg_slot:"proto_id"`
+	GolemMessagesVersion string      `msg_slot:"golem_messages_version"`
+	ClientVer            string      `msg_slot:"client_ver"`
 }
 
 func (self *MessageHello) GetType() uint16 {

diff --git a/bootstrap/service.go b/bootstrap/service.go
@@ -10,15 +10,16 @@ import (
 )
 
 type Config struct {
-	Name         string
-	Id           string
-	Port         uint64
-	PrvAddr      string
-	PubAddr      string
-	PrvAddresses []interface{}
-	NatType      string
-	PeerNum      int
-	ProtocolId   uint64
+	Name                 string
+	Id                   string
+	Port                 uint64
+	PrvAddr              string
+	PubAddr              string
+	PrvAddresses         []interface{}
+	NatType              string
+	PeerNum              int
+	ProtocolId           uint64
+	GolemMessagesVersion string
 }
 
 type Service struct {
@@ -80,12 +81,13 @@ func (s *Service) genHello() *MessageHello {
 			PrvAddresses: s.config.PrvAddresses,
 			NatType:      s.config.NatType,
 		},
-		RandVal:        rand.Float64(),
-		Metadata:       make(map[string]interface{}),
-		SolveChallange: false,
-		Challange:      nil,
-		Difficulty:     0,
-		ProtoId:        s.config.ProtocolId,
-		ClientVer:      "0.9.0",
+		RandVal:              rand.Float64(),
+		Metadata:             make(map[string]interface{}),
+		SolveChallange:       false,
+		Challange:            nil,
+		Difficulty:           0,
+		ProtoId:              s.config.ProtocolId,
+		ClientVer:            "0.9.0",
+		GolemMessagesVersion: s.config.GolemMessagesVersion,
 	}
 }
diff --git a/service/main.go b/service/main.go
@@ -14,21 +14,24 @@ import (
 )
 
 const (
-	PORT            = 40102
-	PEER_NUM        = 100
-	NAME            = "Go Bootstrap"
-	PROTO_ID uint64 = 19
+	PORT                          = 40102
+	PEER_NUM                      = 100
+	NAME                          = "Go Bootstrap"
+	PROTO_ID               uint64 = 19
+	GOLEM_MESSAGES_VERSION        = "1.4.1"
 )
 
 func main() {
 	var port uint64
 	var peerNum int
 	var name string
 	var protocolId uint64
+	var golemMessagesVersion string
 	flag.Uint64Var(&port, "port", PORT, "Port to listen to")
 	flag.IntVar(&peerNum, "peer-num", PEER_NUM, "Number of peers to send")
 	flag.StringVar(&name, "name", NAME, "Name of the node")
 	flag.Uint64Var(&protocolId, "protocol-id", PROTO_ID, "Version of the P2P procotol")
+	flag.StringVar(&golemMessagesVersion, "golem-messages", GOLEM_MESSAGES_VERSION, "Version of the golem-messages library")
 	flag.Parse()
 
 	var err error
@@ -61,15 +64,16 @@ func main() {
 	pubKeyHex := hex.EncodeToString(privKey.PublicKey.X) + hex.EncodeToString(privKey.PublicKey.Y)
 
 	config := &bootstrap.Config{
-		Name:         name,
-		Id:           pubKeyHex,
-		Port:         port,
-		PrvAddr:      prvAddresses[0].(string),
-		PubAddr:      host.IP(),
-		PrvAddresses: prvAddresses,
-		NatType:      nat.String(),
-		PeerNum:      PEER_NUM,
-		ProtocolId:   protocolId,
+		Name:                 name,
+		Id:                   pubKeyHex,
+		Port:                 port,
+		PrvAddr:              prvAddresses[0].(string),
+		PubAddr:              host.IP(),
+		PrvAddresses:         prvAddresses,
+		NatType:              nat.String(),
+		PeerNum:              PEER_NUM,
+		ProtocolId:           protocolId,
+		GolemMessagesVersion: golemMessagesVersion,
 	}
 
 	fmt.Printf("Config: %+v\n", config)