Skip to content

Commit 0945b32

Browse files
authored
Merge pull request #198 from ipfs/dependency-upgrades
Dependency upgrades
2 parents ad7c0fc + 29d3c2f commit 0945b32

File tree

6 files changed

+508
-1462
lines changed

6 files changed

+508
-1462
lines changed

.github/workflows/go.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
- name: Set up Go
1414
uses: actions/setup-go@v2
1515
with:
16-
go-version: 1.17
16+
go-version: 1.19
1717

1818
- name: Install depedencies
19-
run: go get honnef.co/go/tools/cmd/staticcheck
19+
run: go install honnef.co/go/tools/cmd/staticcheck@latest
2020

2121
- name: Build
2222
run: go build -v ./...
@@ -40,7 +40,7 @@ jobs:
4040
- name: Set up Go
4141
uses: actions/setup-go@v2
4242
with:
43-
go-version: 1.17
43+
go-version: 1.19
4444

4545
- name: Test
4646
run: go test -timeout 30m -v -run "TestDatastoreSuite" .

examples/globaldb/globaldb.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
crdt "github.com/ipfs/go-ds-crdt"
2222
logging "github.com/ipfs/go-log/v2"
2323

24-
crypto "github.com/libp2p/go-libp2p-core/crypto"
25-
"github.com/libp2p/go-libp2p-core/host"
26-
"github.com/libp2p/go-libp2p-core/peer"
2724
pubsub "github.com/libp2p/go-libp2p-pubsub"
25+
crypto "github.com/libp2p/go-libp2p/core/crypto"
26+
"github.com/libp2p/go-libp2p/core/host"
27+
"github.com/libp2p/go-libp2p/core/peer"
2828

2929
ipfslite "github.com/hsanjuan/ipfs-lite"
3030
"github.com/mitchellh/go-homedir"
@@ -149,7 +149,7 @@ func main() {
149149
}
150150
}()
151151

152-
ipfs, err := ipfslite.New(ctx, store, h, dht, nil)
152+
ipfs, err := ipfslite.New(ctx, store, nil, h, dht, nil)
153153
if err != nil {
154154
logger.Fatal(err)
155155
}

examples/globaldb/go.mod

Lines changed: 105 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -1,175 +1,159 @@
11
module github.com/ipfs/go-ds-crdt/examples/globaldb
22

3-
go 1.17
3+
go 1.19
44

55
require (
6-
github.com/hsanjuan/ipfs-lite v1.2.0
7-
github.com/ipfs/go-datastore v0.5.1
6+
github.com/hsanjuan/ipfs-lite v1.6.0
7+
github.com/ipfs/go-datastore v0.6.0
88
github.com/ipfs/go-ds-badger v0.3.0
9-
github.com/ipfs/go-ds-crdt v0.2.4
10-
github.com/ipfs/go-log/v2 v2.5.0
11-
github.com/libp2p/go-libp2p-core v0.13.0
12-
github.com/libp2p/go-libp2p-pubsub v0.6.1
9+
github.com/ipfs/go-ds-crdt v0.3.10-0.20230226132221-00018ab5868b
10+
github.com/ipfs/go-log/v2 v2.5.1
11+
github.com/libp2p/go-libp2p v0.26.0
12+
github.com/libp2p/go-libp2p-pubsub v0.9.1
1313
github.com/mitchellh/go-homedir v1.1.0
14-
github.com/multiformats/go-multiaddr v0.5.0
14+
github.com/multiformats/go-multiaddr v0.8.0
1515
)
1616

