Merge 034f02c into c51d2fe

.travis.yml

@@ -7,5 +7,11 @@ install:
 script:
   - make test
 
+matrix:
+  include:
+    - name: "64-bit Unit Tests"
+    - name: "32-bit Unit Tests"
+      env: GOARCH=386
+
 notifications:
   email: false

context_test.go

@@ -18,7 +18,7 @@ import (
 )
 
 type ContextData struct {
-	I int
+	I int64
 	S string
 }
 
@@ -41,8 +41,9 @@ func TestContextSaveLoad(t *testing.T) {
 	wg.Add(nbr)
 	for i := range c {
 		go func(i int) {
+			// defer insures the call even on a panic
+			defer wg.Done()
 			testLoadSave(t, c[i])
-			wg.Done()
 		}(i)
 	}
 	wg.Wait()

messages.go

@@ -40,7 +40,7 @@ type ProtocolMsg struct {
 	// The actual data as binary blob
 	MsgSlice []byte
 	// The size of the data
-	Size int
+	Size network.Size
 }
 
 // ConfigMsg is sent by the overlay containing a generic slice of bytes to

network/big_test.go

@@ -30,7 +30,7 @@ func TestTCPHugeConnections(t *testing.T) {
 	// the maximum number of connections using the above snippet.
 	nbrHosts := 10
 	// 1MB of message size
-	msgSize := 1024 * 1024 * 1
+	msgSize := int64(1024 * 1024 * 1)
 	big := bigMessage{
 		Msize: msgSize,
 		Msg:   make([]byte, msgSize),
@@ -147,7 +147,7 @@ func TestTCPHugeConnections(t *testing.T) {
 }
 
 type bigMessage struct {
-	Msize int
+	Msize int64
 	Msg   []byte
-	Pcrc  int
+	Pcrc  int64
 }

network/encoding_test.go

@@ -9,10 +9,10 @@ import (
 )
 
 type TestRegisterS1 struct {
-	I int
+	I int64
 }
 type TestRegisterS2 struct {
-	I int
+	I int64
 }
 
 func TestRegisterMessage(t *testing.T) {
@@ -50,7 +50,7 @@ func TestUnmarshalRegister(t *testing.T) {
 	ty, b, err := Unmarshal(buff, tSuite)
 	assert.Nil(t, err)
 	assert.Equal(t, trType, ty)
-	assert.Equal(t, 10, b.(*TestRegisterS1).I)
+	assert.Equal(t, int64(10), b.(*TestRegisterS1).I)
 
 	var randType [16]byte
 	rand.Read(randType[:])

network/local.go

@@ -294,7 +294,7 @@ func (lc *LocalConn) Receive() (*Envelope, error) {
 	return &Envelope{
 		MsgType: id,
 		Msg:     body,
-		Size:    len(buff),
+		Size:    Size(len(buff)),
 	}, err
 }
 

network/local_test.go

@@ -148,7 +148,7 @@ func testConnListener(ctx *LocalManager, done chan error, listenA, connA *Server
 	// make the listener send and receive a struct that only they can know (this
 	// listener + conn
 	handshake := func(c Conn, sending, receiving Address) error {
-		sentLen, err := c.Send(&AddressTest{sending, secret})
+		sentLen, err := c.Send(&AddressTest{sending, int64(secret)})
 		if err != nil {
 			return err
 		}
@@ -165,7 +165,7 @@ func testConnListener(ctx *LocalManager, done chan error, listenA, connA *Server
 		if at.Addr != receiving {
 			return fmt.Errorf("Receiveid wrong address")
 		}
-		if at.Val != secret {
+		if at.Val != int64(secret) {
 			return fmt.Errorf("Received wrong secret")
 		}
 		return nil
@@ -244,7 +244,7 @@ func testLocalConn(t *testing.T, a1, a2 Address) {
 			incomingConn <- true
 			nm, err := c.Receive()
 			assert.Nil(t, err)
-			assert.Equal(t, 3, nm.Msg.(*SimpleMessage).I)
+			assert.Equal(t, int64(3), nm.Msg.(*SimpleMessage).I)
 			// acknoledge the message
 			incomingConn <- true
 			sentLen, err := c.Send(&SimpleMessage{3})
@@ -278,7 +278,7 @@ func testLocalConn(t *testing.T, a1, a2 Address) {
 	// receive stg and send ack
 	nm, err := outgoing.Receive()
 	assert.Nil(t, err)
-	assert.Equal(t, 3, nm.Msg.(*SimpleMessage).I)
+	assert.Equal(t, int64(3), nm.Msg.(*SimpleMessage).I)
 	outgoingConn <- true
 
 	<-incomingConn
@@ -327,7 +327,7 @@ func TestLocalManyConn(t *testing.T) {
 			assert.NotZero(t, sentLen)
 			nm, err := c.Receive()
 			assert.Nil(t, err)
-			assert.Equal(t, 3, nm.Msg.(*SimpleMessage).I)
+			assert.Equal(t, int64(3), nm.Msg.(*SimpleMessage).I)
 			assert.Nil(t, c.Close())
 			wg.Done()
 		}(i)
@@ -361,7 +361,7 @@ func NewTestLocalHost(port int) (*LocalHost, error) {
 
 type AddressTest struct {
 	Addr Address
-	Val  int
+	Val  int64
 }
 
 var AddressTestType = RegisterMessage(&AddressTest{})

network/router_test.go

@@ -104,7 +104,7 @@ func TestRouterErrorHandling(t *testing.T) {
 	require.Nil(t, err)
 	require.NotZero(t, sentLen)
 	decoded := <-proc.relay
-	require.Equal(t, 3, decoded.I)
+	require.Equal(t, int64(3), decoded.I)
 	sentLen, err = h2.Send(h1.ServerIdentity, msgSimple)
 	require.Nil(t, err)
 	require.NotZero(t, sentLen)
@@ -142,7 +142,7 @@ func TestRouterSendToSelf(t *testing.T) {
 	require.Nil(t, err)
 	require.NotZero(t, sentLen)
 	decoded := <-proc.relay
-	require.Equal(t, 3, decoded.I)
+	require.Equal(t, int64(3), decoded.I)
 
 	// Ensure no connections were open (since sending to ourself)
 	r.Lock()
@@ -279,7 +279,7 @@ func TestRouterMessaging(t *testing.T) {
 	require.NotZero(t, sentLen)
 
 	decoded := <-proc.relay
-	require.Equal(t, 3, decoded.I)
+	require.Equal(t, int64(3), decoded.I)
 
 	// make sure the connection is registered in host1 (because it's launched in
 	// a go routine). Since we try to avoid random timeout, let's send a msg
@@ -289,7 +289,7 @@ func TestRouterMessaging(t *testing.T) {
 	require.NotZero(t, sentLen)
 
 	decoded = <-proc.relay
-	require.Equal(t, 3, decoded.I)
+	require.Equal(t, int64(3), decoded.I)
 
 	written := h1.Tx()
 	read := h2.Rx()

network/struct.go

@@ -60,7 +60,7 @@ type Envelope struct {
 	// A *pointer* to the underlying message
 	Msg Message
 	// The length of the message in bytes
-	Size int
+	Size Size
 	// which constructors are used
 	Constructors protobuf.Constructors
 }

network/tcp.go

@@ -110,7 +110,7 @@ func (c *TCPConn) Receive() (env *Envelope, e error) {
 	return &Envelope{
 		MsgType: id,
 		Msg:     body,
-		Size:    len(buff),
+		Size:    Size(len(buff)),
 	}, err
 }
 

network/tcp_test.go

@@ -634,7 +634,7 @@ func NewTestServerIdentity(address Address) *ServerIdentity {
 
 // SimpleMessage is just used to transfer one integer
 type SimpleMessage struct {
-	I int
+	I int64
 }
 
 var SimpleMessageType MessageTypeID
@@ -661,7 +661,7 @@ func (smp *simpleMessageProc) Process(e *Envelope) {
 
 type statusMessage struct {
 	Ok  bool
-	Val int
+	Val int64
 }
 
 var statusMsgID = RegisterMessage(statusMessage{})

node_test.go

@@ -247,7 +247,7 @@ func TestTreeNodeFlags(t *testing.T) {
 
 // Protocol/service Channels test code:
 type NodeTestMsg struct {
-	I int
+	I int64
 }
 
 var Incoming chan struct {
@@ -256,7 +256,7 @@ var Incoming chan struct {
 }
 
 type NodeTestAggMsg struct {
-	I int
+	I int64
 }
 
 type ProtocolChannels struct {

processor_test.go

@@ -2,9 +2,8 @@ package onet
 
 import (
 	"errors"
-	"testing"
-
 	"reflect"
+	"testing"
 
 	"github.com/dedis/onet/log"
 	"github.com/dedis/onet/network"
@@ -154,7 +153,7 @@ func TestServiceProcessor_ProcessClientRequest_Streaming(t *testing.T) {
 	h := func(m *testMsg) (chan network.Message, chan bool, error) {
 		outChan := make(chan network.Message)
 		go func() {
-			for i := 0; i < m.I; i++ {
+			for i := 0; i < int(m.I); i++ {
 				outChan <- m
 			}
 			close(outChan)
@@ -164,7 +163,7 @@ func TestServiceProcessor_ProcessClientRequest_Streaming(t *testing.T) {
 	require.Nil(t, p.RegisterStreamingHandler(h))
 
 	n := 5
-	buf, err := protobuf.Encode(&testMsg{n})
+	buf, err := protobuf.Encode(&testMsg{int64(n)})
 	require.NoError(t, err)
 	rep, tun, err := p.ProcessClientRequest(nil, "testMsg", buf)
 	require.Nil(t, rep)
@@ -178,7 +177,7 @@ func TestServiceProcessor_ProcessClientRequest_Streaming(t *testing.T) {
 			buf := <-tun.out
 			val := &testMsg{}
 			require.Nil(t, protobuf.Decode(buf, val))
-			require.Equal(t, val.I, n)
+			require.Equal(t, val.I, int64(n))
 		}
 	}
 }
@@ -203,7 +202,7 @@ func TestProcessor_ProcessClientRequest(t *testing.T) {
 }
 
 type testMsg struct {
-	I int
+	I int64
 }
 
 type testMsg2 testMsg

protocol_test.go

@@ -91,7 +91,7 @@ func (p *SimpleProtocol) ReturnError(msg MsgSimpleMessage) error {
 }
 
 type SimpleMessage struct {
-	I int
+	I int64
 }
 
 type MsgSimpleMessage struct {

service_test.go

@@ -4,11 +4,10 @@ import (
 	"bytes"
 	"errors"
 	"net/http"
+	"sync"
 	"testing"
 	"time"
 
-	"sync"
-
 	"github.com/dedis/onet/log"
 	"github.com/dedis/onet/network"
 	"github.com/dedis/protobuf"
@@ -268,7 +267,7 @@ func TestServiceBackForthProtocol(t *testing.T) {
 	sr := &SimpleResponse{}
 	err = client.SendProtobuf(servers[0].ServerIdentity, r, sr)
 	log.ErrFatal(err)
-	require.Equal(t, sr.Val, 10)
+	require.Equal(t, sr.Val, int64(10))
 }
 
 func TestPanicNewProto(t *testing.T) {
@@ -383,17 +382,17 @@ func TestServiceGenericConfig(t *testing.T) {
 // BackForthProtocolForth & Back are messages that go down and up the tree.
 // => BackForthProtocol protocol / message
 type SimpleMessageForth struct {
-	Val int
+	Val int64
 }
 
 type SimpleMessageBack struct {
-	Val int
+	Val int64
 }
 
 type BackForthProtocol struct {
 	*TreeNodeInstance
-	Val       int
-	counter   int
+	Val       int64
+	counter   int64
 	forthChan chan struct {
 		*TreeNode
 		SimpleMessageForth
@@ -408,7 +407,7 @@ type BackForthProtocol struct {
 
 func newBackForthProtocolRoot(tn *TreeNodeInstance, val int, handler func(int)) (ProtocolInstance, error) {
 	s, err := newBackForthProtocol(tn)
-	s.Val = val
+	s.Val = int64(val)
 	s.handler = handler
 	return s, err
 }
@@ -469,9 +468,9 @@ func (sp *BackForthProtocol) dispatch() error {
 			msg := m.SimpleMessageBack
 			// call the handler  if we are the root
 			sp.counter++
-			if sp.counter == len(sp.Children()) {
+			if int(sp.counter) == len(sp.Children()) {
 				if sp.IsRoot() {
-					sp.handler(msg.Val)
+					sp.handler(int(msg.Val))
 				} else {
 					sp.SendTo(sp.Parent(), &msg)
 				}
@@ -488,11 +487,11 @@ func (sp *BackForthProtocol) dispatch() error {
 // Client API request / response emulation
 type SimpleRequest struct {
 	ServerIdentities *Roster
-	Val              int
+	Val              int64
 }
 
 type SimpleResponse struct {
-	Val int
+	Val int64
 }
 
 var SimpleResponseType = network.RegisterMessage(SimpleResponse{})
@@ -512,7 +511,7 @@ func (s *simpleService) ProcessClientRequest(req *http.Request, path string, buf
 	tree := msg.ServerIdentities.GenerateBinaryTree()
 	tni := s.ctx.NewTreeNodeInstance(tree, tree.Root, backForthServiceName)
 	ret := make(chan int)
-	proto, err := newBackForthProtocolRoot(tni, msg.Val, func(n int) {
+	proto, err := newBackForthProtocolRoot(tni, int(msg.Val), func(n int) {
 		ret <- n
 	})
 	if err != nil {
@@ -526,7 +525,7 @@ func (s *simpleService) ProcessClientRequest(req *http.Request, path string, buf
 		proto.(*BackForthProtocol).Done()
 		close(ret)
 	}
-	resp, err := protobuf.Encode(&SimpleResponse{<-ret})
+	resp, err := protobuf.Encode(&SimpleResponse{int64(<-ret)})
 	return resp, nil, err
 }
 
@@ -558,7 +557,7 @@ type DummyConfig struct {
 }
 
 type DummyMsg struct {
-	A int
+	A int64
 }
 
 var dummyMsgType network.MessageTypeID