chore: goimports everything (to trigger the CI)

Signed-off-by: Manfred Touron <[email protected]>

.github/workflows/go.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         golang:
-          - 1.13
+          #- 1.13
           - 1.14
           #- tip
     env:
@@ -50,12 +50,16 @@ jobs:
           go mod tidy -v
           git --no-pager diff go.mod go.sum
           git --no-pager diff --quiet go.mod go.sum
+      - name: List packages
+        run: go list ./...
       - name: Build tests
         run: go test -i ./...
-      - name: Run tests with race, without goleak
-        run: go test -race -covermode=atomic -coverpkg=all -coverprofile=coverage.txt -cover -v ./... -test.timeout=10m
+      - name: Run tests without options
+        run: go test ./... -v -test.timeout=15m
+      - name: Run tests with race and cover
+        run: go test ./... -race -covermode=atomic -coverpkg=all -coverprofile=coverage.txt -cover -v -test.timeout=15m
       # temporarily disabled, because not stable enough
-      #- name: Run tests without race, with goleak
+      #- name: Run tests with goleak
       #  run: go test -v -tags=goleak -test.timeout=10m ./...
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1

Makefile

@@ -7,4 +7,4 @@ lint:
 
 .PHONY: test
 test:
-	go test -race -cover -coverprofile=coverage.txt -covermode=atomic -v ./... -timeout 599s # circleci has a built-in 10 minute no-output timeout
+	go test -race -cover -coverprofile=coverage.txt -covermode=atomic -v ./... -timeout 599s

accesscontroller/interface.go

