Misc code cleanups

int08h · Feb 17, 2018 · 6479d79 · 6479d79
1 parent 8849e04
commit 6479d79
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/main/java/nearenough/examples/NettyClient.java b/src/main/java/nearenough/examples/NettyClient.java
@@ -63,7 +63,7 @@ public RequestHandler(InetSocketAddress addr) {
     }
 
     @Override
-    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+    public void channelActive(ChannelHandlerContext ctx) {
       // Creates the client request
       RtMessage msg = client.createRequest();
 
@@ -81,7 +81,7 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
 
     @SuppressWarnings("Duplicates")
     @Override
-    protected void channelRead0(ChannelHandlerContext ctx, DatagramPacket msg) throws Exception {
+    protected void channelRead0(ChannelHandlerContext ctx, DatagramPacket msg) {
       // A reply from the server has been received
 
       System.out.printf(
@@ -120,7 +120,7 @@ protected void channelRead0(ChannelHandlerContext ctx, DatagramPacket msg) throw
     }
 
     @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
       ctx.close();
 
       if (cause instanceof ReadTimeoutException) {
@@ -145,7 +145,7 @@ public static void main(String[] args) throws InterruptedException {
         .channel(NioDatagramChannel.class)
         .handler(new ChannelInitializer<NioDatagramChannel>() {
           @Override
-          protected void initChannel(NioDatagramChannel ch) throws Exception {
+          protected void initChannel(NioDatagramChannel ch) {
             ch.pipeline()
                 .addLast(new ReadTimeoutHandler(5))
                 .addLast(new RequestHandler(addr));

diff --git a/src/main/java/nearenough/examples/NioClient.java b/src/main/java/nearenough/examples/NioClient.java
@@ -81,7 +81,7 @@ public static void main(String[] args) throws IOException, InterruptedException
       if (recvBuf.hasRemaining()) {
         break;
       }
-      Thread.sleep(100);
+      Thread.sleep(100L);
     }
 
     if (recvBuf.hasRemaining()) {

diff --git a/src/main/java/nearenough/protocol/RtEd25519.java b/src/main/java/nearenough/protocol/RtEd25519.java
@@ -19,10 +19,6 @@
 import static nearenough.protocol.RtConstants.PUBKEY_LENGTH;
 import static nearenough.util.Preconditions.checkArgument;
 
-import java.security.InvalidKeyException;
-import java.security.PublicKey;
-import java.security.Signature;
-import java.security.SignatureException;
 import net.i2p.crypto.eddsa.EdDSAEngine;
 import net.i2p.crypto.eddsa.EdDSAPrivateKey;
 import net.i2p.crypto.eddsa.EdDSAPublicKey;
@@ -31,6 +27,11 @@
 import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec;
 import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec;
 
+import java.security.InvalidKeyException;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.security.SignatureException;
+
 /**
  * Provides Ed25519 signing and verification.
  */
@@ -55,7 +56,7 @@ public static final class Signer {
      * seed will be transformed and expanded into an Ed25519 private key as described in <a
      * href="https://tools.ietf.org/html/rfc8032#page-13">RFC 8032</a>.
      */
-    public Signer(byte[] seedBytes) throws InvalidKeyException, SignatureException {
+    public Signer(byte[] seedBytes) throws InvalidKeyException {
       checkArgument(seedBytes.length >= MIN_SEED_LENGTH, "insufficient private key seed length");
 
       EdDSAPrivateKeySpec privateSpec = new EdDSAPrivateKeySpec(seedBytes, ED25519_SPEC);
@@ -106,7 +107,7 @@ public static final class Verifier {
      *
      * @param publicKeyBytes A byte[32] containing the Ed25519 public key to use for verifications.
      */
-    public Verifier(byte[] publicKeyBytes) throws InvalidKeyException, SignatureException {
+    public Verifier(byte[] publicKeyBytes) throws InvalidKeyException {
       checkArgument(publicKeyBytes.length == PUBKEY_LENGTH, "incorrect public key size");
 
       EdDSAPublicKeySpec publicSpec = new EdDSAPublicKeySpec(publicKeyBytes, ED25519_SPEC);