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

remove serpent compiler from full JSON_RPC version

This commit is contained in:
Yaroslav Dmytrotsa 2015-07-03 10:46:38 +03:00
parent ef546b4557
commit 8199b8a2df
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ethereumj-core-android/src/main/java/org/ethereum/android/jsonrpc/full/method/eth_compileSerpent.java
View File

@ -13,7 +13,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
/* /*
TODO: Serpent will be depricated in future. TODO: -core not have serpent compiler
*/ */
public class eth_compileSerpent extends JsonRpcServerMethod { public class eth_compileSerpent extends JsonRpcServerMethod {
@ -28,26 +28,8 @@ public class eth_compileSerpent extends JsonRpcServerMethod {
return new JSONRPC2Response(JSONRPC2Error.INVALID_PARAMS, req.getID()); return new JSONRPC2Response(JSONRPC2Error.INVALID_PARAMS, req.getID());
} else { } else {
String code = (String)params.get(0); String code = (String)params.get(0);
String asmResult = "";
byte[] machineCode = null;
try { return new JSONRPC2Response(JSONRPC2Error.METHOD_NOT_FOUND, req.getID());
Pattern pattern = Pattern.compile("(.*?)init:(.*?)code:(.*?)", Pattern.DOTALL);
Matcher matcher = pattern.matcher(code);
if (matcher.find()) {
//asmResult = SerpentCompiler.compileFullNotion(code);
//machineCode = SerpentCompiler.compileFullNotionAssemblyToMachine(asmResult);
} else {
//asmResult = SerpentCompiler.compile(code);
//machineCode = SerpentCompiler.compileAssemblyToMachine(asmResult);
//machineCode = SerpentCompiler.encodeMachineCodeForVMRun(machineCode, null);
}
} catch (Throwable th) {
return new JSONRPC2Response(JSONRPC2Error.INTERNAL_ERROR, req.getID());
}
return new JSONRPC2Response("0x" + Hex.toHexString(machineCode), req.getID());
} }
} }

3
ethereumj-core-android/src/main/java/org/ethereum/android/jsonrpc/full/method/eth_getCompilers.java
View File

@ -15,9 +15,8 @@ public class eth_getCompilers extends JsonRpcServerMethod {
protected JSONRPC2Response worker(JSONRPC2Request req, MessageContext ctx) { protected JSONRPC2Response worker(JSONRPC2Request req, MessageContext ctx) {
ArrayList<String> tmp = new ArrayList<String>(); ArrayList<String> tmp = new ArrayList<String>();
tmp.add("serpent");
/* /*
TODO: add lll and solidity when we find good libs for them. They not planned to be implemented in -core. TODO: add lll and solidity and serpent when we find good libs for them. They not planned to be implemented in -core.
*/ */
JSONRPC2Response res = new JSONRPC2Response(tmp, req.getID()); JSONRPC2Response res = new JSONRPC2Response(tmp, req.getID());
return res; return res;