Merge pull request #47 from gfanton/feat/bump-kudo-16

.github/workflows/go.yml

@@ -6,15 +6,16 @@ on:
   pull_request:
 
 jobs:
-  go-tests-on-linux:
-    name: "Test (linux)"
-    runs-on: ubuntu-latest
+  go-tests:
+    name: "test: ${{ matrix.os }}/go-${{ matrix.golang }}"
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        golang:
-          - 1.16.x
-          - 1.17.x
-          #- tip
+        golang: [ '1.18.x', '1.19.x' ]
+        os: ['windows-latest', 'macos-latest', 'ubuntu-latest']
+    env:
+      OS: ${{ matrix.os }}
+      GOLANG: ${{ matrix.golang }}
     steps:
       - name: Checkout
         uses: actions/[email protected]
@@ -28,46 +29,4 @@ jobs:
           git --no-pager diff go.mod go.sum
           git --no-pager diff --quiet go.mod go.sum
       - name: Run tests
-        run: go test ./... -count=5
-
-  go-tests-on-windows:
-    name: "Test (windows)"
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        golang: ['1.17.x']
-    steps:
-      - name: Checkout
-        uses: actions/[email protected]
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.golang }}
-      - name: Check go.mod and go.sum
-        run: |
-          go mod tidy -v
-          git --no-pager diff go.mod go.sum
-          git --no-pager diff --quiet go.mod go.sum
-      - name: Run tests
-        run: go.exe test ./... -buildmode=exe -count=5
-
-  go-tests-on-macos:
-    name: "Test (macos)"
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        golang: ['1.17.x']
-    steps:
-      - name: Checkout
-        uses: actions/[email protected]
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.golang }}
-      - name: Check go.mod and go.sum
-        run: |
-          go mod tidy -v
-          git --no-pager diff go.mod go.sum
-          git --no-pager diff --quiet go.mod go.sum
-      - name: Run tests
-        run: go test ./... -count=5
+        run: go test -v -count=5 ./...

config.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 
 	"github.com/ipfs/go-datastore"
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/kubo/config"
 	"github.com/pkg/errors"
 )
 

fsrepo_test.go

@@ -9,11 +9,11 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/ipfs/go-ipfs/thirdparty/assert"
+	"github.com/ipfs/kubo/thirdparty/assert"
 	"github.com/stretchr/testify/require"
 
 	datastore "github.com/ipfs/go-datastore"
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/kubo/config"
 )
 
 // tests ported from fsrepo

go.mod

@@ -1,19 +1,82 @@
 module berty.tech/go-ipfs-repo-encrypted
 
-go 1.16
+go 1.18
 
 require (
-	github.com/ipfs/go-datastore v0.5.1
+	github.com/ipfs/go-datastore v0.6.0
 	github.com/ipfs/go-ds-sql v0.3.0
-	github.com/ipfs/go-filestore v1.1.0
-	github.com/ipfs/go-ipfs v0.11.0
-	github.com/ipfs/go-ipfs-config v0.19.0
+	github.com/ipfs/go-filestore v1.2.0
 	github.com/ipfs/go-ipfs-keystore v0.0.2
-	github.com/libp2p/go-libp2p-core v0.13.0
-	github.com/multiformats/go-multiaddr v0.5.0
-	github.com/mutecomm/go-sqlcipher/v4 v4.4.2
+	github.com/ipfs/kubo v0.16.0
+	github.com/libp2p/go-libp2p v0.23.3
+	github.com/multiformats/go-multiaddr v0.7.0
+	github.com/mutecomm/go-sqlcipher/v4 v4.0.0-00010101000000-000000000000
 	github.com/pkg/errors v0.9.1
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.8.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/ipfs/bbloom v0.0.4 // indirect
+	github.com/ipfs/go-block-format v0.0.3 // indirect
+	github.com/ipfs/go-blockservice v0.4.0 // indirect
+	github.com/ipfs/go-cid v0.3.2 // indirect
+	github.com/ipfs/go-ipfs-blockstore v1.2.0 // indirect
+	github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
+	github.com/ipfs/go-ipfs-exchange-interface v0.2.0 // indirect
+	github.com/ipfs/go-ipfs-posinfo v0.0.1 // indirect
+	github.com/ipfs/go-ipfs-util v0.0.2 // indirect
+	github.com/ipfs/go-ipld-cbor v0.0.5 // indirect
+	github.com/ipfs/go-ipld-format v0.4.0 // indirect
+	github.com/ipfs/go-ipld-legacy v0.1.1 // indirect
+	github.com/ipfs/go-log v1.0.5 // indirect
+	github.com/ipfs/go-log/v2 v2.5.1 // indirect
+	github.com/ipfs/go-merkledag v0.6.0 // indirect
+	github.com/ipfs/go-metrics-interface v0.0.1 // indirect
+	github.com/ipfs/go-verifcid v0.0.2 // indirect
+	github.com/ipfs/interface-go-ipfs-core v0.7.0 // indirect
+	github.com/ipld/go-codec-dagpb v1.4.1 // indirect
+	github.com/ipld/go-ipld-prime v0.18.0 // indirect
+	github.com/jbenet/goprocess v0.1.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.1.1 // indirect
+	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
+	github.com/libp2p/go-libp2p-core v0.20.1 // indirect
+	github.com/libp2p/go-openssl v0.1.0 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-pointer v0.0.1 // indirect
+	github.com/minio/sha256-simd v1.0.0 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mr-tron/base58 v1.2.0 // indirect
+	github.com/multiformats/go-base32 v0.1.0 // indirect
+	github.com/multiformats/go-base36 v0.1.0 // indirect
+	github.com/multiformats/go-multibase v0.1.1 // indirect
+	github.com/multiformats/go-multicodec v0.6.0 // indirect
+	github.com/multiformats/go-multihash v0.2.1 // indirect
+	github.com/multiformats/go-varint v0.0.6 // indirect
+	github.com/opentracing/opentracing-go v1.2.0 // indirect
+	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e // indirect
+	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
+	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/whyrusleeping/cbor-gen v0.0.0-20210219115102-f37d292932f2 // indirect
+	go.opentelemetry.io/otel v1.7.0 // indirect
+	go.opentelemetry.io/otel/trace v1.7.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/multierr v1.8.0 // indirect
+	go.uber.org/zap v1.23.0 // indirect
+	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
+	golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41 // indirect
+	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	lukechampine.com/blake3 v1.1.7 // indirect
 )
 
 replace github.com/mutecomm/go-sqlcipher/v4 => github.com/berty/go-sqlcipher/v4 v4.4.3-0.20220810151512-74ea78235b48 // plaintext header support