mirror of
https://github.com/nspcc-dev/neo-go.git
synced 2025-01-02 23:22:49 +00:00
cli: refactor upload-bin
handler to reuse SDK built-in functionality
Close #3714 Signed-off-by: Ekaterina Pavlova <ekt@morphbits.io>
This commit is contained in:
parent
247ee831e5
commit
be4fc98041
1 changed files with 5 additions and 41 deletions
|
@ -16,16 +16,13 @@ import (
|
||||||
"github.com/nspcc-dev/neo-go/pkg/services/helpers/neofs"
|
"github.com/nspcc-dev/neo-go/pkg/services/helpers/neofs"
|
||||||
"github.com/nspcc-dev/neo-go/pkg/util"
|
"github.com/nspcc-dev/neo-go/pkg/util"
|
||||||
"github.com/nspcc-dev/neo-go/pkg/wallet"
|
"github.com/nspcc-dev/neo-go/pkg/wallet"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/checksum"
|
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/client"
|
"github.com/nspcc-dev/neofs-sdk-go/client"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/container"
|
"github.com/nspcc-dev/neofs-sdk-go/container"
|
||||||
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/netmap"
|
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
"github.com/nspcc-dev/neofs-sdk-go/object"
|
||||||
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/pool"
|
"github.com/nspcc-dev/neofs-sdk-go/pool"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/user"
|
"github.com/nspcc-dev/neofs-sdk-go/user"
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/version"
|
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -86,17 +83,6 @@ func uploadBin(ctx *cli.Context) error {
|
||||||
}
|
}
|
||||||
defer p.Close()
|
defer p.Close()
|
||||||
|
|
||||||
var net netmap.NetworkInfo
|
|
||||||
err = retry(func() error {
|
|
||||||
var errNet error
|
|
||||||
net, errNet = p.NetworkInfo(ctx.Context, client.PrmNetworkInfo{})
|
|
||||||
return errNet
|
|
||||||
}, maxRetries, debug)
|
|
||||||
if err != nil {
|
|
||||||
return cli.Exit(fmt.Errorf("failed to get network info: %w", err), 1)
|
|
||||||
}
|
|
||||||
homomorphicHashingDisabled := net.HomomorphicHashingDisabled()
|
|
||||||
|
|
||||||
var containerObj container.Container
|
var containerObj container.Container
|
||||||
err = retry(func() error {
|
err = retry(func() error {
|
||||||
containerObj, err = p.ContainerGet(ctx.Context, containerID, client.PrmContainerGet{})
|
containerObj, err = p.ContainerGet(ctx.Context, containerID, client.PrmContainerGet{})
|
||||||
|
@ -126,7 +112,7 @@ func uploadBin(ctx *cli.Context) error {
|
||||||
return cli.Exit(fmt.Errorf("failed to find objects: %w", err), 1)
|
return cli.Exit(fmt.Errorf("failed to find objects: %w", err), 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = uploadBlocksAndIndexFiles(ctx, pWrapper, rpc, signer, containerID, acc, attr, indexAttrKey, buf, i, indexFileSize, uint(currentBlockHeight), homomorphicHashingDisabled, numWorkers, maxRetries, debug)
|
err = uploadBlocksAndIndexFiles(ctx, pWrapper, rpc, signer, containerID, acc, attr, indexAttrKey, buf, i, indexFileSize, uint(currentBlockHeight), numWorkers, maxRetries, debug)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return cli.Exit(fmt.Errorf("failed to upload objects: %w", err), 1)
|
return cli.Exit(fmt.Errorf("failed to upload objects: %w", err), 1)
|
||||||
}
|
}
|
||||||
|
@ -154,7 +140,7 @@ func retry(action func() error, maxRetries uint, debug bool) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// uploadBlocksAndIndexFiles uploads the blocks and index files to the container using the pool.
|
// uploadBlocksAndIndexFiles uploads the blocks and index files to the container using the pool.
|
||||||
func uploadBlocksAndIndexFiles(ctx *cli.Context, p poolWrapper, rpc *rpcclient.Client, signer user.Signer, containerID cid.ID, acc *wallet.Account, attr, indexAttributeKey string, buf []byte, currentIndexFileID, indexFileSize, currentBlockHeight uint, homomorphicHashingDisabled bool, numWorkers, maxRetries uint, debug bool) error {
|
func uploadBlocksAndIndexFiles(ctx *cli.Context, p poolWrapper, rpc *rpcclient.Client, signer user.Signer, containerID cid.ID, acc *wallet.Account, attr, indexAttributeKey string, buf []byte, currentIndexFileID, indexFileSize, currentBlockHeight uint, numWorkers, maxRetries uint, debug bool) error {
|
||||||
if currentIndexFileID*indexFileSize >= currentBlockHeight {
|
if currentIndexFileID*indexFileSize >= currentBlockHeight {
|
||||||
fmt.Fprintf(ctx.App.Writer, "No new blocks to upload. Need to upload starting from %d, current height %d\n", currentIndexFileID*indexFileSize, currentBlockHeight)
|
fmt.Fprintf(ctx.App.Writer, "No new blocks to upload. Need to upload starting from %d, current height %d\n", currentIndexFileID*indexFileSize, currentBlockHeight)
|
||||||
return nil
|
return nil
|
||||||
|
@ -221,7 +207,7 @@ func uploadBlocksAndIndexFiles(ctx *cli.Context, p poolWrapper, rpc *rpcclient.C
|
||||||
)
|
)
|
||||||
errRetr := retry(func() error {
|
errRetr := retry(func() error {
|
||||||
var errUpload error
|
var errUpload error
|
||||||
resOid, errUpload = uploadObj(ctx.Context, p, signer, acc.PrivateKey().GetScriptHash(), containerID, objBytes, attrs, homomorphicHashingDisabled)
|
resOid, errUpload = uploadObj(ctx.Context, p, signer, acc.PrivateKey().GetScriptHash(), containerID, objBytes, attrs)
|
||||||
if errUpload != nil {
|
if errUpload != nil {
|
||||||
return errUpload
|
return errUpload
|
||||||
}
|
}
|
||||||
|
@ -268,7 +254,7 @@ func uploadBlocksAndIndexFiles(ctx *cli.Context, p poolWrapper, rpc *rpcclient.C
|
||||||
}
|
}
|
||||||
err := retry(func() error {
|
err := retry(func() error {
|
||||||
var errUpload error
|
var errUpload error
|
||||||
_, errUpload = uploadObj(ctx.Context, p, signer, acc.PrivateKey().GetScriptHash(), containerID, buf, attrs, homomorphicHashingDisabled)
|
_, errUpload = uploadObj(ctx.Context, p, signer, acc.PrivateKey().GetScriptHash(), containerID, buf, attrs)
|
||||||
return errUpload
|
return errUpload
|
||||||
}, maxRetries, debug)
|
}, maxRetries, debug)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -440,41 +426,19 @@ func searchObjects(ctx context.Context, p poolWrapper, containerID cid.ID, accou
|
||||||
}
|
}
|
||||||
|
|
||||||
// uploadObj uploads object to the container using provided settings.
|
// uploadObj uploads object to the container using provided settings.
|
||||||
func uploadObj(ctx context.Context, p poolWrapper, signer user.Signer, owner util.Uint160, containerID cid.ID, objData []byte, attrs []object.Attribute, homomorphicHashingDisabled bool) (oid.ID, error) {
|
func uploadObj(ctx context.Context, p poolWrapper, signer user.Signer, owner util.Uint160, containerID cid.ID, objData []byte, attrs []object.Attribute) (oid.ID, error) {
|
||||||
var (
|
var (
|
||||||
ownerID user.ID
|
ownerID user.ID
|
||||||
hdr object.Object
|
hdr object.Object
|
||||||
chSHA256 checksum.Checksum
|
|
||||||
chHomomorphic checksum.Checksum
|
|
||||||
v = new(version.Version)
|
|
||||||
prmObjectPutInit client.PrmObjectPutInit
|
prmObjectPutInit client.PrmObjectPutInit
|
||||||
resOID = oid.ID{}
|
resOID = oid.ID{}
|
||||||
)
|
)
|
||||||
|
|
||||||
ownerID.SetScriptHash(owner)
|
ownerID.SetScriptHash(owner)
|
||||||
hdr.SetPayload(objData)
|
hdr.SetPayload(objData)
|
||||||
hdr.SetPayloadSize(uint64(len(objData)))
|
|
||||||
hdr.SetContainerID(containerID)
|
hdr.SetContainerID(containerID)
|
||||||
hdr.SetOwnerID(&ownerID)
|
hdr.SetOwnerID(&ownerID)
|
||||||
hdr.SetAttributes(attrs...)
|
hdr.SetAttributes(attrs...)
|
||||||
hdr.SetCreationEpoch(1)
|
|
||||||
v.SetMajor(1)
|
|
||||||
hdr.SetVersion(v)
|
|
||||||
if !homomorphicHashingDisabled {
|
|
||||||
checksum.Calculate(&chHomomorphic, checksum.TZ, objData)
|
|
||||||
hdr.SetPayloadHomomorphicHash(chHomomorphic)
|
|
||||||
}
|
|
||||||
checksum.Calculate(&chSHA256, checksum.SHA256, objData)
|
|
||||||
hdr.SetPayloadChecksum(chSHA256)
|
|
||||||
|
|
||||||
err := hdr.SetIDWithSignature(signer)
|
|
||||||
if err != nil {
|
|
||||||
return resOID, err
|
|
||||||
}
|
|
||||||
err = hdr.CheckHeaderVerificationFields()
|
|
||||||
if err != nil {
|
|
||||||
return resOID, err
|
|
||||||
}
|
|
||||||
|
|
||||||
writer, err := p.ObjectPutInit(ctx, hdr, signer, prmObjectPutInit)
|
writer, err := p.ObjectPutInit(ctx, hdr, signer, prmObjectPutInit)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in a new issue