1717
require (
1818
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
19-
github.com/Stebalien/go-bitfield v0.0.1 // indirect
20-
github.com/benbjohnson/clock v1.1.0 // indirect
19+
github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a // indirect
20+
github.com/benbjohnson/clock v1.3.0 // indirect
2121
github.com/beorn7/perks v1.0.1 // indirect
22-
github.com/btcsuite/btcd v0.22.0-beta // indirect
2322
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
2423
github.com/cespare/xxhash v1.1.0 // indirect
25-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
26-
github.com/cheekybits/genny v1.0.0 // indirect
24+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
25+
github.com/containerd/cgroups v1.0.4 // indirect
26+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
2727
github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 // indirect
2828
github.com/cskr/pubsub v1.0.2 // indirect
2929
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
30+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
3031
github.com/dgraph-io/badger v1.6.2 // indirect
3132
github.com/dgraph-io/ristretto v0.0.2 // indirect
33+
github.com/docker/go-units v0.5.0 // indirect
3234
github.com/dustin/go-humanize v1.0.0 // indirect
35+
github.com/elastic/gosigar v0.14.2 // indirect
3336
github.com/flynn/noise v1.0.0 // indirect
3437
github.com/francoispqt/gojay v1.2.13 // indirect
35-
github.com/fsnotify/fsnotify v1.4.9 // indirect
38+
github.com/go-logr/logr v1.2.3 // indirect
39+
github.com/go-logr/stdr v1.2.2 // indirect
3640
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
41+
github.com/godbus/dbus/v5 v5.1.0 // indirect
3742
github.com/gogo/protobuf v1.3.2 // indirect
43+
github.com/golang/mock v1.6.0 // indirect
3844
github.com/golang/protobuf v1.5.2 // indirect
3945
github.com/google/gopacket v1.1.19 // indirect
46+
github.com/google/pprof v0.0.0-20221203041831-ce31453925ec // indirect
4047
github.com/google/uuid v1.3.0 // indirect
41-
github.com/gorilla/websocket v1.4.2 // indirect
42-
github.com/hashicorp/errwrap v1.0.0 // indirect
48+
github.com/hashicorp/errwrap v1.1.0 // indirect
4349
github.com/hashicorp/go-multierror v1.1.1 // indirect
4450
github.com/hashicorp/golang-lru v0.5.4 // indirect
45-
github.com/huin/goupnp v1.0.2 // indirect
51+
github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect
52+
github.com/huin/goupnp v1.0.3 // indirect
4653
github.com/ipfs/bbloom v0.0.4 // indirect
47-
github.com/ipfs/go-bitswap v0.5.1 // indirect
48-
github.com/ipfs/go-block-format v0.0.3 // indirect
49-
github.com/ipfs/go-blockservice v0.2.1 // indirect
50-
github.com/ipfs/go-cid v0.1.0 // indirect
51-
github.com/ipfs/go-cidutil v0.0.2 // indirect
52-
github.com/ipfs/go-fetcher v1.5.0 // indirect
53-
github.com/ipfs/go-ipfs-blockstore v1.1.2 // indirect
54+
github.com/ipfs/go-bitfield v1.1.0 // indirect
55+
github.com/ipfs/go-block-format v0.1.1 // indirect
56+
github.com/ipfs/go-blockservice v0.5.0 // indirect
57+
github.com/ipfs/go-cid v0.3.2 // indirect
58+
github.com/ipfs/go-cidutil v0.1.0 // indirect
59+
github.com/ipfs/go-fetcher v1.6.1 // indirect
60+
github.com/ipfs/go-ipfs-blockstore v1.2.0 // indirect
5461
github.com/ipfs/go-ipfs-chunker v0.0.5 // indirect
55-
github.com/ipfs/go-ipfs-config v0.16.0 // indirect
5662
github.com/ipfs/go-ipfs-delay v0.0.1 // indirect
5763
github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
58-
github.com/ipfs/go-ipfs-exchange-interface v0.1.0 // indirect
59-
github.com/ipfs/go-ipfs-exchange-offline v0.1.1 // indirect
60-
github.com/ipfs/go-ipfs-files v0.0.8 // indirect
64+
github.com/ipfs/go-ipfs-exchange-interface v0.2.0 // indirect
65+
github.com/ipfs/go-ipfs-exchange-offline v0.3.0 // indirect
6166
github.com/ipfs/go-ipfs-posinfo v0.0.1 // indirect
62-
github.com/ipfs/go-ipfs-pq v0.0.2 // indirect
63-
github.com/ipfs/go-ipfs-provider v0.7.1 // indirect
67+
github.com/ipfs/go-ipfs-pq v0.0.3 // indirect
68+
github.com/ipfs/go-ipfs-provider v0.8.1 // indirect
6469
github.com/ipfs/go-ipfs-util v0.0.2 // indirect
65-
github.com/ipfs/go-ipld-cbor v0.0.5 // indirect
66-
github.com/ipfs/go-ipld-format v0.2.0 // indirect
67-
github.com/ipfs/go-ipld-legacy v0.1.0 // indirect
68-
github.com/ipfs/go-ipns v0.1.2 // indirect
70+
github.com/ipfs/go-ipld-cbor v0.0.6 // indirect
71+
github.com/ipfs/go-ipld-format v0.4.0 // indirect
72+
github.com/ipfs/go-ipld-legacy v0.1.1 // indirect
73+
github.com/ipfs/go-ipns v0.3.0 // indirect
74+
github.com/ipfs/go-libipfs v0.6.0 // indirect
6975
github.com/ipfs/go-log v1.0.5 // indirect
70-
github.com/ipfs/go-merkledag v0.5.1 // indirect
76+
github.com/ipfs/go-merkledag v0.10.0 // indirect
7177
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
72-
github.com/ipfs/go-peertaskqueue v0.7.0 // indirect
73-
github.com/ipfs/go-unixfs v0.2.6 // indirect
74-
github.com/ipfs/go-verifcid v0.0.1 // indirect
75-
github.com/ipfs/interface-go-ipfs-core v0.4.0 // indirect
76-
github.com/ipld/go-codec-dagpb v1.3.0 // indirect
77-
github.com/ipld/go-ipld-prime v0.11.0 // indirect
78+
github.com/ipfs/go-peertaskqueue v0.8.1 // indirect
79+
github.com/ipfs/go-unixfs v0.4.3 // indirect
80+
github.com/ipfs/go-verifcid v0.0.2 // indirect
81+
github.com/ipld/go-codec-dagpb v1.6.0 // indirect
82+
github.com/ipld/go-ipld-prime v0.20.0 // indirect
7883
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
7984
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
8085
github.com/jbenet/goprocess v0.1.4 // indirect
81-
github.com/klauspost/compress v1.11.7 // indirect
82-
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
83-
github.com/koron/go-ssdp v0.0.2 // indirect
84-
github.com/libp2p/go-addr-util v0.1.0 // indirect
85-
github.com/libp2p/go-buffer-pool v0.0.2 // indirect
86+
github.com/klauspost/compress v1.15.12 // indirect
87+
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
88+
github.com/koron/go-ssdp v0.0.3 // indirect
89+
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
8690
github.com/libp2p/go-cidranger v1.1.0 // indirect
87-
github.com/libp2p/go-conn-security-multistream v0.3.0 // indirect
88-
github.com/libp2p/go-eventbus v0.2.1 // indirect
89-
github.com/libp2p/go-flow-metrics v0.0.3 // indirect
90-
github.com/libp2p/go-libp2p v0.17.0 // indirect
91-
github.com/libp2p/go-libp2p-asn-util v0.1.0 // indirect
92-
github.com/libp2p/go-libp2p-autonat v0.7.0 // indirect
93-
github.com/libp2p/go-libp2p-blankhost v0.3.0 // indirect
94-
github.com/libp2p/go-libp2p-connmgr v0.2.4 // indirect
95-
github.com/libp2p/go-libp2p-discovery v0.6.0 // indirect
96-
github.com/libp2p/go-libp2p-kad-dht v0.15.0 // indirect
97-
github.com/libp2p/go-libp2p-kbucket v0.4.7 // indirect
98-
github.com/libp2p/go-libp2p-loggables v0.1.0 // indirect
99-
github.com/libp2p/go-libp2p-mplex v0.4.1 // indirect
100-
github.com/libp2p/go-libp2p-nat v0.1.0 // indirect
101-
github.com/libp2p/go-libp2p-noise v0.3.0 // indirect
102-
github.com/libp2p/go-libp2p-peerstore v0.6.0 // indirect
103-
github.com/libp2p/go-libp2p-pnet v0.2.0 // indirect
104-
github.com/libp2p/go-libp2p-quic-transport v0.15.2 // indirect
105-
github.com/libp2p/go-libp2p-record v0.1.3 // indirect
106-
github.com/libp2p/go-libp2p-routing-helpers v0.2.3 // indirect
107-
github.com/libp2p/go-libp2p-swarm v0.9.0 // indirect
108-
github.com/libp2p/go-libp2p-tls v0.3.1 // indirect
109-
github.com/libp2p/go-libp2p-transport-upgrader v0.6.0 // indirect
110-
github.com/libp2p/go-libp2p-yamux v0.7.0 // indirect
111-
github.com/libp2p/go-maddr-filter v0.1.0 // indirect
112-
github.com/libp2p/go-mplex v0.3.0 // indirect
113-
github.com/libp2p/go-msgio v0.1.0 // indirect
91+
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
92+
github.com/libp2p/go-libp2p-asn-util v0.2.0 // indirect
93+
github.com/libp2p/go-libp2p-kad-dht v0.21.1 // indirect
94+
github.com/libp2p/go-libp2p-kbucket v0.5.0 // indirect
95+
github.com/libp2p/go-libp2p-record v0.2.0 // indirect
96+
github.com/libp2p/go-libp2p-routing-helpers v0.4.0 // indirect
97+
github.com/libp2p/go-msgio v0.3.0 // indirect
11498
github.com/libp2p/go-nat v0.1.0 // indirect
115-
github.com/libp2p/go-netroute v0.1.6 // indirect
116-
github.com/libp2p/go-openssl v0.0.7 // indirect
117-
github.com/libp2p/go-reuseport v0.1.0 // indirect
118-
github.com/libp2p/go-reuseport-transport v0.1.0 // indirect
119-
github.com/libp2p/go-sockaddr v0.1.1 // indirect
120-
github.com/libp2p/go-stream-muxer-multistream v0.3.0 // indirect
121-
github.com/libp2p/go-tcp-transport v0.4.0 // indirect
122-
github.com/libp2p/go-ws-transport v0.5.0 // indirect
123-
github.com/libp2p/go-yamux/v2 v2.3.0 // indirect
124-
github.com/lucas-clemente/quic-go v0.24.0 // indirect
125-
github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
126-
github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
99+
github.com/libp2p/go-netroute v0.2.1 // indirect
100+
github.com/libp2p/go-reuseport v0.2.0 // indirect
101+
github.com/libp2p/go-yamux/v4 v4.0.0 // indirect
127102
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
128-
github.com/mattn/go-isatty v0.0.14 // indirect
129-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
130-
github.com/miekg/dns v1.1.43 // indirect
103+
github.com/mattn/go-isatty v0.0.17 // indirect
104+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
105+
github.com/miekg/dns v1.1.50 // indirect
131106
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
132107
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
133-
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
134108
github.com/minio/sha256-simd v1.0.0 // indirect
135109
github.com/mr-tron/base58 v1.2.0 // indirect
136-
github.com/multiformats/go-base32 v0.0.3 // indirect
137-
github.com/multiformats/go-base36 v0.1.0 // indirect
110+
github.com/multiformats/go-base32 v0.1.0 // indirect
111+
github.com/multiformats/go-base36 v0.2.0 // indirect
138112
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
139113
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
140-
github.com/multiformats/go-multibase v0.0.3 // indirect
141-
github.com/multiformats/go-multicodec v0.2.0 // indirect
142-
github.com/multiformats/go-multihash v0.1.0 // indirect
143-
github.com/multiformats/go-multistream v0.2.2 // indirect
144-
github.com/multiformats/go-varint v0.0.6 // indirect
145-
github.com/nxadm/tail v1.4.8 // indirect
146-
github.com/onsi/ginkgo v1.16.4 // indirect
114+
github.com/multiformats/go-multibase v0.1.1 // indirect
115+
github.com/multiformats/go-multicodec v0.8.0 // indirect
116+
github.com/multiformats/go-multihash v0.2.1 // indirect
117+
github.com/multiformats/go-multistream v0.4.1 // indirect
118+
github.com/multiformats/go-varint v0.0.7 // indirect
119+
github.com/onsi/ginkgo/v2 v2.5.1 // indirect
120+
github.com/opencontainers/runtime-spec v1.0.2 // indirect
147121
github.com/opentracing/opentracing-go v1.2.0 // indirect
122+
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
148123
github.com/pkg/errors v0.9.1 // indirect
149-
github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e // indirect
150-
github.com/prometheus/client_golang v1.11.0 // indirect
151-
github.com/prometheus/client_model v0.2.0 // indirect
152-
github.com/prometheus/common v0.30.0 // indirect
153-
github.com/prometheus/procfs v0.7.3 // indirect
154-
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
124+
github.com/polydawn/refmt v0.89.0 // indirect
125+
github.com/prometheus/client_golang v1.14.0 // indirect
126+
github.com/prometheus/client_model v0.3.0 // indirect
127+
github.com/prometheus/common v0.37.0 // indirect
128+
github.com/prometheus/procfs v0.8.0 // indirect
129+
github.com/quic-go/qpack v0.4.0 // indirect
130+
github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
131+
github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
132+
github.com/quic-go/quic-go v0.33.0 // indirect
133+
github.com/quic-go/webtransport-go v0.5.1 // indirect
134+
github.com/raulk/go-watchdog v1.3.0 // indirect
155135
github.com/spaolacci/murmur3 v1.1.0 // indirect
156-
github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158 // indirect
136+
github.com/whyrusleeping/cbor-gen v0.0.0-20230126041949-52956bd4c9aa // indirect
157137
github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f // indirect
158138
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
159-
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 // indirect
160-
github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee // indirect
161-
go.opencensus.io v0.23.0 // indirect
162-
go.uber.org/atomic v1.9.0 // indirect
163-
go.uber.org/multierr v1.7.0 // indirect
164-
go.uber.org/zap v1.19.1 // indirect
165-
golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e // indirect
166-
golang.org/x/mod v0.4.2 // indirect
167-
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
168-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
169-
golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912 // indirect
170-
golang.org/x/tools v0.1.5 // indirect
171-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
172-
google.golang.org/protobuf v1.27.1 // indirect
173-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
174-
lukechampine.com/blake3 v1.1.6 // indirect
139+
go.opencensus.io v0.24.0 // indirect
140+
go.opentelemetry.io/otel v1.7.0 // indirect
141+
go.opentelemetry.io/otel/trace v1.7.0 // indirect
142+
go.uber.org/atomic v1.10.0 // indirect
143+
go.uber.org/dig v1.15.0 // indirect
144+
go.uber.org/fx v1.18.2 // indirect
145+
go.uber.org/multierr v1.9.0 // indirect
146+
go.uber.org/zap v1.24.0 // indirect
147+
golang.org/x/crypto v0.5.0 // indirect
148+
golang.org/x/exp v0.0.0-20230129154200-a960b3787bd2 // indirect
149+
golang.org/x/mod v0.7.0 // indirect
150+
golang.org/x/net v0.7.0 // indirect
151+
golang.org/x/sync v0.1.0 // indirect
152+
golang.org/x/sys v0.5.0 // indirect
153+
golang.org/x/text v0.7.0 // indirect
154+
golang.org/x/tools v0.3.0 // indirect
155+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
156+
google.golang.org/protobuf v1.28.1 // indirect
157+
lukechampine.com/blake3 v1.1.7 // indirect
158+
nhooyr.io/websocket v1.8.7 // indirect
175159
)

0 commit comments

Comments
 (0)