status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix SMOD according to Yellow Paper

This commit is contained in:
nicksavers 2014-10-10 13:56:03 +02:00
parent 0bb70d84a3
commit 7663a4b454
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethereumj-core/src/main/java/org/ethereum/vm/DataWord.java
View File

@ -235,7 +235,7 @@ public class DataWord implements Comparable<DataWord> {
return;
}
BigInteger result = sValue().mod(word.sValue());
BigInteger result = sValue().remainder(word.sValue());
this.data = ByteUtil.copyToArray(result.and(MAX_VALUE));
}

8
ethereumj-core/src/test/java/org/ethereum/vm/VMTest.java
View File

@ -3182,7 +3182,7 @@ public class VMTest {
Program program = new Program(Hex.decode("7F000000000000000000000000000000000000000000000000000000000000001E" + // 30
"7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF56" + // -170
"07"), new ProgramInvokeMockImpl());
String s_expected_1 = "000000000000000000000000000000000000000000000000000000000000000A";
String s_expected_1 = "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEC";
vm.step(program);
vm.step(program);
@ -3193,6 +3193,12 @@ public class VMTest {
assertEquals(s_expected_1, Hex.toHexString(item1.getData()).toUpperCase());
}
@Test
public void testSMOD_x() {
int x = -170 % 30;
System.out.println(x);
}
@Test(expected=StackTooSmallException.class) // SMOD OP mal
public void testSMOD_4() {
VM vm = new VM();