rename mesh to cadet

1 files changed, 20 insertions, 20 deletions

diff --git a/src/test/java/org/gnunet/cadet/MeshTest.java b/src/test/java/org/gnunet/cadet/CadetTest.java
index 18ae9f6..667b1e6 100644
--- a/src/test/java/org/gnunet/cadet/MeshTest.java
+++ b/src/test/java/org/gnunet/cadet/CadetTest.java
@@ -1,4 +1,4 @@
-package org.gnunet.mesh;
+package org.gnunet.cadet;
 
 import org.gnunet.core.Core;
 import org.gnunet.core.PeerIdentityContinuation;
@@ -12,10 +12,10 @@ import org.junit.Test;
  *
  * @author Florian Dold
  */
-public class MeshTest extends TestingFixture {
-    public static class MessageHandler1 extends MeshRunabout {
-        public Mesh m1;
-        public Mesh m2;
+public class CadetTest extends TestingFixture {
+    public static class MessageHandler1 extends CadetRunabout {
+        public Cadet m1;
+        public Cadet m2;
         public void visit(TestMessage m) {
             System.out.println("got test message");
             m1.destroy();
@@ -24,11 +24,11 @@ public class MeshTest extends TestingFixture {
     }
 
     public static class MyChannelEndHandler implements ChannelEndHandler {
-        Mesh mesh1;
+        Cadet cadet1;
         PeerIdentity peerIdentity;
         @Override
-        public void onChannelEnd(Mesh.Channel channel) {
-            Mesh.Channel myChannel = mesh1.createChannel(peerIdentity, 42, false, true);
+        public void onChannelEnd(Cadet.Channel channel) {
+            Cadet.Channel myChannel = cadet1.createChannel(peerIdentity, 42, false, true);
             myChannel.send(new TestMessage());
         }
     }
@@ -37,9 +37,9 @@ public class MeshTest extends TestingFixture {
      * Send a message locally, to our own peer.
      */
     @Test (timeout = 5000)
-    public void test_mesh_send() {
+    public void test_cadet_send() {
         Program.configureLogging("DEBUG");
-        // we want the full arm here (starts both mesh and core)
+        // we want the full arm here (starts both cadet and core)
         final TestingSubsystem ts = new TestingSubsystem("arm");
         final Configuration cfg = ts.getConfiguration();
 
@@ -51,25 +51,25 @@ public class MeshTest extends TestingFixture {
                 System.out.println("got peer identity from core");
                 //
                 MyChannelEndHandler teh = new MyChannelEndHandler();
-                // first mesh handle, used to send the message
-                final Mesh mesh1 = new Mesh(cfg, teh);
-                teh.mesh1 = mesh1;
+                // first cadet handle, used to send the message
+                final Cadet cadet1 = new Cadet(cfg, teh);
+                teh.cadet1 = cadet1;
                 teh.peerIdentity = peerIdentity;
-                // second mesh handle, used to receive the message
-                final Mesh mesh2 = new Mesh(cfg, new InboundChannelHandler() {
+                // second cadet handle, used to receive the message
+                final Cadet cadet2 = new Cadet(cfg, new InboundChannelHandler() {
                     @Override
-                    public void onInboundChannel(Mesh.Channel tunnel, PeerIdentity initiator) {
+                    public void onInboundChannel(Cadet.Channel tunnel, PeerIdentity initiator) {
                         System.out.println("got inbound channel " + initiator);
                     }
                 }, new ChannelEndHandler() {
                     @Override
-                    public void onChannelEnd(Mesh.Channel tunnel) {
+                    public void onChannelEnd(Cadet.Channel tunnel) {
                         System.out.println("channel end handler called");
                     }
                 }, mh, 42);
-                mh.m1 = mesh1;
-                mh.m2 = mesh2;
-                Mesh.Channel channel = mesh1.createChannel(peerIdentity, 42, false, true);
+                mh.m1 = cadet1;
+                mh.m2 = cadet2;
+                Cadet.Channel channel = cadet1.createChannel(peerIdentity, 42, false, true);
                 channel.send(new TestMessage());
             }
         });