Fix apache#277

devp2p/src/main/kotlin/org/apache/tuweni/devp2p/PeerRoutingTable.kt

@@ -18,8 +18,10 @@ package org.apache.tuweni.devp2p
 
 import com.google.common.cache.Cache
 import com.google.common.cache.CacheBuilder
+import com.google.common.util.concurrent.UncheckedExecutionException
 import org.apache.tuweni.crypto.SECP256K1
 import org.apache.tuweni.kademlia.KademliaRoutingTable
+import java.lang.IllegalArgumentException
 
 /**
  * A routing table for ÐΞVp2p peers.
@@ -98,8 +100,11 @@ internal class DevP2PPeerRoutingTable(selfId: SECP256K1.PublicKey) : PeerRouting
   private fun hashForId(id: SECP256K1.PublicKey): ByteArray? {
     try {
       return idHashCache.get(id) { EthereumNodeRecord.nodeId(id).toArrayUnsafe() }
-    } catch (e: IllegalArgumentException) {
-      return null
+    } catch (e: UncheckedExecutionException) {
+      if (e.cause is IllegalArgumentException) {
+        return null
+      }
+      throw e
     }
   }
 }

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

@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tuweni.devp2p.v5
+
+import org.apache.tuweni.bytes.Bytes
+import org.apache.tuweni.crypto.SECP256K1
+import org.apache.tuweni.devp2p.DevP2PPeerRoutingTable
+import org.apache.tuweni.junit.BouncyCastleExtension
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+
+@ExtendWith(BouncyCastleExtension::class)
+class PeerRoutingTableTest {
+
+  @Test
+  fun invalidPublicKey() {
+    val routingTable = DevP2PPeerRoutingTable(SECP256K1.KeyPair.random().publicKey())
+    val invalidPublicKey = SECP256K1.PublicKey.fromBytes(Bytes.repeat(0, 64))
+    val peers = routingTable.nearest(invalidPublicKey, 3)
+    assertEquals(0, peers.size)
+  }
+}