More cleaning

This commit is contained in:
Adrian Tiberius 2015-05-27 21:53:43 +02:00
parent 779eddd9f9
commit 80bdbf0f66
5 changed files with 1 additions and 25 deletions

View File

@ -67,6 +67,7 @@ dependencies {
provided 'org.glassfish:javax.annotation:10.0-b28' provided 'org.glassfish:javax.annotation:10.0-b28'
compile project(':ethereumj-core') compile project(':ethereumj-core')
compile fileTree(include: ['*.jar'], dir: '../libraries') 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:support-v4:22.1.1'
compile 'com.android.support:appcompat-v7:22.1.1' compile 'com.android.support:appcompat-v7:22.1.1'
compile 'com.android.support:recyclerview-v7:22.1.1' compile 'com.android.support:recyclerview-v7:22.1.1'

View File

@ -90,10 +90,6 @@ dependencies {
compile 'com.google.dagger:dagger:2.0' compile 'com.google.dagger:dagger:2.0'
compile fileTree(include: ['*.jar'], dir: 'libs') compile fileTree(include: ['*.jar'], dir: 'libs')
provided 'javax.annotation:javax.annotation-api:1.2' 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') { compile('io.netty:netty-all:4.0.28.Final') {
exclude group: 'commons-logging', module: 'commons-logging' 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 'org.hsqldb:hsqldb:1.8.0.10' // best performance - do not upgrade!
compile 'javax.persistence:persistence-api:1.0.2' compile 'javax.persistence:persistence-api:1.0.2'
compile 'com.j256.ormlite:ormlite-android:4.48'
compile('redis.clients:jedis:2.6.0') { compile('redis.clients:jedis:2.6.0') {
exclude group: 'org.apache.commons', module: 'commons-pool2' exclude group: 'org.apache.commons', module: 'commons-pool2'

View File

@ -1,7 +1,5 @@
package org.ethereum.di.modules; package org.ethereum.di.modules;
import android.content.Context;
import org.ethereum.config.SystemProperties; import org.ethereum.config.SystemProperties;
import org.ethereum.core.BlockchainImpl; import org.ethereum.core.BlockchainImpl;
import org.ethereum.core.Wallet; import org.ethereum.core.Wallet;

View File

@ -1,10 +1,8 @@
package org.ethereum.net.p2p; package org.ethereum.net.p2p;
import io.netty.buffer.ByteBuf;
import org.ethereum.core.Block; import org.ethereum.core.Block;
import org.ethereum.core.Transaction; import org.ethereum.core.Transaction;
import org.ethereum.listener.EthereumListener; import org.ethereum.listener.EthereumListener;
import org.ethereum.manager.WorldManager;
import org.ethereum.net.MessageQueue; import org.ethereum.net.MessageQueue;
import org.ethereum.net.client.Capability; import org.ethereum.net.client.Capability;
import org.ethereum.net.eth.EthHandler; 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.message.StaticMessages;
import org.ethereum.net.peerdiscovery.PeerDiscovery; import org.ethereum.net.peerdiscovery.PeerDiscovery;
import org.ethereum.net.peerdiscovery.PeerInfo; import org.ethereum.net.peerdiscovery.PeerInfo;
import org.ethereum.net.rlpx.FrameCodec;
import org.ethereum.net.server.Channel; import org.ethereum.net.server.Channel;
import org.ethereum.net.shh.ShhHandler; import org.ethereum.net.shh.ShhHandler;
import org.ethereum.net.shh.ShhMessageCodes; import org.ethereum.net.shh.ShhMessageCodes;
@ -26,12 +23,6 @@ import io.netty.channel.SimpleChannelInboundHandler;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; 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.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
@ -60,8 +51,6 @@ import static org.ethereum.net.message.StaticMessages.*;
* <li>PONG : Confirm that they themselves are still alive</li> * <li>PONG : Confirm that they themselves are still alive</li>
* </ul> * </ul>
*/ */
//@Component
//@Scope("prototype")
public class P2pHandler extends SimpleChannelInboundHandler<P2pMessage> { public class P2pHandler extends SimpleChannelInboundHandler<P2pMessage> {
public final static byte VERSION = 4; public final static byte VERSION = 4;

View File

@ -1,7 +1,6 @@
package org.ethereum.net.shh; package org.ethereum.net.shh;
import org.ethereum.listener.EthereumListener; import org.ethereum.listener.EthereumListener;
import org.ethereum.manager.WorldManager;
import org.ethereum.net.MessageQueue; import org.ethereum.net.MessageQueue;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
@ -12,17 +11,11 @@ import org.slf4j.LoggerFactory;
import javax.inject.Inject; import javax.inject.Inject;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.context.annotation.Scope;
//import org.springframework.stereotype.Component;
/** /**
* Process the messages between peers with 'shh' capability on the network. * Process the messages between peers with 'shh' capability on the network.
* *
* Peers with 'shh' capability can send/receive: * Peers with 'shh' capability can send/receive:
*/ */
//@Component
//@Scope("prototype")
public class ShhHandler extends SimpleChannelInboundHandler<ShhMessage> { public class ShhHandler extends SimpleChannelInboundHandler<ShhMessage> {
public final static byte VERSION = 1; public final static byte VERSION = 1;