Code cleanup

test/dorkboxTest/network/AeronServer.kt

@@ -24,7 +24,6 @@ import ch.qos.logback.core.ConsoleAppender
 import dorkbox.network.Server
 import dorkbox.network.ServerConfiguration
 import dorkbox.network.connection.Connection
-import kotlinx.coroutines.runBlocking
 import org.slf4j.LoggerFactory
 import sun.misc.Unsafe
 import java.lang.reflect.Field
@@ -107,15 +106,11 @@ object AeronServer {
         }
 
         server.onMessage<String> { connection, message ->
-            runBlocking {
             connection.send("ECHO $message")
         }
-        }
 
-        runBlocking {
         server.bind()
     }
-    }
 
     init {
         try {

test/dorkboxTest/network/BaseTest.kt

@@ -84,8 +84,8 @@ abstract class BaseTest {
 //        rootLogger.setLevel(Level.OFF);
 
 //        rootLogger.level = Level.INFO;
-//            rootLogger.level = Level.DEBUG
         rootLogger.level = Level.TRACE;
+//            rootLogger.level = Level.DEBUG
 //        rootLogger.level = Level.ALL;
 
 

test/dorkboxTest/network/DisconnectReconnectTest.kt

@@ -20,9 +20,7 @@ class DisconnectReconnectTest : BaseTest() {
 
             val server: Server<Connection> = Server(configuration)
             addEndPoint(server)
-            runBlocking {
             server.bind(false)
-            }
 
             server.onConnect { connection ->
                 connection.logger.error("Disconnecting after 2 seconds.")

test/dorkboxTest/network/ListenerTest.kt

@@ -112,10 +112,7 @@ class ListenerTest : BaseTest() {
             serverDisconnect.value = true
         }
 
-
-        runBlocking {
         server.bind(false)
-        }
 
 
 

test/dorkboxTest/network/MultipleServerTest.kt

@@ -83,9 +83,7 @@ class MultipleServerTest : BaseTest() {
                 }
             }
 
-            runBlocking {
             server.bind(false)
-            }
 
             serverAeronDir = File(configuration.aeronLogDirectory.toString() + count)
         }

test/dorkboxTest/network/PingPongTest.kt

@@ -64,9 +64,7 @@ class PingPongTest : BaseTest() {
 
             val server: Server<Connection> = Server(configuration)
             addEndPoint(server)
-            runBlocking {
             server.bind(false)
-            }
 
             server.onError { _, throwable ->
                 fail = "Error during processing. $throwable"

test/dorkboxTest/network/SerializationValidationTest.kt

@@ -36,11 +36,8 @@ class SerializationValidationTest : BaseTest() {
             server.onMessage<FinishedCommand> { connection, message ->
                 stopEndPoints()
             }
-
-            runBlocking {
             server.bind(false)
         }
-        }
 
 
         run {
@@ -77,11 +74,8 @@ class SerializationValidationTest : BaseTest() {
             server.onMessage<TestObject> { connection, message ->
                 stopEndPoints()
             }
-
-            runBlocking {
             server.bind(false)
         }
-        }
 
 
         run {

test/dorkboxTest/network/rmi/RmiDelayedInvocationSpamTest.kt

@@ -77,11 +77,8 @@ class RmiDelayedInvocationSpamTest : BaseTest() {
             addEndPoint(server)
 
             server.saveGlobalObject(TestObjectImpl(counter), RMI_ID)
-
-            runBlocking {
             server.bind(false)
         }
-        }
 
 
         run {
@@ -123,10 +120,8 @@ class RmiDelayedInvocationSpamTest : BaseTest() {
                 stopEndPoints()
             }
 
-            runBlocking {
             client.connect()
         }
-        }
 
         waitForThreads(200)
         Assert.assertEquals(totalRuns.toLong(), counter.get())

test/dorkboxTest/network/rmi/RmiDelayedInvocationTest.kt

@@ -67,11 +67,8 @@ class RmiDelayedInvocationTest : BaseTest() {
             addEndPoint(server)
 
             server.saveGlobalObject(TestObjectImpl(iterateLock), OBJ_ID)
-
-            runBlocking {
             server.bind(false)
         }
-        }
 
         run {
             val configuration = clientConfig()
@@ -113,10 +110,8 @@ class RmiDelayedInvocationTest : BaseTest() {
                 stopEndPoints()
             }
 
-            runBlocking {
             client.connect(LOOPBACK)
         }
-        }
 
         waitForThreads(9999999)
     }

test/dorkboxTest/network/rmi/RmiNestedTest.kt

@@ -93,10 +93,8 @@ class RmiNestedTest : BaseTest() {
                 }
             }
 
-            runBlocking {
             server.bind(false)
         }
-        }
 
 
         run {
@@ -165,10 +163,8 @@ class RmiNestedTest : BaseTest() {
                 }
             }
 
-            runBlocking {
             server.bind(false)
         }
-        }
 
 
         run {
@@ -236,10 +232,8 @@ class RmiNestedTest : BaseTest() {
                 }
             }
 
-            runBlocking {
             server.bind(false)
         }
-        }
 
 
         run {

test/dorkboxTest/network/rmi/RmiSimpleTest.kt

@@ -80,9 +80,7 @@ class RmiSimpleTest : BaseTest() {
             val server = Server<Connection>(configuration)
             addEndPoint(server)
 
-            runBlocking {
             server.bind(false)
-            }
 
             server.onMessage<MessageWithTestCow> { connection, m ->
                 System.err.println("Received finish signal for test for: Client -> Server")
@@ -148,10 +146,7 @@ class RmiSimpleTest : BaseTest() {
 
             val server = Server<Connection>(configuration)
             addEndPoint(server)
-
-            runBlocking {
             server.bind(false)
-            }
 
             server.onMessage<MessageWithTestCow> { connection, m ->
                 System.err.println("Received finish signal for test for: Client -> Server")

test/dorkboxTest/network/rmi/multiJVM/TestServer.kt

@@ -24,7 +24,6 @@ import dorkboxTest.network.rmi.cows.TestBabyCow
 import dorkboxTest.network.rmi.cows.TestCow
 import dorkboxTest.network.rmi.cows.TestCowImpl
 import dorkboxTest.network.rmi.multiJVM.TestClient.setup
-import kotlinx.coroutines.runBlocking
 import org.junit.Assert
 
 /**
@@ -81,8 +80,6 @@ object TestServer {
 //            }
         }
 
-        runBlocking {
         server.bind(false)
     }
 }
-}