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

core: refactor System.Storage.Get[ReadOnly]Context interops

Browse source 
Part of #1055.

Split methods, as they have a lot of common code. This also fixex nil
error of storageGetReadOnlyContext in case when contract does not have
storage.
This commit is contained in:
Anna Shaleva 2020-07-22 10:46:28 +03:00
parent d6342ab68c
commit b5185d5d1a
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkg/core/interop_system.go
View file

@ -333,6 +333,17 @@ func storageGet(ic *interop.Context, v *vm.VM) error {
// storageGetContext returns storage context (scripthash). // storageGetContext returns storage context (scripthash).
func storageGetContext(ic *interop.Context, v *vm.VM) error { func storageGetContext(ic *interop.Context, v *vm.VM) error {
return storageGetContextInternal(ic, v, false)
}
// storageGetReadOnlyContext returns read-only context (scripthash).
func storageGetReadOnlyContext(ic *interop.Context, v *vm.VM) error {
return storageGetContextInternal(ic, v, true)
}
// storageGetContextInternal is internal version of storageGetContext and
// storageGetReadOnlyContext which allows to specify ReadOnly context flag.
func storageGetContextInternal(ic *interop.Context, v *vm.VM, isReadOnly bool) error {
contract, err := ic.DAO.GetContractState(v.GetCurrentScriptHash()) contract, err := ic.DAO.GetContractState(v.GetCurrentScriptHash())
if err != nil { if err != nil {
return err return err
@ -342,24 +353,7 @@ func storageGetContext(ic *interop.Context, v *vm.VM) error {
} }
sc := &StorageContext{ sc := &StorageContext{
ID: contract.ID, ID: contract.ID,
ReadOnly: false, ReadOnly: isReadOnly,
}
v.Estack().PushVal(stackitem.NewInterop(sc))
return nil
}
// storageGetReadOnlyContext returns read-only context (scripthash).
func storageGetReadOnlyContext(ic *interop.Context, v *vm.VM) error {
contract, err := ic.DAO.GetContractState(v.GetCurrentScriptHash())
if err != nil {
return err
}
if !contract.HasStorage() {
return err
}
sc := &StorageContext{
ID: contract.ID,
ReadOnly: true,
} }
v.Estack().PushVal(stackitem.NewInterop(sc)) v.Estack().PushVal(stackitem.NewInterop(sc))
return nil return nil