From 6f8a89cd8d4d6066d59a901dbdd5f54dff3dcfc7 Mon Sep 17 00:00:00 2001
From: Henry <cryptix@riseup.net>
Date: Thu, 16 Oct 2014 13:37:32 +0200
Subject: [PATCH] renamed version pkg to handshake
---
net/{version => handshake}/Makefile | 0
net/{version => handshake}/semver.pb.go | 6 +++---
net/{version => handshake}/semver.proto | 2 +-
net/{version => handshake}/version.go | 2 +-
net/{version => handshake}/version_test.go | 2 +-
net/swarm/conn.go | 10 +++++-----
6 files changed, 11 insertions(+), 11 deletions(-)
rename net/{version => handshake}/Makefile (100%)
rename net/{version => handshake}/semver.pb.go (86%)
rename net/{version => handshake}/semver.proto (89%)
rename net/{version => handshake}/version.go (97%)
rename net/{version => handshake}/version_test.go (96%)
diff --git a/net/version/Makefile b/net/handshake/Makefile
similarity index 100%
rename from net/version/Makefile
rename to net/handshake/Makefile
diff --git a/net/version/semver.pb.go b/net/handshake/semver.pb.go
similarity index 86%
rename from net/version/semver.pb.go
rename to net/handshake/semver.pb.go
index 7f55ecb6..e2557fba 100644
--- a/net/version/semver.pb.go
+++ b/net/handshake/semver.pb.go
@@ -3,7 +3,7 @@
// DO NOT EDIT!
/*
-Package version is a generated protocol buffer package.
+Package handshake is a generated protocol buffer package.
It is generated from these files:
semver.proto
@@ -11,9 +11,9 @@ It is generated from these files:
It has these top-level messages:
SemVer
*/
-package version
+package handshake
-import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
+import proto "code.google.com/p/gogoprotobuf/proto"
import math "math"
// Reference imports to suppress errors if they are not otherwise used.
diff --git a/net/version/semver.proto b/net/handshake/semver.proto
similarity index 89%
rename from net/version/semver.proto
rename to net/handshake/semver.proto
index 20d5690e..8069830e 100644
--- a/net/version/semver.proto
+++ b/net/handshake/semver.proto
@@ -1,4 +1,4 @@
-package version;
+package handshake;
message SemVer {
optional int64 major = 1;
diff --git a/net/version/version.go b/net/handshake/version.go
similarity index 97%
rename from net/version/version.go
rename to net/handshake/version.go
index db9d3a12..fdf027aa 100644
--- a/net/version/version.go
+++ b/net/handshake/version.go
@@ -1,4 +1,4 @@
-package version
+package handshake
// currentVersion holds the current protocol version for a client running this code
var currentVersion = NewSemVer(0, 0, 1)
diff --git a/net/version/version_test.go b/net/handshake/version_test.go
similarity index 96%
rename from net/version/version_test.go
rename to net/handshake/version_test.go
index c56334f2..06d07a49 100644
--- a/net/version/version_test.go
+++ b/net/handshake/version_test.go
@@ -1,4 +1,4 @@
-package version
+package handshake
import "testing"
diff --git a/net/swarm/conn.go b/net/swarm/conn.go
index 023be37b..3a628744 100644
--- a/net/swarm/conn.go
+++ b/net/swarm/conn.go
@@ -6,8 +6,8 @@ import (
spipe "github.com/jbenet/go-ipfs/crypto/spipe"
conn "github.com/jbenet/go-ipfs/net/conn"
+ handshake "github.com/jbenet/go-ipfs/net/handshake"
msg "github.com/jbenet/go-ipfs/net/message"
- version "github.com/jbenet/go-ipfs/net/version"
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
@@ -161,8 +161,8 @@ func (s *Swarm) connSecure(c *conn.Conn) error {
// connVersionExchange exchanges local and remote versions and compares them
// closes remote and returns an error in case of major difference
func (s *Swarm) connVersionExchange(remote *conn.Conn) error {
- var remoteVersion, myVersion *version.SemVer
- myVersion = version.Current()
+ var remoteVersion, myVersion *handshake.SemVer
+ myVersion = handshake.Current()
// BUG(cryptix): do we need to use a NetMessage here?
myVersionMsg, err := msg.FromObject(s.local, myVersion)
@@ -202,7 +202,7 @@ func (s *Swarm) connVersionExchange(remote *conn.Conn) error {
return fmt.Errorf("Error retrieving from conn: %v", remote.Peer)
}
- remoteVersion = new(version.SemVer)
+ remoteVersion = new(handshake.SemVer)
err = proto.Unmarshal(data, remoteVersion)
if err != nil {
s.Close()
@@ -215,7 +215,7 @@ func (s *Swarm) connVersionExchange(remote *conn.Conn) error {
}
}
- if !version.Compatible(myVersion, remoteVersion) {
+ if !handshake.Compatible(myVersion, remoteVersion) {
remote.Close()
return errors.New("protocol missmatch")
}
--
GitLab