Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Commit 617379d

Browse files
authored
Merge pull request #250 from nspcc-dev/247-update-to-sdk-100-rc8
Update to SDK 1.0.0.rc8
2 parents 2ea6341 + 191c6c6 commit 617379d

File tree

5 files changed

+134
-646
lines changed

5 files changed

+134
-646
lines changed

app.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/nspcc-dev/neofs-http-gw/response"
2424
"github.com/nspcc-dev/neofs-http-gw/uploader"
2525
"github.com/nspcc-dev/neofs-http-gw/utils"
26+
neofsecdsa "github.com/nspcc-dev/neofs-sdk-go/crypto/ecdsa"
2627
"github.com/nspcc-dev/neofs-sdk-go/pool"
2728
"github.com/nspcc-dev/neofs-sdk-go/user"
2829
"github.com/spf13/viper"
@@ -128,12 +129,16 @@ func newApp(ctx context.Context, opt ...Option) App {
128129
a.log.Fatal("failed to get neofs credentials", zap.Error(err))
129130
}
130131

132+
signer := neofsecdsa.SignerRFC6979(*key)
133+
131134
var owner user.ID
132-
user.IDFromKey(&owner, key.PublicKey)
135+
if err = user.IDFromSigner(&owner, signer); err != nil {
136+
a.log.Fatal("failed to get user id", zap.Error(err))
137+
}
133138
a.owner = &owner
134139

135140
var prm pool.InitParameters
136-
prm.SetKey(key)
141+
prm.SetSigner(signer)
137142
prm.SetNodeDialTimeout(a.cfg.GetDuration(cfgConTimeout))
138143
prm.SetNodeStreamTimeout(a.cfg.GetDuration(cfgStreamTimeout))
139144
prm.SetHealthcheckTimeout(a.cfg.GetDuration(cfgReqTimeout))

go.mod

Lines changed: 35 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,75 +4,72 @@ go 1.18
44

55
require (
66
github.com/fasthttp/router v1.4.1
7-
github.com/nspcc-dev/neo-go v0.99.4
7+
github.com/nspcc-dev/neo-go v0.100.1
88
github.com/nspcc-dev/neofs-api-go/v2 v2.14.0
9-
github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.7.0.20221115140820-b4b07a3c4e11
9+
github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.8
1010
github.com/prometheus/client_golang v1.13.0
1111
github.com/spf13/pflag v1.0.5
1212
github.com/spf13/viper v1.8.1
13-
github.com/stretchr/testify v1.8.0
14-
github.com/testcontainers/testcontainers-go v0.13.0
13+
github.com/stretchr/testify v1.8.2
14+
github.com/testcontainers/testcontainers-go v0.20.1
1515
github.com/valyala/fasthttp v1.34.0
1616
go.uber.org/atomic v1.10.0
17-
go.uber.org/zap v1.23.0
17+
go.uber.org/zap v1.24.0
1818
)
1919

