aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

vmcli: unify error messages

Browse source
This commit is contained in:
Evgenii Stratonikov 2020-12-01 17:15:01 +03:00
parent bea5125d42
commit f8728e4f44
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkg/vm/cli/cli.go
View file

@ -183,6 +183,12 @@ example:
}, },
} }
// Various errors.
var (
ErrMissingParameter = errors.New("missing argument")
ErrInvalidParameter = errors.New("can't parse argument")
)
// VMCLI object for interacting with the VM. // VMCLI object for interacting with the VM.
type VMCLI struct { type VMCLI struct {
vm *vm.VM vm *vm.VM
@ -241,12 +247,12 @@ func handleBreak(c *ishell.Context) {
} }
v := getVMFromContext(c) v := getVMFromContext(c)
if len(c.Args) != 1 { if len(c.Args) != 1 {
c.Err(errors.New("missing parameter <ip>")) c.Err(fmt.Errorf("%w: <ip>", ErrMissingParameter))
return return
} }
n, err := strconv.Atoi(c.Args[0]) n, err := strconv.Atoi(c.Args[0])
if err != nil { if err != nil {
c.Err(fmt.Errorf("argument conversion error: %w", err)) c.Err(fmt.Errorf("%w: %v", ErrInvalidParameter, err))
return return
} }
@ -262,7 +268,7 @@ func handleXStack(c *ishell.Context) {
func handleLoadNEF(c *ishell.Context) { func handleLoadNEF(c *ishell.Context) {
v := getVMFromContext(c) v := getVMFromContext(c)
if len(c.Args) < 1 { if len(c.Args) < 1 {
c.Err(errors.New("missing parameter <file>")) c.Err(fmt.Errorf("%w: <file>", ErrMissingParameter))
return return
} }
if err := v.LoadFile(c.Args[0]); err != nil { if err := v.LoadFile(c.Args[0]); err != nil {
@ -276,12 +282,12 @@ func handleLoadNEF(c *ishell.Context) {
func handleLoadBase64(c *ishell.Context) { func handleLoadBase64(c *ishell.Context) {
v := getVMFromContext(c) v := getVMFromContext(c)
if len(c.Args) < 1 { if len(c.Args) < 1 {
c.Err(errors.New("missing parameter <string>")) c.Err(fmt.Errorf("%w: <string>", ErrMissingParameter))
return return
} }
b, err := base64.StdEncoding.DecodeString(c.Args[0]) b, err := base64.StdEncoding.DecodeString(c.Args[0])
if err != nil { if err != nil {
c.Err(err) c.Err(fmt.Errorf("%w: %v", ErrInvalidParameter, err))
return return
} }
v.Load(b) v.Load(b)
@ -292,12 +298,12 @@ func handleLoadBase64(c *ishell.Context) {
func handleLoadHex(c *ishell.Context) { func handleLoadHex(c *ishell.Context) {
v := getVMFromContext(c) v := getVMFromContext(c)
if len(c.Args) < 1 { if len(c.Args) < 1 {
c.Err(errors.New("missing parameter <string>")) c.Err(fmt.Errorf("%w: <string>", ErrMissingParameter))
return return
} }
b, err := hex.DecodeString(c.Args[0]) b, err := hex.DecodeString(c.Args[0])
if err != nil { if err != nil {
c.Err(err) c.Err(fmt.Errorf("%w: %v", ErrInvalidParameter, err))
return return
} }
v.Load(b) v.Load(b)
@ -308,7 +314,7 @@ func handleLoadHex(c *ishell.Context) {
func handleLoadGo(c *ishell.Context) { func handleLoadGo(c *ishell.Context) {
v := getVMFromContext(c) v := getVMFromContext(c)
if len(c.Args) < 1 { if len(c.Args) < 1 {
c.Err(errors.New("missing parameter <file>")) c.Err(fmt.Errorf("%w: <file>", ErrMissingParameter))
return return
} }
b, err := compiler.Compile(c.Args[0], nil) b, err := compiler.Compile(c.Args[0], nil)
@ -391,7 +397,7 @@ func handleStep(c *ishell.Context) {
if len(c.Args) > 0 { if len(c.Args) > 0 {
n, err = strconv.Atoi(c.Args[0]) n, err = strconv.Atoi(c.Args[0])
if err != nil { if err != nil {
c.Err(fmt.Errorf("argument conversion error: %w", err)) c.Err(fmt.Errorf("%w: %v", ErrInvalidParameter, err))
return return
} }
} }
@ -471,7 +477,7 @@ func handleParse(c *ishell.Context) {
// Parse converts it's argument to other formats. // Parse converts it's argument to other formats.
func Parse(args []string) (string, error) { func Parse(args []string) (string, error) {
if len(args) < 1 { if len(args) < 1 {
return "", errors.New("missing argument") return "", ErrMissingParameter
} }
arg := args[0] arg := args[0]
buf := bytes.NewBuffer(nil) buf := bytes.NewBuffer(nil)
@ -542,12 +548,12 @@ func parseArgs(args []string) ([]stackitem.Item, error) {
} else if value == boolTrue { } else if value == boolTrue {
items[i] = stackitem.NewBool(true) items[i] = stackitem.NewBool(true)
} else { } else {
return nil, errors.New("failed to parse bool parameter") return nil, fmt.Errorf("%w: invalid bool value", ErrInvalidParameter)
} }
case intType: case intType:
val, err := strconv.ParseInt(value, 10, 64) val, err := strconv.ParseInt(value, 10, 64)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("%w: invalid integer value", ErrInvalidParameter)
} }
items[i] = stackitem.NewBigInteger(big.NewInt(val)) items[i] = stackitem.NewBigInteger(big.NewInt(val))
case stringType: case stringType: