Merge pull request #29 from multiformats/feat/gomod

Switch to multiformats/go-base32, introduce gomod
multiformats · Feb 27, 2019 · d636419 · d636419
2 parents 79803cc + 4819336
commit d636419
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,23 +1,32 @@
-language: go
-sudo: false
-
 os:
   - linux
 
+language: go
+
 go:
   - 1.11.x
 
+env:
+  global:
+    - GOTFLAGS="-race"
+  matrix:
+    - BUILD_DEPTYPE=gx
+    - BUILD_DEPTYPE=gomod
+
+
+# disable travis install
 install:
-  - make deps
+  - true
 
 script:
   - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh)
 
+
 cache:
   directories:
     - $GOPATH/src/gx
+    - $GOPATH/pkg/mod
+    - /home/travis/.cache/go-build
 
 notifications:
   email: false
-
-env: GOTFLAGS="-race"
diff --git a/base32.go b/base32.go
@@ -1,7 +1,7 @@
 package multibase
 
 import (
-	b32 "github.com/whyrusleeping/base32"
+	b32 "github.com/multiformats/go-base32"
 )
 
 var base32StdLowerPad = b32.NewEncodingCI("abcdefghijklmnopqrstuvwxyz234567")

diff --git a/go.mod b/go.mod
@@ -0,0 +1,6 @@
+module github.com/multiformats/go-multibase
+
+require (
+	github.com/mr-tron/base58 v1.1.0
+	github.com/multiformats/go-base32 v0.0.3
+)
diff --git a/go.sum b/go.sum
@@ -0,0 +1,4 @@
+github.com/mr-tron/base58 v1.1.0 h1:Y51FGVJ91WBqCEabAi5OPUz38eAx8DakuAm5svLcsfQ=
+github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
+github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp8Nq/kkI=
+github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA=
diff --git a/multibase.go b/multibase.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	b58 "github.com/mr-tron/base58/base58"
-	b32 "github.com/whyrusleeping/base32"
+	b32 "github.com/multiformats/go-base32"
 )
 
 // Encoding identifies the type of base-encoding that a multibase is carrying.

diff --git a/package.json b/package.json
@@ -7,17 +7,17 @@
     "dvcsimport": "github.com/multiformats/go-multibase"
   },
   "gxDependencies": [
-    {
-      "author": "whyrusleeping",
-      "hash": "QmfVj3x4D6Jkq9SEoi5n2NmoUomLwoeiwnYz2KQa15wRw6",
-      "name": "base32",
-      "version": "0.0.2"
-    },
     {
       "author": "mr-tron",
       "hash": "QmWFAMPqsEyUX7gDUsRVmMWz59FxSpJ1b2v6bJ1yYzo7jY",
       "name": "go-base58-fast",
       "version": "0.1.1"
+    },
+    {
+      "author": "Golang",
+      "hash": "QmPbbYin7KBd1Y1BfUe15vHzwJiioyi3wtKQTtXWWf8SC5",
+      "name": "base32",
+      "version": "0.0.3"
     }
   ],
   "gxVersion": "0.8.0",