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

Replace INVALID op codes with new codes in VMComplexTest

This commit is contained in:
nicksavers 2014-09-19 15:25:47 +02:00
parent 5428b47c8d
commit b09a73678e
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ethereumj-core/src/main/java/org/ethereum/vm/OpCode.java
View File

@ -351,7 +351,8 @@ public enum OpCode {
public static OpCode code(byte code) { public static OpCode code(byte code) {
OpCode op = intToTypeMap.get(code); OpCode op = intToTypeMap.get(code);
if (op == null) op = STOP; // invalid operation if (op == null)
op = STOP; // invalid operation
return op; return op;
} }
} }

24
ethereumj-core/src/test/java/org/ethereum/vm/VMComplexTest.java
View File

@ -125,7 +125,7 @@ public class VMComplexTest {
String contractB_addr = "83c5541a6c8d2dbad642f385d8d06ca9b6c731ee"; String contractB_addr = "83c5541a6c8d2dbad642f385d8d06ca9b6c731ee";
String code_a = "60006020023560005460016020023560205460005360005760205360015700"; String code_a = "60006020023560005460016020023560205460005360005760205360015700";
String code_b = "6000601f5560e05b60e05b54600060c05b015560605b6020015b51602001600b5254516040016016525451606001602152546080525460007377045e71a7a2c50903d88e564cd72fab11e820516103e8f1602060000260a00160200153600054"; String code_b = "6000601f5560e05b60e05b54600060c05b015560605b6020015b80602001600b9054806040016016905480606001602190546080905460007377045e71a7a2c50903d88e564cd72fab11e820516103e8f1602060000260a00160200153600054";
byte[] caller_addr_bytes = Hex.decode(callerAddr); byte[] caller_addr_bytes = Hex.decode(callerAddr);
@ -222,7 +222,7 @@ public class VMComplexTest {
String contractB_addr = "83c5541a6c8d2dbad642f385d8d06ca9b6c731ee"; String contractB_addr = "83c5541a6c8d2dbad642f385d8d06ca9b6c731ee";
String code_a = "600b60005460166020546021604054602c6060546037608054604260a05460c06000f2"; String code_a = "600b60005460166020546021604054602c6060546037608054604260a05460c06000f2";
String code_b = "6000601f5560e05b60e05b54600060c05b015560605b6020015b51602001600b5254516040016016525451606001602152546080525460007377045e71a7a2c50903d88e564cd72fab11e820516103e8f1602060000260a00160200153600054"; String code_b = "6000601f5560e05b60e05b54600060c05b015560605b6020015b80602001600b9054806040016016905480606001602190546080905460007377045e71a7a2c50903d88e564cd72fab11e820516103e8f1602060000260a00160200153600054";
byte[] caller_addr_bytes = Hex.decode(callerAddr); byte[] caller_addr_bytes = Hex.decode(callerAddr);
@ -351,7 +351,25 @@ public class VMComplexTest {
@Test // CALL contract with too much gas @Test // CALL contract with too much gas
@Ignore @Ignore
public void test5() { public void test5() {
// TODO: CALL contract with gas > gasRemaining && gas > Long.MAX_VALUE // TODO CALL contract with gas > gasRemaining && gas > Long.MAX_VALUE
}
@Test // CALLSTATELESS contract
@Ignore
public void test6() {
// TODO
}
@Test // POST contract
@Ignore
public void test7() {
// TODO
}
@Test // POST after tx runs out of gas
@Ignore
public void test8() {
// TODO
} }
} }