diff --git a/app/build.gradle b/app/build.gradle index 14e1efaa..25437b79 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,6 +67,7 @@ dependencies { provided 'org.glassfish:javax.annotation:10.0-b28' compile project(':ethereumj-core') compile fileTree(include: ['*.jar'], dir: '../libraries') + compile 'com.j256.ormlite:ormlite-android:4.48' compile 'com.android.support:support-v4:22.1.1' compile 'com.android.support:appcompat-v7:22.1.1' compile 'com.android.support:recyclerview-v7:22.1.1' diff --git a/ethereumj-core/build.gradle b/ethereumj-core/build.gradle index 6170fb04..ae5d1f17 100644 --- a/ethereumj-core/build.gradle +++ b/ethereumj-core/build.gradle @@ -90,10 +90,6 @@ dependencies { compile 'com.google.dagger:dagger:2.0' compile fileTree(include: ['*.jar'], dir: 'libs') provided 'javax.annotation:javax.annotation-api:1.2' - compile 'com.j256.ormlite:ormlite-core:4.48' - compile('com.j256.ormlite:ormlite-android:4.48') { - exclude group: 'commons-logging', module: 'commons-logging' - } compile('io.netty:netty-all:4.0.28.Final') { exclude group: 'commons-logging', module: 'commons-logging' @@ -127,7 +123,6 @@ dependencies { compile 'org.hsqldb:hsqldb:1.8.0.10' // best performance - do not upgrade! compile 'javax.persistence:persistence-api:1.0.2' - compile 'com.j256.ormlite:ormlite-android:4.48' compile('redis.clients:jedis:2.6.0') { exclude group: 'org.apache.commons', module: 'commons-pool2' diff --git a/ethereumj-core/src/main/java/org/ethereum/di/modules/EthereumModule.java b/ethereumj-core/src/main/java/org/ethereum/di/modules/EthereumModule.java index b32dd57d..1239b070 100644 --- a/ethereumj-core/src/main/java/org/ethereum/di/modules/EthereumModule.java +++ b/ethereumj-core/src/main/java/org/ethereum/di/modules/EthereumModule.java @@ -1,7 +1,5 @@ package org.ethereum.di.modules; -import android.content.Context; - import org.ethereum.config.SystemProperties; import org.ethereum.core.BlockchainImpl; import org.ethereum.core.Wallet; diff --git a/ethereumj-core/src/main/java/org/ethereum/net/p2p/P2pHandler.java b/ethereumj-core/src/main/java/org/ethereum/net/p2p/P2pHandler.java index 81b406ce..6fc35bd3 100644 --- a/ethereumj-core/src/main/java/org/ethereum/net/p2p/P2pHandler.java +++ b/ethereumj-core/src/main/java/org/ethereum/net/p2p/P2pHandler.java @@ -1,10 +1,8 @@ package org.ethereum.net.p2p; -import io.netty.buffer.ByteBuf; import org.ethereum.core.Block; import org.ethereum.core.Transaction; import org.ethereum.listener.EthereumListener; -import org.ethereum.manager.WorldManager; import org.ethereum.net.MessageQueue; import org.ethereum.net.client.Capability; import org.ethereum.net.eth.EthHandler; @@ -15,7 +13,6 @@ import org.ethereum.net.message.ReasonCode; import org.ethereum.net.message.StaticMessages; import org.ethereum.net.peerdiscovery.PeerDiscovery; import org.ethereum.net.peerdiscovery.PeerInfo; -import org.ethereum.net.rlpx.FrameCodec; import org.ethereum.net.server.Channel; import org.ethereum.net.shh.ShhHandler; import org.ethereum.net.shh.ShhMessageCodes; @@ -26,12 +23,6 @@ import io.netty.channel.SimpleChannelInboundHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spongycastle.util.encoders.Hex; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.context.annotation.Scope; -//import org.springframework.stereotype.Component; - -import java.io.IOException; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -60,8 +51,6 @@ import static org.ethereum.net.message.StaticMessages.*; *