2020
require (
2121
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2222
github.com/Microsoft/go-winio v0.5.2 // indirect
23-
github.com/Microsoft/hcsshim v0.9.2 // indirect
2423
github.com/andybalholm/brotli v1.0.4 // indirect
25-
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
24+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20221202181307-76fa05c21b12 // indirect
2625
github.com/beorn7/perks v1.0.1 // indirect
27-
github.com/btcsuite/btcd v0.22.0-beta // indirect
28-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
26+
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
2927
github.com/cespare/xxhash/v2 v2.1.2 // indirect
30-
github.com/containerd/cgroups v1.0.3 // indirect
31-
github.com/containerd/containerd v1.6.2 // indirect
32-
github.com/coreos/go-semver v0.3.0 // indirect
28+
github.com/containerd/containerd v1.6.19 // indirect
29+
github.com/cpuguy83/dockercfg v0.3.1 // indirect
3330
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
3431
github.com/davecgh/go-spew v1.1.1 // indirect
32+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
3533
github.com/docker/distribution v2.8.1+incompatible // indirect
36-
github.com/docker/docker v20.10.14+incompatible // indirect
34+
github.com/docker/docker v23.0.5+incompatible // indirect
3735
github.com/docker/go-connections v0.4.0 // indirect
38-
github.com/docker/go-units v0.4.0 // indirect
39-
github.com/fsnotify/fsnotify v1.4.9 // indirect
36+
github.com/docker/go-units v0.5.0 // indirect
37+
github.com/fsnotify/fsnotify v1.5.4 // indirect
4038
github.com/gogo/protobuf v1.3.2 // indirect
41-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4239
github.com/golang/protobuf v1.5.2 // indirect
4340
github.com/google/uuid v1.3.0 // indirect
44-
github.com/gorilla/mux v1.8.0 // indirect
4541
github.com/gorilla/websocket v1.4.2 // indirect
46-
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
42+
github.com/hashicorp/golang-lru v0.6.0 // indirect
4743
github.com/hashicorp/hcl v1.0.0 // indirect
44+
github.com/imdario/mergo v0.3.12 // indirect
4845
github.com/klauspost/compress v1.15.0 // indirect
49-
github.com/magiconair/properties v1.8.6 // indirect
50-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
46+
github.com/magiconair/properties v1.8.7 // indirect
47+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
5148
github.com/mitchellh/mapstructure v1.4.1 // indirect
52-
github.com/moby/sys/mount v0.3.2 // indirect
53-
github.com/moby/sys/mountinfo v0.6.1 // indirect
54-
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
49+
github.com/moby/patternmatcher v0.5.0 // indirect
50+
github.com/moby/sys/sequential v0.5.0 // indirect
51+
github.com/moby/term v0.0.0-20221128092401-c43b287e0e0f // indirect
5552
github.com/morikuni/aec v1.0.0 // indirect
5653
github.com/mr-tron/base58 v1.2.0 // indirect
5754
github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22 // indirect
5855
github.com/nspcc-dev/hrw v1.0.9 // indirect
59-
github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220927123257-24c107e3a262 // indirect
56+
github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20221202075445-cb5c18dc73eb // indirect
6057
github.com/nspcc-dev/neofs-contract v0.16.0 // indirect
6158
github.com/nspcc-dev/neofs-crypto v0.4.0 // indirect
6259
github.com/nspcc-dev/rfc6979 v0.2.0 // indirect
6360
github.com/nspcc-dev/tzhash v1.6.1 // indirect
6461
github.com/opencontainers/go-digest v1.0.0 // indirect
65-
github.com/opencontainers/image-spec v1.0.2 // indirect
66-
github.com/opencontainers/runc v1.1.1 // indirect
67-
github.com/pelletier/go-toml v1.9.3 // indirect
62+
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
63+
github.com/opencontainers/runc v1.1.5 // indirect
64+
github.com/pelletier/go-toml v1.9.5 // indirect
6865
github.com/pkg/errors v0.9.1 // indirect
6966
github.com/pmezard/go-difflib v1.0.0 // indirect
7067
github.com/prometheus/client_model v0.2.0 // indirect
7168
github.com/prometheus/common v0.37.0 // indirect
7269
github.com/prometheus/procfs v0.8.0 // indirect
7370
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7471
github.com/savsgio/gotils v0.0.0-20210617111740-97865ed5a873 // indirect
75-
github.com/sirupsen/logrus v1.8.1 // indirect
72+
github.com/sirupsen/logrus v1.9.0 // indirect
7673
github.com/spaolacci/murmur3 v1.1.0 // indirect
7774
github.com/spf13/afero v1.6.0 // indirect
7875
github.com/spf13/cast v1.3.1 // indirect
@@ -81,18 +78,18 @@ require (
8178
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
8279
github.com/urfave/cli v1.22.5 // indirect
8380
github.com/valyala/bytebufferpool v1.0.0 // indirect
84-
go.opencensus.io v0.23.0 // indirect
85-
go.uber.org/multierr v1.8.0 // indirect
86-
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
87-
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
88-
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
89-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
90-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
91-
golang.org/x/text v0.3.7 // indirect
92-
google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4 // indirect
81+
go.uber.org/goleak v1.1.12 // indirect
82+
go.uber.org/multierr v1.9.0 // indirect
83+
golang.org/x/crypto v0.4.0 // indirect
84+
golang.org/x/exp v0.0.0-20221227203929-1b447090c38c // indirect
85+
golang.org/x/net v0.7.0 // indirect
86+
golang.org/x/sync v0.1.0 // indirect
87+
golang.org/x/sys v0.7.0 // indirect
88+
golang.org/x/term v0.5.0 // indirect
89+
golang.org/x/text v0.7.0 // indirect
90+
google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad // indirect
9391
google.golang.org/grpc v1.48.0 // indirect
9492
google.golang.org/protobuf v1.28.1 // indirect
95-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
9693
gopkg.in/ini.v1 v1.62.0 // indirect
9794
gopkg.in/yaml.v2 v2.4.0 // indirect
9895
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)