forked from TrueCloudLab/frostfs-node
[#30] Update to latest neofs-api-go and fix conflicts
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
parent
84b4ff0755
commit
9c1c023f05
6 changed files with 27 additions and 33 deletions
|
@ -19,17 +19,12 @@ func (a *Address) MarshalStableV2() ([]byte, error) {
|
|||
}
|
||||
|
||||
// AddressFromV2 converts v2 Address message to Address.
|
||||
func AddressFromV2(aV2 *refs.Address) (*Address, error) {
|
||||
func AddressFromV2(aV2 *refs.Address) *Address {
|
||||
if aV2 == nil {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
a, err := object.AddressFromV2(aV2)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return nil
|
||||
}
|
||||
|
||||
return &Address{
|
||||
Address: a,
|
||||
}, nil
|
||||
Address: object.NewAddressFromV2(aV2),
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue