commit b4a8b8b39a9c3f1e1ba617c185980cba0736a9a8
author anna.shunko <annshunko@gmail.com> Mon Nov 11 11:35:13 2019 +0300
committer anna.shunko <annshunko@gmail.com> Mon Nov 11 11:35:13 2019 +0300
tree d4e54e5bb7f6f26fd1fc93e6fba3c258b27b2719
parent 21bfaa737845ffc53c9842f23aa8702959eed5ff

merge conflicts resolved

devp2p/src/test/kotlin/org/apache/tuweni/devp2p/v5/AbstractIntegrationTest.kt

diff --git a/devp2p/src/test/kotlin/org/apache/tuweni/devp2p/v5/AbstractIntegrationTest.kt b/devp2p/src/test/kotlin/org/apache/tuweni/devp2p/v5/AbstractIntegrationTest.kt
index 15313ec..b133465 100644
--- a/devp2p/src/test/kotlin/org/apache/tuweni/devp2p/v5/AbstractIntegrationTest.kt
+++ b/devp2p/src/test/kotlin/org/apache/tuweni/devp2p/v5/AbstractIntegrationTest.kt
@@ -113,7 +113,7 @@
     initiator.connector.send(recipient.address, message, recipient.nodeId)
   }
 
-  protected inline fun <reified T : UdpMessage> sendAndAwait(
+  internal inline fun <reified T : UdpMessage> sendAndAwait(
     initiator: TestNode,
     recipient: TestNode,
     message: UdpMessage