From 121065fa4de4a5675cf03b16f596871e4f36b856 Mon Sep 17 00:00:00 2001 From: Roman Mandeleil Date: Tue, 20 Jan 2015 16:54:40 +0200 Subject: [PATCH] Revert "Correct stSystemOperationsTest run with programCode.length protection" --- ethereumj-core/src/main/java/org/ethereum/vm/Program.java | 5 ----- .../java/test/ethereum/jsontestsuite/GitHubStateTest.java | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ethereumj-core/src/main/java/org/ethereum/vm/Program.java b/ethereumj-core/src/main/java/org/ethereum/vm/Program.java index 84a6aa8e..1b23a284 100644 --- a/ethereumj-core/src/main/java/org/ethereum/vm/Program.java +++ b/ethereumj-core/src/main/java/org/ethereum/vm/Program.java @@ -389,11 +389,6 @@ public class Program { return; } - if (programCode.length == 0) { - result = new ProgramResult(); - result.setHReturn(new byte[] {}); - } - // 4. CREATE THE CONTRACT OUT OF RETURN byte[] code = result.getHReturn().array(); diff --git a/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubStateTest.java b/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubStateTest.java index 78069f83..958b1c84 100644 --- a/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubStateTest.java +++ b/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubStateTest.java @@ -104,6 +104,10 @@ public class GitHubStateTest { public void stSystemOperationsTest() throws ParseException { Set excluded = new HashSet<>(); + excluded.add("createNameRegistratorZeroMem2"); + excluded.add("createNameRegistratorZeroMem"); + excluded.add("createNameRegistratorZeroMemExpansion"); + String json = JSONReader.loadJSON("StateTests/stSystemOperationsTest.json"); GitHubJSONTestSuite.runGitHubJsonStateTest(json, excluded);