Merge pull request #773 from nspcc-dev/fix/bigint

vm: use truncated division for Integers
This commit is contained in:
Roman Khimov 2020-03-23 18:01:21 +03:00 committed by GitHub
commit 5148b98f43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions

View file

@ -776,7 +776,7 @@ func (v *VM) execute(ctx *Context, op opcode.Opcode, parameter []byte) (err erro
a := v.estack.Pop().BigInt() a := v.estack.Pop().BigInt()
v.checkBigIntSize(a) v.checkBigIntSize(a)
v.estack.PushVal(new(big.Int).Div(a, b)) v.estack.PushVal(new(big.Int).Quo(a, b))
case opcode.MUL: case opcode.MUL:
a := v.estack.Pop().BigInt() a := v.estack.Pop().BigInt()

View file

@ -832,11 +832,21 @@ func TestMULBigResult(t *testing.T) {
func TestDiv(t *testing.T) { func TestDiv(t *testing.T) {
prog := makeProgram(opcode.DIV) prog := makeProgram(opcode.DIV)
runCase := func(p, q, result int64) func(t *testing.T) {
return func(t *testing.T) {
vm := load(prog) vm := load(prog)
vm.estack.PushVal(4) vm.estack.PushVal(p)
vm.estack.PushVal(2) vm.estack.PushVal(q)
runVM(t, vm) runVM(t, vm)
assert.Equal(t, int64(2), vm.estack.Pop().BigInt().Int64()) assert.Equal(t, result, vm.estack.Pop().BigInt().Int64())
}
}
t.Run("positive/positive", runCase(5, 2, 2))
t.Run("positive/negative", runCase(5, -2, -2))
t.Run("negative/positive", runCase(-5, 2, -2))
t.Run("negative/negative", runCase(-5, -2, 2))
} }
func TestSub(t *testing.T) { func TestSub(t *testing.T) {