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

cli: simplify VM preparation for VM CLI

Browse source 
Load script from provided transaction if so.
This commit is contained in:
Anna Shaleva 2022-10-12 10:19:47 +03:00
parent 7db9258104
commit 811e09675f
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cli/vm/cli.go
View file

@ -650,7 +650,6 @@ func handleLoadNEF(c *cli.Context) error {
return err return err
} }
v := getVMFromContext(c.App) v := getVMFromContext(c.App)
v.LoadWithFlags(nef.Script, callflag.All)
fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr()) fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr())
setManifestInContext(c.App, m) setManifestInContext(c.App, m)
changePrompt(c.App) changePrompt(c.App)
@ -678,7 +677,6 @@ func handleLoadBase64(c *cli.Context) error {
return err return err
} }
v := getVMFromContext(c.App) v := getVMFromContext(c.App)
v.LoadWithFlags(b, callflag.All)
fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr()) fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr())
changePrompt(c.App) changePrompt(c.App)
return nil return nil
@ -713,7 +711,6 @@ func handleLoadHex(c *cli.Context) error {
return err return err
} }
v := getVMFromContext(c.App) v := getVMFromContext(c.App)
v.LoadWithFlags(b, callflag.All)
fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr()) fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr())
changePrompt(c.App) changePrompt(c.App)
return nil return nil
@ -750,7 +747,6 @@ func handleLoadGo(c *cli.Context) error {
} }
v := getVMFromContext(c.App) v := getVMFromContext(c.App)
setManifestInContext(c.App, m) setManifestInContext(c.App, m)
v.LoadWithFlags(b.Script, callflag.All)
fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr()) fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr())
changePrompt(c.App) changePrompt(c.App)
return nil return nil
@ -789,8 +785,6 @@ func handleLoadTx(c *cli.Context) error {
return err return err
} }
v := getVMFromContext(c.App) v := getVMFromContext(c.App)
v.LoadWithFlags(tx.Script, callflag.All)
fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr()) fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr())
changePrompt(c.App) changePrompt(c.App)
return nil return nil
@ -834,9 +828,10 @@ func handleLoadDeployed(c *cli.Context) error {
if err != nil { if err != nil {
return err return err
} }
v := getVMFromContext(c.App) ic = getInteropContextFromContext(c.App) // fetch newly-created IC.
v.LoadScriptWithHash(cs.NEF.Script, h, callflag.All) ic.ReuseVM(ic.VM) // clear previously loaded program and context.
fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr()) ic.VM.LoadScriptWithHash(cs.NEF.Script, cs.Hash, callflag.All)
fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", ic.VM.Context().LenInstr())
setManifestInContext(c.App, &cs.Manifest) setManifestInContext(c.App, &cs.Manifest)
changePrompt(c.App) changePrompt(c.App)
return nil return nil
@ -858,7 +853,8 @@ func finalizeInteropContext(app *cli.App) {
} }
// resetInteropContext calls finalizer for current interop context and replaces // resetInteropContext calls finalizer for current interop context and replaces
// it with the newly created one. // it with the newly created one. If transaction is provided, then its script is
// loaded into bound VM.
func resetInteropContext(app *cli.App, tx *transaction.Transaction, height ...uint32) error { func resetInteropContext(app *cli.App, tx *transaction.Transaction, height ...uint32) error {
finalizeInteropContext(app) finalizeInteropContext(app)
bc := getChainFromContext(app) bc := getChainFromContext(app)
@ -883,6 +879,9 @@ func resetInteropContext(app *cli.App, tx *transaction.Transaction, height ...ui
return fmt.Errorf("failed to create VM: %w", err) return fmt.Errorf("failed to create VM: %w", err)
} }
} }
if tx != nil {
newIc.VM.LoadWithFlags(tx.Script, callflag.All)
}
setInteropContextInContext(app, newIc) setInteropContextInContext(app, newIc)
return nil return nil