feat: link sigchain with node (#145)

berty · Aug 21, 2018 · 0251793 · 0251793
1 parent 0df13b0
commit 0251793
Show file tree

Hide file tree

Showing 10 changed files with 180 additions and 122 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,7 +4,7 @@ version: 2
   working_directory: /go/src/github.com/berty/berty
   environment:
     GOPATH: /go
-    GOTEST_TIMEOUT: 1m
+    GOTEST_TIMEOUT: 5m
   docker:
     - image: circleci/golang:latest
 

diff --git a/core/Makefile b/core/Makefile
@@ -16,7 +16,7 @@ CGO_CPPFLAGS ?= -I/usr/local/opt/openssl/include
 BUILD_ENV ?= CGO_LDFLAGS="$(CGO_LDFLAGS)" CGO_CPPFLAGS="$(CGO_CPPFLAGS)"
 RUN_DAEMON_OPTS ?= --log-level=debug
 TEST_PATHS ?= ./...
-TEST_CMD ?= $(BUILD_ENV) go test -test.timeout 30s -v $(TEST_PATHS)
+TEST_CMD ?= $(BUILD_ENV) go test -test.timeout 3m -v $(TEST_PATHS)
 PROTOC ?= protoc
 ifeq (, $(shell which protoc))
 PROTOC = docker run --rm -v "$(GOPATH)/src:$(GOPATH)/src" -v "$(PWD)/..:$(PWD)/.." -w "$(PWD)" bertychat/protoc

diff --git a/core/crypto/keypair/keypair.pb.go b/core/crypto/keypair/keypair.pb.go
diff --git a/core/crypto/keypair/keypair.proto b/core/crypto/keypair/keypair.proto
@@ -40,7 +40,6 @@ enum SignatureAlgorithm {
     SHA256_WITH_RSAPSS = 13;
     SHA384_WITH_RSAPSS = 14;
     SHA512_WITH_RSAPSS = 15;
-
 }
 
 
@@ -92,4 +91,3 @@ message Revocation {
     RevocationContent content = 1;
     Signature signature = 2;
 }
-
diff --git a/core/crypto/sigchain/sigchain_test.go b/core/crypto/sigchain/sigchain_test.go
@@ -1,14 +1,12 @@
 package sigchain
 
 import (
+	"bytes"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"
-
 	"testing"
 
-	"bytes"
-
 	"github.com/berty/berty/core/crypto/keypair"
 )