TrueCloudLab/frostfs-node
19
1
Fork 27
Code Issues 90 Pull requests 3 Projects Releases 1 Activity Actions

frostfs-adm: Add info to error messages #1386

Merged
dstepanov-yadro merged 1 commit from potyarkin/frostfs-node:feature/better-errors into master 2024-09-23 07:47:04 +00:00
Conversation 0 Commits 1 Files changed 2 +22 -3
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/frostfs-adm/internal/modules/morph/initialize/initialize_roles.go
View file

@ -1,6 +1,8 @@
package initialize
import (
"fmt"
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/helper"
"github.com/nspcc-dev/neo-go/pkg/core/native/noderoles"
"github.com/nspcc-dev/neo-go/pkg/io"
@ -29,10 +31,14 @@ func setNotaryAndAlphabetNodes(c *helper.InitializeContext) error {
callflag.States|callflag.AllowNotify, int64(noderoles.NeoFSAlphabet), pubs)
if err := c.SendCommitteeTx(w.Bytes(), false); err != nil {
return err
return fmt.Errorf("send committee transaction: %w", err)
potyarkin marked this conversation as resolved Outdated
dstepanov-yadro commented 2024-09-20 13:07:02 +00:00
Outdated
Review
Copy link

send committee transaction - to distinguish between errors

`send committee transaction` - to distinguish between errors
}
return c.AwaitTx()
err := c.AwaitTx()
if err != nil {
err = fmt.Errorf("await committee transaction: %w", err)
potyarkin marked this conversation as resolved Outdated
dstepanov-yadro commented 2024-09-20 13:07:16 +00:00
Outdated
Review
Copy link

await committee transaction - to distinguish between errors

`await committee transaction` - to distinguish between errors
}
return err
}
func setRolesFinished(c *helper.InitializeContext) (bool, error) {

15
cmd/frostfs-adm/internal/modules/morph/initialize/initialize_transfer.go
View file

@ -3,6 +3,7 @@ package initialize
import (
"fmt"
"math/big"
"strings"
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/constants"
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/helper"
@ -144,5 +145,17 @@ func createNEP17MultiTransferTx(c helper.Client, acc *wallet.Account, recipients
if err != nil {
return nil, fmt.Errorf("can't create actor: %w", err)
}
return act.MakeRun(w.Bytes())
tx, err := act.MakeRun(w.Bytes())
if err != nil {
sum := make(map[util.Uint160]int64)
for _, recipient := range recipients {
sum[recipient.Token] += recipient.Amount
}
detail := make([]string, 0, len(sum))
for _, value := range sum {
detail = append(detail, fmt.Sprintf("amount=%v", value))
}
err = fmt.Errorf("transfer failed: from=%s(%s) %s: %w", acc.Label, acc.Address, strings.Join(detail, " "), err)
}
return tx, err
}