Skip to content

Commit

Permalink
Merge f6227bd into 433ae2f
Browse files Browse the repository at this point in the history
  • Loading branch information
@eugene-shevchenko
eugene-shevchenko committed Aug 10, 2018
2 parents 433ae2f + f6227bd commit fb5bd8c
Show file tree
Hide file tree
Showing 24 changed files with 56 additions and 60 deletions.
5 changes: 0 additions & 5 deletions ethereumj-core/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,18 +135,13 @@ dependencies {
compile "com.google.guava:guava:24.1-jre"

compile "com.cedarsoftware:java-util:1.8.0" // for deep equals
compile "org.javassist:javassist:3.15.0-GA"
compile "org.slf4j:slf4j-api:${slf4jVersion}"
compile "ch.qos.logback:logback-classic:1.1.7"
compile "org.codehaus.jackson:jackson-mapper-asl:1.9.13"
compile "com.google.code.findbugs:jsr305:3.0.0"
compile "com.fasterxml.jackson.core:jackson-databind:2.5.1"
compile "org.apache.commons:commons-collections4:4.0"
compile "org.apache.commons:commons-lang3:3.4"
compile "commons-codec:commons-codec:1.10"
compile "org.springframework:spring-context:${springVersion}"
compile "org.springframework:spring-tx:${springVersion}"
compile "org.springframework:spring-orm:${springVersion}"
compile "com.typesafe:config:1.2.1"
compile "com.googlecode.concurrent-locks:concurrent-locks:1.0.0"

Expand Down
4 changes: 1 addition & 3 deletions ethereumj-core/src/main/java/org/ethereum/config/CommonConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package org.ethereum.config;

import org.ethereum.core.*;
import org.ethereum.core.Repository;
import org.ethereum.crypto.HashUtil;
import org.ethereum.datasource.*;
import org.ethereum.datasource.inmem.HashMapDB;
Expand All @@ -35,7 +35,6 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.annotation.*;
import org.springframework.transaction.annotation.EnableTransactionManagement;

import java.util.ArrayList;
import java.util.HashSet;
Expand All @@ -45,7 +44,6 @@
import static java.util.Arrays.asList;

@Configuration
@EnableTransactionManagement
@ComponentScan(
basePackages = "org.ethereum",
excludeFilters = @ComponentScan.Filter(NoAutoscan.class))
Expand Down
6 changes: 2 additions & 4 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/GitHubJSONTestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
package org.ethereum.jsontestsuite;

import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.JavaType;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.ethereum.config.BlockchainNetConfig;
import org.ethereum.config.SystemProperties;
import org.ethereum.config.blockchain.*;
Expand All @@ -30,10 +30,8 @@
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;

import org.junit.Assert;
import org.junit.Assume;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
9 changes: 6 additions & 3 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/GitHubRLPTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@
*/
package org.ethereum.jsontestsuite;

import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.JavaType;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.ethereum.jsontestsuite.suite.JSONReader;
import org.ethereum.jsontestsuite.suite.RLPTestCase;
import org.json.simple.parser.ParseException;
import org.junit.*;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runners.MethodSorters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
2 changes: 1 addition & 1 deletion ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/ABITestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.annotate.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.ethereum.core.CallTransaction;
import org.spongycastle.util.encoders.Hex;

Expand Down
4 changes: 2 additions & 2 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/ABITestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.JavaType;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;

import java.io.IOException;
import java.util.*;
Expand Down
2 changes: 1 addition & 1 deletion ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/BlockTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.ethereum.config.BlockchainNetConfig;
import org.ethereum.jsontestsuite.GitHubJSONTestSuite;
import org.ethereum.jsontestsuite.suite.model.AccountTck;
Expand Down
4 changes: 2 additions & 2 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/BlockTestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.JavaType;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.ethereum.jsontestsuite.GitHubJSONTestSuite;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
3 changes: 1 addition & 2 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/DifficultyTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.annotate.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.ethereum.core.BlockHeader;
import org.spongycastle.util.encoders.Hex;

import java.math.BigInteger;

Expand Down
4 changes: 2 additions & 2 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/DifficultyTestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.JavaType;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;

import java.io.IOException;
import java.util.*;
Expand Down
4 changes: 2 additions & 2 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/EthashTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.ethereum.core.BlockHeader;
import org.ethereum.util.RLP;
import org.ethereum.util.RLPList;
Expand Down
9 changes: 6 additions & 3 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/EthashTestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.JavaType;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;

import java.io.IOException;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
* @author Mikhail Kalinin
Expand Down
10 changes: 3 additions & 7 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/Logs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,16 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.map.DeserializationContext;
import org.codehaus.jackson.map.JsonDeserializer;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import org.ethereum.crypto.HashUtil;
import org.ethereum.util.ByteUtil;
import org.ethereum.util.FastByteComparisons;
import org.ethereum.util.RLP;
import org.ethereum.vm.DataWord;
import org.ethereum.vm.LogInfo;

import org.json.simple.JSONArray;
import org.json.simple.JSONObject;

import org.spongycastle.util.encoders.Hex;

import java.io.IOException;
Expand Down
4 changes: 2 additions & 2 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.map.annotate.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.ethereum.config.BlockchainNetConfig;
import org.ethereum.jsontestsuite.GitHubJSONTestSuite;
import org.ethereum.jsontestsuite.suite.model.TransactionTck;
import org.ethereum.jsontestsuite.suite.model.AccountTck;
import org.ethereum.jsontestsuite.suite.model.EnvTck;
import org.ethereum.jsontestsuite.suite.model.TransactionTck;

import java.util.Map;

Expand Down
4 changes: 2 additions & 2 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.JavaType;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.ethereum.jsontestsuite.GitHubJSONTestSuite;

import java.io.IOException;
Expand Down
14 changes: 10 additions & 4 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestDataEntry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,17 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.ethereum.jsontestsuite.GitHubJSONTestSuite;
import org.ethereum.jsontestsuite.suite.model.*;

import java.util.*;
import org.ethereum.jsontestsuite.suite.model.AccountTck;
import org.ethereum.jsontestsuite.suite.model.EnvTck;
import org.ethereum.jsontestsuite.suite.model.PostDataTck;
import org.ethereum.jsontestsuite.suite.model.TransactionDataTck;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;

/**
* @author Mikhail Kalinin
Expand Down
4 changes: 2 additions & 2 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/StateTestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.JavaType;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TransactionTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.ethereum.jsontestsuite.suite.model.TransactionTck;

@JsonIgnoreProperties(ignoreUnknown = true)
Expand Down
4 changes: 2 additions & 2 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TransactionTestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.JavaType;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
4 changes: 2 additions & 2 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TrieTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.ethereum.datasource.NoDeleteSource;
import org.ethereum.datasource.inmem.HashMapDB;
import org.ethereum.trie.SecureTrie;
Expand Down
4 changes: 2 additions & 2 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/TrieTestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
package org.ethereum.jsontestsuite.suite;

import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.JavaType;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;

import java.io.IOException;
import java.util.*;
Expand Down
2 changes: 1 addition & 1 deletion ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/model/BlockTck.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.ethereum.jsontestsuite.suite.model;


import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import java.util.List;

Expand Down
6 changes: 2 additions & 4 deletions ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/model/PostDataTck.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@
*/
package org.ethereum.jsontestsuite.suite.model;

import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonDeserialize;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.ethereum.jsontestsuite.suite.Logs;

import java.util.List;

/**
* @author Mikhail Kalinin
* @since 09.08.2017
Expand Down
2 changes: 1 addition & 1 deletion ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/model/TransactionDataTck.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package org.ethereum.jsontestsuite.suite.model;

import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import java.util.List;

Expand Down

0 comments on commit fb5bd8c

Please sign in to comment.