@@ -1,9 +1,10 @@
 package accesscontroller
 
 import (
+	"context"
+
 	"berty.tech/go-ipfs-log/accesscontroller"
 	"berty.tech/go-ipfs-log/iface"
-	"context"
 
 	"berty.tech/go-orbit-db/events"
 	"go.uber.org/zap"

accesscontroller/ipfs/accesscontroller_ipfs.go

@@ -13,7 +13,7 @@ import (
 	"berty.tech/go-orbit-db/address"
 	"berty.tech/go-orbit-db/events"
 	"berty.tech/go-orbit-db/iface"
-	"github.com/ipfs/go-cid"
+	cid "github.com/ipfs/go-cid"
 	cbornode "github.com/ipfs/go-ipld-cbor"
 	coreapi "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/pkg/errors"

accesscontroller/manifest.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"berty.tech/go-ipfs-log/io"
-	"github.com/ipfs/go-cid"
+	cid "github.com/ipfs/go-cid"
 	cbornode "github.com/ipfs/go-ipld-cbor"
 	coreapi "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/pkg/errors"

accesscontroller/orbitdb/accesscontroller_orbitdb.go

@@ -13,7 +13,7 @@ import (
 	"berty.tech/go-orbit-db/events"
 	"berty.tech/go-orbit-db/iface"
 	"berty.tech/go-orbit-db/stores"
-	"github.com/ipfs/go-cid"
+	cid "github.com/ipfs/go-cid"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 )

accesscontroller/simple/accesscontroller_simple.go

@@ -10,7 +10,7 @@ import (
 	"berty.tech/go-orbit-db/address"
 	"berty.tech/go-orbit-db/events"
 	"berty.tech/go-orbit-db/iface"
-	"github.com/ipfs/go-cid"
+	cid "github.com/ipfs/go-cid"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 )

accesscontroller/utils/utils.go

@@ -1,10 +1,11 @@
 package utils
 
 import (
+	"context"
+
 	"berty.tech/go-orbit-db/accesscontroller"
 	"berty.tech/go-orbit-db/iface"
-	"context"
-	"github.com/ipfs/go-cid"
+	cid "github.com/ipfs/go-cid"
 	"github.com/pkg/errors"
 )
 

address/address.go

@@ -5,7 +5,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/ipfs/go-cid"
+	cid "github.com/ipfs/go-cid"
 	"github.com/pkg/errors"
 )
 

baseorbitdb/orbitdb.go

@@ -15,16 +15,6 @@ import (
 	idp "berty.tech/go-ipfs-log/identityprovider"
 	"berty.tech/go-ipfs-log/io"
 	"berty.tech/go-ipfs-log/keystore"
-	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-datastore"
-	leveldb "github.com/ipfs/go-ds-leveldb"
-	cbornode "github.com/ipfs/go-ipld-cbor"
-	coreapi "github.com/ipfs/interface-go-ipfs-core"
-	p2pcore "github.com/libp2p/go-libp2p-core"
-	"github.com/pkg/errors"
-	"go.opentelemetry.io/otel/api/trace"
-	"go.uber.org/zap"
-
 	"berty.tech/go-orbit-db/accesscontroller"
 	acutils "berty.tech/go-orbit-db/accesscontroller/utils"
 	"berty.tech/go-orbit-db/address"
@@ -36,6 +26,15 @@ import (
 	"berty.tech/go-orbit-db/pubsub/pubsubcoreapi"
 	"berty.tech/go-orbit-db/stores"
 	"berty.tech/go-orbit-db/utils"
+	cid "github.com/ipfs/go-cid"
+	datastore "github.com/ipfs/go-datastore"
+	leveldb "github.com/ipfs/go-ds-leveldb"
+	cbornode "github.com/ipfs/go-ipld-cbor"
+	coreapi "github.com/ipfs/interface-go-ipfs-core"
+	p2pcore "github.com/libp2p/go-libp2p-core"
+	"github.com/pkg/errors"
+	"go.opentelemetry.io/otel/api/trace"
+	"go.uber.org/zap"
 )
 
 // OrbitDB An alias of the type defined in the iface package

cache/cacheleveldown/leveldown.go

@@ -7,7 +7,7 @@ import (
 
 	"berty.tech/go-orbit-db/address"
 	"berty.tech/go-orbit-db/cache"
-	"github.com/ipfs/go-datastore"
+	datastore "github.com/ipfs/go-datastore"
 	"github.com/ipfs/go-datastore/query"
 	leveldb "github.com/ipfs/go-ds-leveldb"
 	"github.com/pkg/errors"

cache/interface.go

@@ -2,7 +2,7 @@ package cache
 
 import (
 	"berty.tech/go-orbit-db/address"
-	"github.com/ipfs/go-datastore"
+	datastore "github.com/ipfs/go-datastore"
 	"go.uber.org/zap"
 )
 

iface/interface.go

@@ -6,19 +6,18 @@ import (
 	ipfslog "berty.tech/go-ipfs-log"
 	"berty.tech/go-ipfs-log/identityprovider"
 	"berty.tech/go-ipfs-log/keystore"
-	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-datastore"
-	coreapi "github.com/ipfs/interface-go-ipfs-core"
-	p2pcore "github.com/libp2p/go-libp2p-core"
-	"github.com/libp2p/go-libp2p-core/peer"
-	"go.opentelemetry.io/otel/api/trace"
-	"go.uber.org/zap"
-
 	"berty.tech/go-orbit-db/accesscontroller"
 	"berty.tech/go-orbit-db/address"
 	"berty.tech/go-orbit-db/events"
 	"berty.tech/go-orbit-db/stores/operation"
 	"berty.tech/go-orbit-db/stores/replicator"
+	cid "github.com/ipfs/go-cid"
+	datastore "github.com/ipfs/go-datastore"
+	coreapi "github.com/ipfs/interface-go-ipfs-core"
+	p2pcore "github.com/libp2p/go-libp2p-core"
+	"github.com/libp2p/go-libp2p-core/peer"
+	"go.opentelemetry.io/otel/api/trace"
+	"go.uber.org/zap"
 )
 
 // CreateDBOptions lists the arguments to create a store

orbitdb.go

@@ -1,14 +1,15 @@
 package orbitdb
 
 import (
+	"context"
+
 	"berty.tech/go-orbit-db/accesscontroller/ipfs"
 	"berty.tech/go-orbit-db/accesscontroller/orbitdb"
 	"berty.tech/go-orbit-db/accesscontroller/simple"
 	"berty.tech/go-orbit-db/baseorbitdb"
 	"berty.tech/go-orbit-db/iface"
 	"berty.tech/go-orbit-db/stores/eventlogstore"
 	"berty.tech/go-orbit-db/stores/kvstore"
-	"context"
 	coreapi "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/pkg/errors"
 )

stores/basestore/base_store.go

@@ -13,14 +13,6 @@ import (
 	"berty.tech/go-ipfs-log/entry"
 	"berty.tech/go-ipfs-log/identityprovider"
 	"berty.tech/go-ipfs-log/io"
-	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-datastore"
-	files "github.com/ipfs/go-ipfs-files"
-	coreapi "github.com/ipfs/interface-go-ipfs-core"
-	"github.com/ipfs/interface-go-ipfs-core/path"
-	"github.com/pkg/errors"
-	"go.uber.org/zap"
-
 	"berty.tech/go-orbit-db/accesscontroller"
 	"berty.tech/go-orbit-db/accesscontroller/simple"
 	"berty.tech/go-orbit-db/address"
@@ -29,8 +21,15 @@ import (
 	"berty.tech/go-orbit-db/stores"
 	"berty.tech/go-orbit-db/stores/operation"
 	"berty.tech/go-orbit-db/stores/replicator"
+	cid "github.com/ipfs/go-cid"
+	datastore "github.com/ipfs/go-datastore"
+	files "github.com/ipfs/go-ipfs-files"
+	coreapi "github.com/ipfs/interface-go-ipfs-core"
+	"github.com/ipfs/interface-go-ipfs-core/path"
+	"github.com/pkg/errors"
 	otkv "go.opentelemetry.io/otel/api/kv"
 	"go.opentelemetry.io/otel/api/trace"
+	"go.uber.org/zap"
 )
 
 // BaseStore The base of other stores

stores/basestore/utils.go

@@ -7,8 +7,8 @@ import (
 
 	"berty.tech/go-ipfs-log/entry"
 	"berty.tech/go-orbit-db/iface"
-	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-datastore"
+	cid "github.com/ipfs/go-cid"
+	datastore "github.com/ipfs/go-datastore"
 	files "github.com/ipfs/go-ipfs-files"
 	"github.com/pkg/errors"
 )

stores/eventlogstore/index.go

@@ -1,9 +1,10 @@
 package eventlogstore
 
 import (
+	"sync"
+
 	ipfslog "berty.tech/go-ipfs-log"
 	"berty.tech/go-orbit-db/iface"
-	"sync"
 )
 
 type eventIndex struct {

stores/eventlogstore/log.go

@@ -1,14 +1,15 @@
 package eventlogstore
 
 import (
+	"context"
+
 	ipfslog "berty.tech/go-ipfs-log"
 	"berty.tech/go-ipfs-log/identityprovider"
 	"berty.tech/go-orbit-db/address"
 	"berty.tech/go-orbit-db/iface"
 	"berty.tech/go-orbit-db/stores/basestore"
 	"berty.tech/go-orbit-db/stores/operation"
-	"context"
-	"github.com/ipfs/go-cid"
+	cid "github.com/ipfs/go-cid"
 	coreapi "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/pkg/errors"
 )

stores/events.go

@@ -4,7 +4,7 @@ import (
 	ipfslog "berty.tech/go-ipfs-log"
 	"berty.tech/go-orbit-db/address"
 	"berty.tech/go-orbit-db/stores/replicator"
-	"github.com/ipfs/go-cid"
+	cid "github.com/ipfs/go-cid"
 	p2pcore "github.com/libp2p/go-libp2p-core"
 )
 

stores/operation/operation.go

@@ -1,9 +1,10 @@
 package operation
 
 import (
-	ipfslog "berty.tech/go-ipfs-log"
 	"encoding/json"
 
+	ipfslog "berty.tech/go-ipfs-log"
+
 	"github.com/pkg/errors"
 )
 

stores/replicator/events.go

@@ -2,7 +2,7 @@ package replicator
 
 import (
 	ipfslog "berty.tech/go-ipfs-log"
-	"github.com/ipfs/go-cid"
+	cid "github.com/ipfs/go-cid"
 )
 
 // EventLoadAdded An event triggered when entries have been added

stores/replicator/interface.go

@@ -7,7 +7,7 @@ import (
 	"berty.tech/go-ipfs-log/identityprovider"
 	"berty.tech/go-orbit-db/accesscontroller"
 	"berty.tech/go-orbit-db/events"
-	"github.com/ipfs/go-cid"
+	cid "github.com/ipfs/go-cid"
 	coreapi "github.com/ipfs/interface-go-ipfs-core"
 )
 

stores/replicator/replicator.go

@@ -10,7 +10,7 @@ import (
 
 	ipfslog "berty.tech/go-ipfs-log"
 	"berty.tech/go-orbit-db/events"
-	"github.com/ipfs/go-cid"
+	cid "github.com/ipfs/go-cid"
 	"github.com/pkg/errors"
 	otkv "go.opentelemetry.io/otel/api/kv"
 	"go.opentelemetry.io/otel/api/trace"

tests/create_open_test.go

@@ -7,15 +7,14 @@ import (
 	"path"
 	"testing"
 
-	"berty.tech/go-orbit-db/accesscontroller"
-
 	"berty.tech/go-ipfs-log/identityprovider"
 	"berty.tech/go-ipfs-log/io"
 	"berty.tech/go-ipfs-log/keystore"
 	orbitdb "berty.tech/go-orbit-db"
+	"berty.tech/go-orbit-db/accesscontroller"
 	"berty.tech/go-orbit-db/stores/operation"
 	"berty.tech/go-orbit-db/utils"
-	"github.com/ipfs/go-datastore"
+	datastore "github.com/ipfs/go-datastore"
 	leveldb "github.com/ipfs/go-ds-leveldb"
 	"github.com/polydawn/refmt/cbor"
 	"github.com/polydawn/refmt/obj/atlas"

tests/eventlog_test.go

@@ -6,10 +6,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/ipfs/go-cid"
-
 	orbitdb "berty.tech/go-orbit-db"
 	"berty.tech/go-orbit-db/stores/operation"
+	cid "github.com/ipfs/go-cid"
 	. "github.com/smartystreets/goconvey/convey"
 )
 

tests/persistence_test.go

@@ -7,12 +7,11 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/smartystreets/goconvey/convey"
-
 	orbitdb "berty.tech/go-orbit-db"
 	"berty.tech/go-orbit-db/stores"
 	"berty.tech/go-orbit-db/stores/basestore"
 	"berty.tech/go-orbit-db/stores/operation"
+	. "github.com/smartystreets/goconvey/convey"
 )
 
 func TestPersistence(t *testing.T) {

utils/create_db_manifest.go

@@ -5,7 +5,7 @@ import (
 	"path"
 
 	"berty.tech/go-ipfs-log/io"
-	"github.com/ipfs/go-cid"
+	cid "github.com/ipfs/go-cid"
 	cbornode "github.com/ipfs/go-ipld-cbor"
 	coreapi "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/pkg/errors"