diff --git a/.travis.yml b/.travis.yml index 4cfe98c2424d60b3a50d870dc0da5df2ee9243ba..5163d693fc757ec0c13d134e9d4cabd6cc7c85d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ env: global: - GOTFLAGS="-race" matrix: - - BUILD_DEPTYPE=gx - BUILD_DEPTYPE=gomod @@ -24,7 +23,6 @@ script: cache: directories: - - $GOPATH/src/gx - $GOPATH/pkg/mod - $HOME/.cache/go-build diff --git a/cid-fmt/main_test.go b/cid-fmt/main_test.go index ce66c0ac4fbbd4a748845f09bea901484e8ed569..5609cd2666fd976c29c08c00e83322497d95fdfe 100644 --- a/cid-fmt/main_test.go +++ b/cid-fmt/main_test.go @@ -9,7 +9,7 @@ import ( func TestCidConv(t *testing.T) { cidv0 := "QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn" - cidv1 := "zdj7WbTaiJT1fgatdet9Ei9iDB5hdCxkbVyhyh8YTUnXMiwYi" + cidv1 := "bafybeiczsscdsbs7ffqz55asqdf3smv6klcw3gofszvwlyarci47bgf354" cid, err := c.Decode(cidv0) if err != nil { t.Fatal(err) @@ -19,7 +19,7 @@ func TestCidConv(t *testing.T) { t.Fatal(err) } if cid.String() != cidv1 { - t.Fatal("conversion failure") + t.Fatalf("conversion failure: %s != %s", cid, cidv1) } cid, err = toCidV0(cid) if err != nil { @@ -33,7 +33,7 @@ func TestCidConv(t *testing.T) { func TestBadCidConv(t *testing.T) { // this cid is a raw leaf and should not be able to convert to cidv0 - cidv1 := "zb2rhhzX7uSKrtQ2ZZXFAabKiKFYZrJqKY2KE1cJ8yre2GSWZ" + cidv1 := "bafkreifit7vvfkf2cwwzvyycdczm5znbdbqx54ab6shbesvwgkwthdf77y" cid, err := c.Decode(cidv1) if err != nil { t.Fatal(err) diff --git a/go.mod b/go.mod index 73ce4c9194716559297d529861852b8d00dcc0db..31686601d3800d353175a968a25a925de81e65c6 100644 --- a/go.mod +++ b/go.mod @@ -5,3 +5,5 @@ require ( github.com/multiformats/go-multibase v0.0.1 github.com/multiformats/go-multihash v0.0.1 ) + +go 1.12 diff --git a/package.json b/package.json deleted file mode 100644 index a286ee0efb9b460d9800139e5ef55183f42c2da2..0000000000000000000000000000000000000000 --- a/package.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "author": "kevina", - "bugs": {}, - "gx": { - "dvcsimport": "github.com/ipfs/go-cidutil" - }, - "gxDependencies": [ - { - "author": "multiformats", - "hash": "QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW", - "name": "go-multihash", - "version": "1.0.9" - }, - { - "author": "whyrusleeping", - "hash": "QmekxXDhCxCJRNuzmHreuaT3BsuJcsjcXWNrtV9C8DRHtd", - "name": "go-multibase", - "version": "0.3.0" - }, - { - "author": "whyrusleeping", - "hash": "QmTbxNB1NwDesLmKTscr4udL2tVP7MaxvXnD1D9yX7g3PN", - "name": "go-cid", - "version": "0.9.3" - } - ], - "gxVersion": "0.12.1", - "language": "go", - "license": "", - "name": "go-cidutil", - "releaseCmd": "git commit -a -m \"gx publish $VERSION\"", - "version": "0.2.1" -} -