@@ -62,9 +62,6 @@ class QuicTransport(
6262 private var workerGroup by lazyVar {
6363 MultiThreadIoEventLoopGroup (NioIoHandler .newFactory())
6464 }
65- private var bossGroup by lazyVar {
66- MultiThreadIoEventLoopGroup (1 , NioIoHandler .newFactory())
67- }
6865 private var allocator by lazyVar { PooledByteBufAllocator (true ) }
6966 private var multistreamProtocol: MultistreamProtocol = MultistreamProtocolV1
7067 private var incomingMultistreamProtocol: MultistreamProtocol by lazyVar { multistreamProtocol }
@@ -139,10 +136,7 @@ class QuicTransport(
139136 val allClosed = CompletableFuture .allOf(* everythingThatNeedsToClose.toTypedArray())
140137
141138 return allClosed.thenCompose {
142- CompletableFuture .allOf(
143- workerGroup.shutdownGracefully().toVoidCompletableFuture(),
144- bossGroup.shutdownGracefully().toVoidCompletableFuture()
145- ).thenApply { }
139+ workerGroup.shutdownGracefully().toVoidCompletableFuture()
146140 }
147141 }
148142
@@ -286,9 +280,9 @@ class QuicTransport(
286280
287281 override fun handles (addr : Multiaddr ) =
288282 handlesHost(addr) &&
289- addr.has(UDP ) &&
290- addr.has(QUICV1 ) &&
291- ! addr.has(WS )
283+ addr.has(UDP ) &&
284+ addr.has(QUICV1 ) &&
285+ ! addr.has(WS )
292286
293287 fun quicSslContext (expectedRemotePeerId : PeerId ? , trustManager : Libp2pTrustManager ): QuicSslContext {
294288 val connectionKeys = if (certAlgorithm.equals(" ECDSA" )) generateEcdsaKeyPair() else generateEd25519KeyPair()
@@ -297,12 +291,12 @@ class QuicTransport(
297291 val cert = buildCert(localKey, connectionKeys.first)
298292 logger.info(" Building {} keys and cert for peer id {}" , certAlgorithm, PeerId .fromPubKey(localKey.publicKey()))
299293 return (
300- if (isClient) {
301- QuicSslContextBuilder .forClient().keyManager(javaPrivateKey, null , cert)
302- } else {
303- QuicSslContextBuilder .forServer(javaPrivateKey, null , cert).clientAuth(ClientAuth .REQUIRE )
304- }
305- )
294+ if (isClient) {
295+ QuicSslContextBuilder .forClient().keyManager(javaPrivateKey, null , cert)
296+ } else {
297+ QuicSslContextBuilder .forServer(javaPrivateKey, null , cert).clientAuth(ClientAuth .REQUIRE )
298+ }
299+ )
306300 .trustManager(trustManager)
307301 .applicationProtocols(" libp2p" )
308302 .build()
0 commit comments