diff --git a/src/main/java/fucoin/Main.java b/src/main/java/fucoin/Main.java index 36991aba69288b73e9196b5b2199d35abdb90fa6..2d9f6c3d3ff80f735ea1f260846c3e1f846b5a92 100644 --- a/src/main/java/fucoin/Main.java +++ b/src/main/java/fucoin/Main.java @@ -16,7 +16,7 @@ import java.util.List; public class Main { - private static int numberOfWallets = 1; + private static int numberOfWallets = 2; private static ActorSystem cSystem; diff --git a/src/main/java/fucoin/wallet/WalletImpl.java b/src/main/java/fucoin/wallet/WalletImpl.java index dd77244daad866b87c07323f2c6f7c70439046db..5cb6e220b39923bcbb1c14b4c74ca9a3466f83e4 100644 --- a/src/main/java/fucoin/wallet/WalletImpl.java +++ b/src/main/java/fucoin/wallet/WalletImpl.java @@ -49,12 +49,12 @@ public class WalletImpl extends AbstractWallet { @Override public void onReceive(Object message) { - //log(getSender().path().name() + " invokes " + getSelf().path().name() + " to do " + message.getClass().getSimpleName()); + log(getSender().path().name() + " invokes " + getSelf().path().name() + " to do " + message.getClass().getSimpleName()); if (message instanceof ActionInvokeRevive) { ((ActionInvokeRevive) message).doAction(this); } if (!isActive && !(message instanceof ActionInvokeRevive)) return; - //System.out.println(message); + if (message instanceof ClientAction) { ((ClientAction) message).doAction(this); } @@ -67,13 +67,7 @@ public class WalletImpl extends AbstractWallet { if (gui != null) { gui.setAddress(getAddress()); } - String path = "akka.tcp://Core@127.0.0.1:1234/user/Main"; - //System.out.println(getContext().provider().getExternalAddressFor(getSelf().path().address())); - //log("my address should be "+getAddress()); - //log(""+preKnownNeighbour); - //knownNeighbors.put(getName(),getSelf()); - //System.out.println(knownNeighbors); if (preKnownNeighbour != null) { addKnownNeighbor(preKnownNeighbourName, preKnownNeighbour); preKnownNeighbour.tell(new ActionJoin(), getSelf()); @@ -83,8 +77,6 @@ public class WalletImpl extends AbstractWallet { preKnownNeighbour.tell(aja, getSelf()); } - //setAmount(100); - //remoteSuperVisorActor.tell(new ServerActionJoin(name), getSelf()); } @Override @@ -159,7 +151,7 @@ public class WalletImpl extends AbstractWallet { @Override public boolean addKnownNeighbor(String key, ActorRef value) { - System.out.println(key + " is newNeighbor of " + name + "?" + !getKnownNeighbors().containsKey(key)); + log(key + " is newNeighbor of " + name + "?" + !getKnownNeighbors().containsKey(key)); if (getKnownNeighbors().containsKey(key) || key.equals(name)) { return false; }