From a976c4d04ff667f921d61edda61460684ff6650e Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Mon, 12 Aug 2019 16:29:24 +0300 Subject: [PATCH] pkg/vm: go fmt Some errors were introduced by github merges. --- pkg/vm/vm_ops.go | 2 +- pkg/vm/vm_ops_stackmani.go | 2 +- pkg/vm/vm_ops_stackmani_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/vm/vm_ops.go b/pkg/vm/vm_ops.go index 0800058fe..d26ea5af4 100644 --- a/pkg/vm/vm_ops.go +++ b/pkg/vm/vm_ops.go @@ -36,7 +36,7 @@ var opFunc = map[stack.Instruction]stackInfo{ stack.MIN: Min, stack.MAX: Max, stack.WITHIN: Within, - stack.NUMEQUAL: NumEqual, + stack.NUMEQUAL: NumEqual, stack.NUMNOTEQUAL: NumNotEqual, stack.BOOLAND: BoolAnd, stack.BOOLOR: BoolOr, diff --git a/pkg/vm/vm_ops_stackmani.go b/pkg/vm/vm_ops_stackmani.go index 1b1670a1c..ebeaafca0 100644 --- a/pkg/vm/vm_ops_stackmani.go +++ b/pkg/vm/vm_ops_stackmani.go @@ -226,7 +226,7 @@ func DEPTH(op stack.Instruction, ctx *stack.Context, istack *stack.Invocation, r return FAULT, err } - ctx.Estack.Push(length) + ctx.Estack.Push(length) return NONE, nil } diff --git a/pkg/vm/vm_ops_stackmani_test.go b/pkg/vm/vm_ops_stackmani_test.go index 669ede0d2..12e2e176e 100644 --- a/pkg/vm/vm_ops_stackmani_test.go +++ b/pkg/vm/vm_ops_stackmani_test.go @@ -302,7 +302,7 @@ func TestPickOp(t *testing.T) { itemB, err := ctx.Estack.PopInt() assert.Nil(t, err) - itemA2, err := ctx.Estack.PopInt() + itemA2, err := ctx.Estack.PopInt() assert.Nil(t, err) assert.Equal(t, int64(3), itemA.Value().Int64())