From 637c99eda7d006aa8ca70286d1c222cd9a58990b Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Mon, 30 Dec 2019 14:01:49 +0300 Subject: [PATCH] core: simplify newInteropContext --- pkg/core/blockchain.go | 12 ++++++++---- pkg/core/interop_neo_test.go | 15 +++++++-------- pkg/core/interops_test.go | 3 +-- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/pkg/core/blockchain.go b/pkg/core/blockchain.go index 4f8250aa7..69cb4f9b8 100644 --- a/pkg/core/blockchain.go +++ b/pkg/core/blockchain.go @@ -508,7 +508,7 @@ func (bc *Blockchain) storeBlock(block *Block) error { return err } case *transaction.InvocationTX: - systemInterop := newInteropContext(trigger.Application, bc, cache.store, block, tx, bc.log) + systemInterop := bc.newInteropContext(trigger.Application, cache.store, block, tx) v := bc.spawnVMWithInterops(systemInterop) v.SetCheckedHash(tx.VerificationHash().BytesBE()) v.LoadScript(t.Script) @@ -1373,7 +1373,7 @@ func (bc *Blockchain) spawnVMWithInterops(interopCtx *interopContext) *vm.VM { // GetTestVM returns a VM and a Store setup for a test run of some sort of code. func (bc *Blockchain) GetTestVM() (*vm.VM, storage.Store) { tmpStore := storage.NewMemCachedStore(bc.dao.store) - systemInterop := newInteropContext(trigger.Application, bc, tmpStore, nil, nil, bc.log) + systemInterop := bc.newInteropContext(trigger.Application, tmpStore, nil, nil) vm := bc.spawnVMWithInterops(systemInterop) return vm, tmpStore } @@ -1452,7 +1452,7 @@ func (bc *Blockchain) verifyTxWitnesses(t *transaction.Transaction, block *Block } sort.Slice(hashes, func(i, j int) bool { return hashes[i].Less(hashes[j]) }) sort.Slice(witnesses, func(i, j int) bool { return witnesses[i].ScriptHash().Less(witnesses[j].ScriptHash()) }) - interopCtx := newInteropContext(trigger.Verification, bc, bc.dao.store, block, t, bc.log) + interopCtx := bc.newInteropContext(trigger.Verification, bc.dao.store, block, t) for i := 0; i < len(hashes); i++ { err := bc.verifyHashAgainstScript(hashes[i], &witnesses[i], t.VerificationHash(), interopCtx, false) if err != nil { @@ -1472,7 +1472,7 @@ func (bc *Blockchain) verifyBlockWitnesses(block *Block, prevHeader *Header) err } else { hash = prevHeader.NextConsensus } - interopCtx := newInteropContext(trigger.Verification, bc, bc.dao.store, nil, nil, bc.log) + interopCtx := bc.newInteropContext(trigger.Verification, bc.dao.store, nil, nil) return bc.verifyHashAgainstScript(hash, &block.Script, block.VerificationHash(), interopCtx, true) } @@ -1486,3 +1486,7 @@ func hashAndIndexToBytes(h util.Uint256, index uint32) []byte { func (bc *Blockchain) secondsPerBlock() int { return bc.config.SecondsPerBlock } + +func (bc *Blockchain) newInteropContext(trigger byte, s storage.Store, block *Block, tx *transaction.Transaction) *interopContext { + return newInteropContext(trigger, bc, s, block, tx, bc.log) +} diff --git a/pkg/core/interop_neo_test.go b/pkg/core/interop_neo_test.go index 5793d0598..21a07769c 100644 --- a/pkg/core/interop_neo_test.go +++ b/pkg/core/interop_neo_test.go @@ -15,7 +15,6 @@ import ( "github.com/CityOfZion/neo-go/pkg/vm" "github.com/CityOfZion/neo-go/pkg/vm/opcode" "github.com/stretchr/testify/require" - "go.uber.org/zap/zaptest" ) /* Missing tests: @@ -113,7 +112,7 @@ func TestHeaderGetVersion(t *testing.T) { func TestHeaderGetVersion_Negative(t *testing.T) { v := vm.New() block := newDumbBlock() - context := newInteropContext(trigger.Application, newTestChain(t), storage.NewMemoryStore(), block, nil, zaptest.NewLogger(t)) + context := newTestChain(t).newInteropContext(trigger.Application, storage.NewMemoryStore(), block, nil) v.Estack().PushVal(vm.NewBoolItem(false)) err := context.headerGetVersion(v) @@ -198,7 +197,7 @@ func TestWitnessGetVerificationScript(t *testing.T) { script := []byte{byte(opcode.PUSHM1), byte(opcode.RET)} witness := transaction.Witness{InvocationScript: nil, VerificationScript: script} - context := newInteropContext(trigger.Application, newTestChain(t), storage.NewMemoryStore(), nil, nil, zaptest.NewLogger(t)) + context := newTestChain(t).newInteropContext(trigger.Application, storage.NewMemoryStore(), nil, nil) v.Estack().PushVal(vm.NewInteropItem(&witness)) err := context.witnessGetVerificationScript(v) require.NoError(t, err) @@ -419,7 +418,7 @@ func TestAssetGetPrecision(t *testing.T) { func createVMAndPushBlock(t *testing.T) (*vm.VM, *Block, *interopContext) { v := vm.New() block := newDumbBlock() - context := newInteropContext(trigger.Application, newTestChain(t), storage.NewMemoryStore(), block, nil, zaptest.NewLogger(t)) + context := newTestChain(t).newInteropContext(trigger.Application, storage.NewMemoryStore(), block, nil) v.Estack().PushVal(vm.NewInteropItem(block)) return v, block, context } @@ -448,7 +447,7 @@ func createVMAndAssetState(t *testing.T) (*vm.VM, *state.Asset, *interopContext) IsFrozen: false, } - context := newInteropContext(trigger.Application, newTestChain(t), storage.NewMemoryStore(), nil, nil, zaptest.NewLogger(t)) + context := newTestChain(t).newInteropContext(trigger.Application, storage.NewMemoryStore(), nil, nil) return v, assetState, context } @@ -466,7 +465,7 @@ func createVMAndContractState(t *testing.T) (*vm.VM, *state.Contract, *interopCo Description: random.String(10), } - context := newInteropContext(trigger.Application, newTestChain(t), storage.NewMemoryStore(), nil, nil, zaptest.NewLogger(t)) + context := newTestChain(t).newInteropContext(trigger.Application, storage.NewMemoryStore(), nil, nil) return v, contractState, context } @@ -480,7 +479,7 @@ func createVMAndAccState(t *testing.T) (*vm.VM, *state.Account, *interopContext) accountState.Votes = []*keys.PublicKey{key} require.NoError(t, err) - context := newInteropContext(trigger.Application, newTestChain(t), storage.NewMemoryStore(), nil, nil, zaptest.NewLogger(t)) + context := newTestChain(t).newInteropContext(trigger.Application, storage.NewMemoryStore(), nil, nil) return v, accountState, context } @@ -510,6 +509,6 @@ func createVMAndTX(t *testing.T) (*vm.VM, *transaction.Transaction, *interopCont tx.Attributes = attributes tx.Inputs = inputs tx.Outputs = outputs - context := newInteropContext(trigger.Application, newTestChain(t), storage.NewMemoryStore(), nil, tx, zaptest.NewLogger(t)) + context := newTestChain(t).newInteropContext(trigger.Application, storage.NewMemoryStore(), nil, tx) return v, tx, context } diff --git a/pkg/core/interops_test.go b/pkg/core/interops_test.go index e6376b3ab..8f9adc35a 100644 --- a/pkg/core/interops_test.go +++ b/pkg/core/interops_test.go @@ -9,13 +9,12 @@ import ( "github.com/CityOfZion/neo-go/pkg/smartcontract/trigger" "github.com/CityOfZion/neo-go/pkg/vm" "github.com/stretchr/testify/require" - "go.uber.org/zap/zaptest" ) func testNonInterop(t *testing.T, value interface{}, f func(*interopContext, *vm.VM) error) { v := vm.New() v.Estack().PushVal(value) - context := newInteropContext(trigger.Application, newTestChain(t), storage.NewMemoryStore(), nil, nil, zaptest.NewLogger(t)) + context := newTestChain(t).newInteropContext(trigger.Application, storage.NewMemoryStore(), nil, nil) require.Error(t, f(context, v)) }