From 227c6a2caa2d0b0b0cb9c35eeac47bc6d22ce401 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Tue, 4 Aug 2020 09:40:06 +0300 Subject: [PATCH 1/2] cli: allow to use `vm parse` directly --- cli/main.go | 2 ++ cli/util/convert.go | 37 +++++++++++++++++++++++++++++++++++++ pkg/vm/cli/cli.go | 23 +++++++++++++++-------- 3 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 cli/util/convert.go diff --git a/cli/main.go b/cli/main.go index c9f919a58..b3494b675 100644 --- a/cli/main.go +++ b/cli/main.go @@ -5,6 +5,7 @@ import ( "github.com/nspcc-dev/neo-go/cli/server" "github.com/nspcc-dev/neo-go/cli/smartcontract" + "github.com/nspcc-dev/neo-go/cli/util" "github.com/nspcc-dev/neo-go/cli/vm" "github.com/nspcc-dev/neo-go/cli/wallet" "github.com/nspcc-dev/neo-go/pkg/config" @@ -21,6 +22,7 @@ func main() { ctl.Commands = append(ctl.Commands, smartcontract.NewCommands()...) ctl.Commands = append(ctl.Commands, wallet.NewCommands()...) ctl.Commands = append(ctl.Commands, vm.NewCommands()...) + ctl.Commands = append(ctl.Commands, util.NewCommands()...) if err := ctl.Run(os.Args); err != nil { panic(err) diff --git a/cli/util/convert.go b/cli/util/convert.go new file mode 100644 index 000000000..155850a7f --- /dev/null +++ b/cli/util/convert.go @@ -0,0 +1,37 @@ +package util + +import ( + "fmt" + + vmcli "github.com/nspcc-dev/neo-go/pkg/vm/cli" + "github.com/urfave/cli" +) + +func NewCommands() []cli.Command { + return []cli.Command{ + { + Name: "util", + Usage: "Various helper commands", + Subcommands: []cli.Command{ + { + Name: "convert", + Usage: "Convert provided argument into other possible formats", + UsageText: `convert + + is an argument which is tried to be interpreted as an item of different types + and converted to other formats. Strings are escaped and output in quotes.`, + Action: handleParse, + }, + }, + }, + } +} + +func handleParse(ctx *cli.Context) error { + res, err := vmcli.Parse(ctx.Args()) + if err != nil { + return cli.NewExitError(err, 1) + } + fmt.Print(res) + return nil +} diff --git a/pkg/vm/cli/cli.go b/pkg/vm/cli/cli.go index b8830b021..d07eddd4e 100644 --- a/pkg/vm/cli/cli.go +++ b/pkg/vm/cli/cli.go @@ -454,11 +454,20 @@ func (c *VMCLI) Run() error { } func handleParse(c *ishell.Context) { - if len(c.Args) < 1 { - c.Err(errors.New("missing argument")) + res, err := Parse(c.Args) + if err != nil { + c.Err(err) return } - arg := c.Args[0] + c.Print(res) +} + +// Parse converts it's argument to other formats. +func Parse(args []string) (string, error) { + if len(args) < 1 { + return "", errors.New("missing argument") + } + arg := args[0] buf := bytes.NewBuffer(nil) if val, err := strconv.ParseInt(arg, 10, 64); err == nil { bs := bigint.ToBytes(big.NewInt(val)) @@ -493,14 +502,12 @@ func handleParse(c *ishell.Context) { buf = bytes.NewBuffer(nil) w := tabwriter.NewWriter(buf, 0, 0, 4, ' ', 0) if _, err := w.Write(out); err != nil { - c.Err(err) - return + return "", err } if err := w.Flush(); err != nil { - c.Err(err) - return + return "", err } - c.Print(string(buf.Bytes())) + return string(buf.Bytes()), nil } func parseArgs(args []string) ([]stackitem.Item, error) { From 7e3813a88ff3fc1c9dae24274ec40ba9f511be7c Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Tue, 4 Aug 2020 09:40:27 +0300 Subject: [PATCH 2/2] cli: use TAB as delimiter in `vm parse` Make it simpler to use result in pipes: neo-go vm parse 123 | rg "Integer to Hex" | cut -f1- | sed -r 's/\t//g' --- pkg/vm/cli/cli.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/vm/cli/cli.go b/pkg/vm/cli/cli.go index d07eddd4e..1ec35e2e0 100644 --- a/pkg/vm/cli/cli.go +++ b/pkg/vm/cli/cli.go @@ -500,7 +500,7 @@ func Parse(args []string) (string, error) { out := buf.Bytes() buf = bytes.NewBuffer(nil) - w := tabwriter.NewWriter(buf, 0, 0, 4, ' ', 0) + w := tabwriter.NewWriter(buf, 0, 4, 4, '\t', 0) if _, err := w.Write(out); err != nil { return "", err }