From 9c1c023f05e6b798d21db800bd542b3a4f66d7a9 Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Wed, 16 Sep 2020 14:58:58 +0300 Subject: [PATCH] [#30] Update to latest neofs-api-go and fix conflicts Signed-off-by: Leonard Lyubich --- go.mod | 2 +- go.sum | Bin 58081 -> 58326 bytes pkg/core/object/address.go | 13 +++------- pkg/core/object/object.go | 27 ++++++++------------ pkg/local_object_storage/localstore/meta.go | 9 ++++++- pkg/services/accounting/morph/executor.go | 7 +---- 6 files changed, 25 insertions(+), 33 deletions(-) diff --git a/go.mod b/go.mod index 8082a68ec..42686c0cf 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/multiformats/go-multiaddr-net v0.1.2 // v0.1.1 => v0.1.2 github.com/multiformats/go-multihash v0.0.13 // indirect github.com/nspcc-dev/neo-go v0.91.1-pre.0.20200827184617-7560aa345a78 - github.com/nspcc-dev/neofs-api-go v1.3.1-0.20200911095622-47fd771ee4c5 + github.com/nspcc-dev/neofs-api-go v1.3.1-0.20200916115135-ff325b877023 github.com/nspcc-dev/neofs-crypto v0.3.0 github.com/panjf2000/ants/v2 v2.3.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 86b76638d05c7d7f236df039d4f3059c3477b9fd..2edcf1a54c55a4370ae7a55ac70dbf0af337b66c 100644 GIT binary patch delta 115 zcmaEOl=<3m<_)_uCfjC+JDC|8ni?9L>ZYX`8<{3qn423I87pKMT9xFK