Hashing and dependency updates

Author: mikera

convex-core/src/main/java/convex/core/crypto/Hashing.java

@@ -6,6 +6,7 @@
 
 import org.bouncycastle.jcajce.provider.digest.Keccak;
 
+import convex.core.data.ABlobLike;
 import convex.core.data.Hash;
 import convex.core.exceptions.Panic;
 
@@ -152,5 +153,13 @@ protected MessageDigest initialValue() {
 			return new Keccak.Digest256();
 		}
 	};
+	
+	public static Hash sha256(ABlobLike<?> data) {
+		return data.toBlob().computeHash(getSHA256Digest());
+	}
+	
+	public static Hash sha3(ABlobLike<?> data) {
+		return data.toBlob().getContentHash();
+	}
 
 }

convex-core/src/main/java/convex/core/lang/RT.java

@@ -1403,6 +1403,31 @@ public static ACell getIn(ACell coll, Object... keys) {
 		}
 		return result;
 	}
+	
+	public static ACell assocIn(ACell a, ACell value, Object... keys) {
+		int n=keys.length;
+		ADataStructure<?>[] ass=new ADataStructure[n];
+		ACell[] ks=new ACell[n];
+		ACell data=a;
+		for (int i = 0; i < n; i++) {
+			ADataStructure<?> struct = RT.ensureAssociative(data);  // nil-> empty map
+			if (struct == null) throw new IllegalArgumentException("Not a data structure at depth: "+i);
+			ass[i]=struct;
+			ACell k=RT.cvm(keys[i]);
+			ks[i]=k;
+			data=struct.get(k);
+		}
+
+		for (int i = n-1; i >=0; i--) {
+			ADataStructure<?> struct=ass[i];
+			ACell k=ks[i];
+			value=RT.assoc(struct, k, value);
+			if (value==null) {
+				throw new IllegalArgumentException("Invalid structure for assocIn at depth "+i);
+			}
+		}
+		return value;
+	}
 
 	/**
 	 * Gets an element from a data structure using the given key. Returns the
@@ -1922,4 +1947,6 @@ public static long[] toLongArray(AVector<?> v) {
 		return result;
 	}
 
+
+
 }

convex-peer/src/main/java/convex/net/impl/netty/NettyConnection.java

@@ -19,8 +19,8 @@
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.*;
+import io.netty.channel.nio.NioIoHandler;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
 
@@ -51,7 +51,7 @@ protected static EventLoopGroup getEventLoopGroup() {
 		synchronized (NettyConnection.class) {
 			if (workerGroup != null)
 				return workerGroup;
-			workerGroup = new NioEventLoopGroup();
+			workerGroup = new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory());
 
 			Shutdown.addHook(Shutdown.CONNECTION, () -> {
 				if (workerGroup != null) {

convex-peer/src/main/java/convex/net/impl/netty/NettyServer.java

@@ -20,7 +20,8 @@
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.MultiThreadIoEventLoopGroup;
+import io.netty.channel.nio.NioIoHandler;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 
@@ -32,7 +33,7 @@ public class NettyServer extends AServer {
 
 	protected synchronized static EventLoopGroup getEventLoopGroup() {
 		if (bossGroup!=null) return bossGroup;
-		bossGroup=new NioEventLoopGroup();
+		bossGroup=new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory());
 		Shutdown.addHook(Shutdown.SERVER,()->{
 			if (bossGroup!=null) {
 				bossGroup.shutdownGracefully();

pom.xml

@@ -31,7 +31,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<logback.version>1.5.12</logback.version>
 		<jmh.version>1.37</jmh.version>
-		<junit.version>5.12.2</junit.version>
+		<junit.version>5.13.0</junit.version>
 		<slf4j.version>2.0.16</slf4j.version>
 		<hc.version>5.4.1</hc.version>
 		<convex.version>${project.version}</convex.version>