Merge branch 'master' of https://github.com/OpenBazaar/openbazaar-go

OpenBazaar · Jan 12, 2017 · 14553d0 · 14553d0
2 parents 22467bd + 9cf7591
commit 14553d0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.travis/win32/libwinpthread-1.dll b/.travis/win32/libwinpthread-1.dll
diff --git a/.travis/win64/libwinpthread-1.dll b/.travis/win64/libwinpthread-1.dll
diff --git a/deploy.sh b/deploy.sh
@@ -12,8 +12,9 @@ if [ ! -z "$TRAVIS_TAG" ] &&
   xgo --targets=windows/386,windows/amd64,darwin/amd64,linux/386,linux/amd64,linux/arm ../
   chmod +x *
 
-  # Copy libwinpthread-1.dll
-  cp .travis/libwinpthread-1.dll dist/
+  # Copy libwinpthread-1.dll (user must rename the dll for their system to libwinpthread-1.dll)
+  cp ../.travis/win32/libwinpthread-1.dll dist/libwinpthread-1.win32.dll
+  cp ../.travis/win64/libwinpthread-1.dll dist/libwinpthread-1.win64.dll
 
   # Calculate SHA512 hashes
   sha512sum * > sha512_checksums.txt

diff --git a/ipfs/identity_test.go b/ipfs/identity_test.go
@@ -3,8 +3,8 @@ package ipfs
 import (
 	"bytes"
 	"encoding/hex"
-	"github.com/ipfs/go-libp2p-crypto"
 	"github.com/tyler-smith/go-bip39"
+	"gx/ipfs/QmUWER4r4qMvaCnX5zREcfyiWN7cXN9g3a7fkRqNz8qWPP/go-libp2p-crypto"
 	"testing"
 )