Skip to content

Commit bb0f9dd

Browse files
atoulmeatoulme
committed
fix deprecations
1 parent 07cd889 commit bb0f9dd

File tree

25 files changed

+107
-85
lines changed

25 files changed

+107
-85
lines changed

‎dependency-versions.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ dependencyManagement {
5555
dependency('io.opentelemetry:opentelemetry-extension-trace-propagators:1.2.0')
5656
dependency('io.opentelemetry:opentelemetry-proto:1.7.1-alpha')
5757
dependency('io.opentelemetry:opentelemetry-sdk:1.36.0')
58+
dependency('io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.24.0-alpha')
5859
dependency('io.opentelemetry:opentelemetry-sdk-trace:1.36.0')
5960
dependency('io.opentelemetry:opentelemetry-sdk-metrics:1.36.0')
6061
dependency('io.opentelemetry:opentelemetry-sdk-testing:1.36.0')
@@ -90,7 +91,7 @@ dependencyManagement {
9091
entry 'bcpkix-jdk15on'
9192
entry 'bcprov-jdk15on'
9293
}
93-
dependencySet(group: 'org.eclipse.jetty', version: '12.0.7') {
94+
dependencySet(group: 'org.eclipse.jetty', version: '11.0.20') {
9495
entry 'jetty-server'
9596
entry 'jetty-servlet'
9697
entry 'jetty-servlets'

‎devp2p-proxy/src/main/kotlin/org/apache/tuweni/devp2p/proxy/TcpDownstream.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ import io.vertx.core.Vertx
66
import io.vertx.core.buffer.Buffer
77
import io.vertx.core.net.NetServer
88
import io.vertx.core.net.NetSocket
9-
import io.vertx.kotlin.coroutines.await
9+
import io.vertx.kotlin.coroutines.coAwait
1010
import kotlinx.coroutines.CoroutineScope
1111
import kotlinx.coroutines.Dispatchers
1212
import kotlinx.coroutines.async
1313
import org.apache.tuweni.bytes.Bytes
14-
import org.apache.tuweni.concurrent.coroutines.await
1514
import org.slf4j.LoggerFactory
1615
import kotlin.coroutines.CoroutineContext
1716

@@ -34,7 +33,7 @@ class TcpDownstream(
3433
val server = vertx.createNetServer()
3534
server.connectHandler {
3635
handleSocket(it)
37-
}.listen(port, host).await()
36+
}.listen(port, host).coAwait()
3837
tcpServer = server
3938
logger.info("Started downstream proxy server on $host:$port")
4039
}

‎devp2p-proxy/src/main/kotlin/org/apache/tuweni/devp2p/proxy/TcpUpstream.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import io.vertx.core.Vertx
66
import io.vertx.core.buffer.Buffer
77
import io.vertx.core.net.NetClient
88
import io.vertx.kotlin.coroutines.await
9+
import io.vertx.kotlin.coroutines.coAwait
910
import kotlinx.coroutines.CoroutineScope
1011
import kotlinx.coroutines.Dispatchers
1112
import kotlinx.coroutines.async
@@ -33,7 +34,7 @@ class TcpUpstream(
3334
}
3435

3536
override suspend fun handleRequest(message: Bytes): Bytes {
36-
val socket = tcpclient!!.connect(port, host).await()
37+
val socket = tcpclient!!.connect(port, host).coAwait()
3738

3839
val result = AsyncResult.incomplete<Bytes>()
3940
socket.handler {
@@ -44,7 +45,7 @@ class TcpUpstream(
4445
}.exceptionHandler {
4546
result.completeExceptionally(it)
4647
}
47-
socket.write(Buffer.buffer(message.toArrayUnsafe())).await()
48+
socket.write(Buffer.buffer(message.toArrayUnsafe())).coAwait()
4849

4950
return result.await()
5051
}

‎devp2p/src/main/kotlin/org/apache/tuweni/devp2p/DiscoveryService.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import io.vertx.core.buffer.Buffer
99
import io.vertx.core.datagram.DatagramPacket
1010
import io.vertx.core.net.SocketAddress
1111
import io.vertx.kotlin.coroutines.await
12+
import io.vertx.kotlin.coroutines.coAwait
1213
import io.vertx.kotlin.coroutines.dispatcher
1314
import kotlinx.coroutines.CompletableDeferred
1415
import kotlinx.coroutines.CoroutineExceptionHandler
@@ -335,7 +336,7 @@ internal class CoroutineDiscoveryService constructor(
335336
}
336337

337338
fun start() = launch {
338-
server.handler { receiveDatagram(it) }.listen(bindAddress.port(), bindAddress.host()).await()
339+
server.handler { receiveDatagram(it) }.listen(bindAddress.port(), bindAddress.host()).coAwait()
339340
val endpoint = Endpoint(
340341
advertiseAddress ?: (server.localAddress()).host(),
341342
advertiseUdpPort ?: server.localAddress().port(),
@@ -428,7 +429,7 @@ internal class CoroutineDiscoveryService constructor(
428429
override suspend fun shutdown() {
429430
if (shutdown.compareAndSet(false, true)) {
430431
logger.info("{}: shutdown", serviceDescriptor)
431-
server.close().await()
432+
server.close().coAwait()
432433
for (pending in awaitingPongs.values) {
433434
pending.complete(null)
434435
}
@@ -916,6 +917,6 @@ internal class CoroutineDiscoveryService constructor(
916917
}
917918

918919
private suspend fun sendPacket(address: SocketAddress, packet: Packet) {
919-
server.send(Buffer.buffer(packet.encode().toArrayUnsafe()), address.port(), address.host()).await()
920+
server.send(Buffer.buffer(packet.encode().toArrayUnsafe()), address.port(), address.host()).coAwait()
920921
}
921922
}

‎devp2p/src/main/kotlin/org/apache/tuweni/devp2p/PacketType.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import org.apache.tuweni.bytes.Bytes
66
import org.apache.tuweni.bytes.Bytes32
77
import org.apache.tuweni.crypto.SECP256K1
88

9+
private const val MAX_VALUE: Byte = 0x7f
10+
911
/**
1012
* DevP2P discovery packet types
1113
* @param typeId the byte representing the type
@@ -86,7 +88,6 @@ internal enum class PacketType(
8688
}, ;
8789

8890
companion object {
89-
private const val MAX_VALUE: Byte = 0x7f
9091
private val INDEX = arrayOfNulls<PacketType?>(MAX_VALUE.toInt())
9192

9293
init {
@@ -100,7 +101,7 @@ internal enum class PacketType(
100101
}
101102

102103
init {
103-
require(typeId <= PacketType.MAX_VALUE) { "Packet typeId must be in range [0x00, 0x80)" }
104+
require(typeId <= MAX_VALUE) { "Packet typeId must be in range [0x00, 0x80)" }
104105
}
105106

106107
abstract fun decode(

‎devp2p/src/main/kotlin/org/apache/tuweni/devp2p/v5/DiscoveryV5Service.kt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import io.vertx.core.buffer.Buffer
77
import io.vertx.core.datagram.DatagramPacket
88
import io.vertx.core.net.SocketAddress
99
import io.vertx.kotlin.coroutines.await
10+
import io.vertx.kotlin.coroutines.coAwait
1011
import kotlinx.coroutines.CoroutineScope
1112
import kotlinx.coroutines.Dispatchers
1213
import kotlinx.coroutines.Job
@@ -176,38 +177,38 @@ internal class DefaultDiscoveryV5Service(
176177
private lateinit var receiveJob: Job
177178

178179
override suspend fun start(): AsyncCompletion {
179-
server.handler(this::receiveDatagram).listen(bindAddress.port, bindAddress.hostString).await()
180+
server.handler(this::receiveDatagram).listen(bindAddress.port, bindAddress.hostString).coAwait()
180181
return bootstrap()
181182
}
182183

183184
override suspend fun terminate() {
184185
if (started.compareAndSet(true, false)) {
185186
receiveJob.cancel()
186-
server.close().await()
187+
server.close().coAwait()
187188
}
188189
}
189190

190191
override fun enr(): EthereumNodeRecord = selfEnr
191192

192193
override suspend fun addPeer(enr: EthereumNodeRecord, address: SocketAddress): AsyncCompletion {
193194
val session = sessions[address]
194-
if (session == null) {
195+
return if (session == null) {
195196
logger.trace("Creating new session for peer {}", enr)
196197
val handshakeSession = handshakes.computeIfAbsent(address) { addr -> createHandshake(addr, enr.publicKey(), enr) }
197-
return asyncCompletion {
198+
asyncCompletion {
198199
logger.trace("Handshake connection start {}", enr)
199200
handshakeSession.connect().await()
200201
logger.trace("Handshake connection done {}", enr)
201202
}
202203
} else {
203204
logger.trace("Session found for peer {}", enr)
204-
return AsyncCompletion.completed()
205+
AsyncCompletion.completed()
205206
}
206207
}
207208

208209
private fun send(addr: SocketAddress, message: Bytes) {
209210
launch {
210-
server.send(Buffer.buffer(message.toArrayUnsafe()), addr.port(), addr.host()).await()
211+
server.send(Buffer.buffer(message.toArrayUnsafe()), addr.port(), addr.host()).coAwait()
211212
}
212213
}
213214

@@ -227,7 +228,7 @@ internal class DefaultDiscoveryV5Service(
227228
var session = sessions.get(packet.sender())
228229
val size = Math.min(Packet.MAX_SIZE, packet.data().length())
229230
val buffer = ByteBuffer.allocate(size)
230-
packet.data().byteBuf.readBytes(buffer)
231+
buffer.put(packet.data().bytes)
231232
buffer.flip()
232233
val message = Bytes.wrapByteBuffer(buffer)
233234
if (message.slice(0, 32) == whoAreYouHeader && session != null) {

‎devp2p/src/test/kotlin/org/apache/tuweni/devp2p/DiscoveryServiceTest.kt

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import io.vertx.core.Vertx
66
import io.vertx.core.buffer.Buffer
77
import io.vertx.core.net.SocketAddress
88
import io.vertx.kotlin.coroutines.await
9+
import io.vertx.kotlin.coroutines.coAwait
910
import kotlinx.coroutines.delay
1011
import kotlinx.coroutines.runBlocking
1112
import org.apache.tuweni.bytes.Bytes
@@ -61,7 +62,7 @@ internal class DiscoveryServiceTest {
6162
val reference = AsyncResult.incomplete<Buffer>()
6263
val client = vertx.createDatagramSocket().handler { res ->
6364
reference.complete(res.data())
64-
}.listen(0, "localhost").await()
65+
}.listen(0, "localhost").coAwait()
6566
val clientEndpoint = Endpoint("192.168.1.1", 5678, 7654)
6667
val ping = PingPacket.create(
6768
clientKeyPair,
@@ -70,10 +71,10 @@ internal class DiscoveryServiceTest {
7071
Endpoint(address),
7172
null,
7273
)
73-
client.send(Buffer.buffer(ping.encode().toArrayUnsafe()), address.port(), address.host()).await()
74+
client.send(Buffer.buffer(ping.encode().toArrayUnsafe()), address.port(), address.host()).coAwait()
7475
val datagram = reference.await()
7576
val buffer = ByteBuffer.allocate(datagram.length())
76-
datagram.byteBuf.readBytes(buffer)
77+
buffer.put(datagram.bytes)
7778
val pong = Packet.decodeFrom(buffer) as PongPacket
7879
assertEquals(discoveryService.nodeId, pong.nodeId)
7980
assertEquals(ping.hash, pong.pingHash)
@@ -92,7 +93,7 @@ internal class DiscoveryServiceTest {
9293
reference.set(AsyncResult.incomplete())
9394
val bootstrapClient = vertx.createDatagramSocket().handler { res ->
9495
reference.get().complete(res.data())
95-
}.listen(0, "127.0.0.1").await()
96+
}.listen(0, "127.0.0.1").coAwait()
9697

9798
val serviceKeyPair = SECP256K1.KeyPair.random()
9899
val peerRepository = EphemeralPeerRepository()
@@ -113,7 +114,7 @@ internal class DiscoveryServiceTest {
113114

114115
val datagram = reference.get().await()
115116
val buffer = ByteBuffer.allocate(datagram.length())
116-
datagram.byteBuf.readBytes(buffer)
117+
buffer.put(datagram.bytes)
117118
val ping = Packet.decodeFrom(buffer) as PingPacket
118119
assertEquals(discoveryService.nodeId, ping.nodeId)
119120
assertEquals(
@@ -132,7 +133,7 @@ internal class DiscoveryServiceTest {
132133
)
133134
reference.set(AsyncResult.incomplete())
134135
val address = SocketAddress.inetSocketAddress(discoveryService.localPort, "127.0.0.1")
135-
bootstrapClient.send(Buffer.buffer(pong.encode().toArrayUnsafe()), address.port(), address.host()).await()
136+
bootstrapClient.send(Buffer.buffer(pong.encode().toArrayUnsafe()), address.port(), address.host()).coAwait()
136137

137138
val findNodesDatagram = reference.get().await()
138139

@@ -164,7 +165,7 @@ internal class DiscoveryServiceTest {
164165
val reference = AsyncResult.incomplete<Buffer>()
165166
val bootstrapClient = vertx.createDatagramSocket().handler { res ->
166167
reference.complete(res.data())
167-
}.listen(0, "localhost").await()
168+
}.listen(0, "localhost").coAwait()
168169

169170
val serviceKeyPair = SECP256K1.KeyPair.random()
170171
val peerRepository = EphemeralPeerRepository()
@@ -184,7 +185,7 @@ internal class DiscoveryServiceTest {
184185
)
185186
val datagram = reference.await()
186187
val buffer = ByteBuffer.allocate(datagram.length())
187-
datagram.byteBuf.readBytes(buffer)
188+
buffer.put(datagram.bytes)
188189
val ping = Packet.decodeFrom(buffer) as PingPacket
189190
assertEquals(discoveryService.nodeId, ping.nodeId)
190191
assertEquals(
@@ -202,7 +203,7 @@ internal class DiscoveryServiceTest {
202203
null,
203204
)
204205
val address = SocketAddress.inetSocketAddress(discoveryService.localPort, "127.0.0.1")
205-
bootstrapClient.send(Buffer.buffer(pong.encode().toArrayUnsafe()), address.port(), address.host()).await()
206+
bootstrapClient.send(Buffer.buffer(pong.encode().toArrayUnsafe()), address.port(), address.host()).coAwait()
206207

207208
delay(1000)
208209
val bootstrapPeer =
@@ -225,7 +226,7 @@ internal class DiscoveryServiceTest {
225226
val reference = AsyncResult.incomplete<Buffer>()
226227
val bootstrapClient = vertx.createDatagramSocket().handler { res ->
227228
reference.complete(res.data())
228-
}.listen(0, "localhost").await()
229+
}.listen(0, "localhost").coAwait()
229230

230231
val discoveryService = DiscoveryService.open(
231232
vertx,
@@ -244,7 +245,7 @@ internal class DiscoveryServiceTest {
244245

245246
val datagram = reference.await()
246247
val buffer = ByteBuffer.allocate(datagram.length())
247-
datagram.byteBuf.readBytes(buffer)
248+
buffer.put(datagram.bytes)
248249
val ping = Packet.decodeFrom(buffer) as PingPacket
249250
assertEquals(discoveryService.nodeId, ping.nodeId)
250251
assertEquals(
@@ -264,7 +265,7 @@ internal class DiscoveryServiceTest {
264265
reference.set(AsyncResult.incomplete())
265266
val bootstrapClient = vertx.createDatagramSocket().handler { res ->
266267
reference.get().complete(res.data())
267-
}.listen(0, "localhost").await()
268+
}.listen(0, "localhost").coAwait()
268269

269270
val discoveryService = DiscoveryService.open(
270271
vertx,
@@ -280,7 +281,7 @@ internal class DiscoveryServiceTest {
280281
val datagram1 = reference.get().await()
281282
reference.set(AsyncResult.incomplete())
282283
val buffer1 = ByteBuffer.allocate(datagram1.length())
283-
datagram1.byteBuf.readBytes(buffer1)
284+
buffer1.put(datagram1.bytes)
284285
val ping1 = Packet.decodeFrom(buffer1) as PingPacket
285286
assertEquals(discoveryService.nodeId, ping1.nodeId)
286287
assertEquals(
@@ -290,7 +291,7 @@ internal class DiscoveryServiceTest {
290291
val datagram2 = reference.get().await()
291292
reference.set(AsyncResult.incomplete())
292293
val buffer2 = ByteBuffer.allocate(datagram2.length())
293-
datagram2.byteBuf.readBytes(buffer2)
294+
buffer2.put(datagram2.bytes)
294295
val ping2 = Packet.decodeFrom(buffer2) as PingPacket
295296
assertEquals(discoveryService.nodeId, ping2.nodeId)
296297
assertEquals(
@@ -300,7 +301,7 @@ internal class DiscoveryServiceTest {
300301
val datagram3 = reference.get().await()
301302
reference.set(AsyncResult.incomplete())
302303
val buffer3 = ByteBuffer.allocate(datagram3.length())
303-
datagram3.byteBuf.readBytes(buffer3)
304+
buffer3.put(datagram3.bytes)
304305
val ping3 = Packet.decodeFrom(buffer3) as PingPacket
305306
assertEquals(discoveryService.nodeId, ping3.nodeId)
306307
assertEquals(
@@ -328,18 +329,18 @@ internal class DiscoveryServiceTest {
328329
reference.set(AsyncResult.incomplete())
329330
val client = vertx.createDatagramSocket().handler { res ->
330331
reference.get().complete(res.data())
331-
}.listen(0, "localhost").await()
332+
}.listen(0, "localhost").coAwait()
332333
val findNodes =
333334
FindNodePacket.create(
334335
clientKeyPair,
335336
System.currentTimeMillis(),
336337
SECP256K1.KeyPair.random().publicKey(),
337338
)
338-
client.send(Buffer.buffer(findNodes.encode().toArrayUnsafe()), address.port(), address.host()).await()
339+
client.send(Buffer.buffer(findNodes.encode().toArrayUnsafe()), address.port(), address.host()).coAwait()
339340

340341
val datagram = reference.get().await()
341342
val buffer = ByteBuffer.allocate(datagram.length())
342-
datagram.byteBuf.readBytes(buffer)
343+
buffer.put(datagram.bytes)
343344
val ping = Packet.decodeFrom(buffer) as PingPacket
344345
assertEquals(discoveryService.nodeId, ping.nodeId)
345346

@@ -355,11 +356,11 @@ internal class DiscoveryServiceTest {
355356
)
356357

357358
reference.set(AsyncResult.incomplete())
358-
client.send(Buffer.buffer(pong.encode().toArrayUnsafe()), address.port(), address.host()).await()
359+
client.send(Buffer.buffer(pong.encode().toArrayUnsafe()), address.port(), address.host()).coAwait()
359360

360361
val datagram2 = reference.get().await()
361362
val buffer2 = ByteBuffer.allocate(datagram2.length())
362-
datagram2.byteBuf.readBytes(buffer2)
363+
buffer2.put(datagram2.bytes)
363364
val neighbors = Packet.decodeFrom(buffer2) as NeighborsPacket
364365
assertEquals(discoveryService.nodeId, neighbors.nodeId)
365366

‎devp2p/src/test/kotlin/org/apache/tuweni/devp2p/v5/DefaultDiscoveryV5ServiceTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package org.apache.tuweni.devp2p.v5
55
import io.vertx.core.Vertx
66
import io.vertx.core.buffer.Buffer
77
import io.vertx.kotlin.coroutines.await
8+
import io.vertx.kotlin.coroutines.coAwait
89
import kotlinx.coroutines.runBlocking
910
import org.apache.tuweni.bytes.Bytes
1011
import org.apache.tuweni.concurrent.AsyncResult
@@ -52,7 +53,7 @@ class DefaultDiscoveryV5ServiceTest {
5253
val reference = AsyncResult.incomplete<Buffer>()
5354
val client = vertx.createDatagramSocket().handler { res ->
5455
reference.complete(res.data())
55-
}.listen(19001, "localhost").await()
56+
}.listen(19001, "localhost").coAwait()
5657
val discoveryV5Service: DiscoveryV5Service =
5758
DiscoveryService.open(
5859
vertx,
@@ -64,7 +65,7 @@ class DefaultDiscoveryV5ServiceTest {
6465

6566
val datagram = reference.await()
6667
val buffer = ByteBuffer.allocate(datagram.length())
67-
datagram.byteBuf.readBytes(buffer)
68+
buffer.put(datagram.bytes)
6869
buffer.flip()
6970
val receivedBytes = Bytes.wrapByteBuffer(buffer)
7071
val content = receivedBytes.slice(45)

0 commit comments

Comments
 (0)