More CNS refinement

Author: mikera

convex-core/src/main/cvx/convex/core/registry.cvx

@@ -120,7 +120,6 @@
 	:doc  {:description "Creates a CNS entry with given reference, controller and metadata"
 	       :examples    [{:code "(*registry*/create 'my.actor.name target *address* {:some :metadata})"}]
 	       :signature   [{:params [sym]}]}}
-
   ([sym] (recur sym nil *address* nil nil))
   ([sym addr] (recur sym addr *address* nil nil))
   ([sym addr cont] (recur sym addr cont nil nil))
@@ -149,15 +148,14 @@
 				   (recur (inc i) nref)))
 		 ))
 	  )
-	)
-	sym
-	))
+	  ;; TODO: Not clear what default return value should be? [~*address* path]?
+	  )))
 
 (defn control
   [sym cont]
   (if-let [rec (read sym)]
     (let [[v c m child] rec]
-      (update sym v cont m))
+      (update sym v cont m child))
     (fail :STATE "CNS record does not exist")))
 
 

convex-core/src/main/java/convex/core/init/Init.java

@@ -341,7 +341,7 @@ private static State addStandardLibraries(State s) {
 
 	private static State addCNSTree(State s) {
 		Context ctx=Context.create(s, GOVERNANCE_ADDRESS);
-		ctx=ctx.eval(Reader.read("(*registry*/create 'cns *registry*)"));
+		ctx=ctx.eval(Reader.read("(*registry*/create 'convex.cns *registry*)"));
 		ctx.getResult();
 
 		// check we can get access to general trust monitors

convex-core/src/test/java/convex/lib/CNSTest.java

@@ -33,7 +33,7 @@ public class CNSTest extends ACVMTest {
 	@Test public void testConstantSetup() {
 		assertEquals(Init.REGISTRY_ADDRESS,eval("*registry*"));
 		assertEquals(Init.REGISTRY_ADDRESS,eval("cns"));
-		assertEquals(Init.REGISTRY_ADDRESS,eval("(*registry*/resolve 'cns)"));
+		assertEquals(Init.REGISTRY_ADDRESS,eval("@convex.registry"));
 
 		// TODO: fix this
 		// assertEquals(Init.REGISTRY_ADDRESS,eval("@cns"));
@@ -46,6 +46,7 @@ public class CNSTest extends ACVMTest {
 	}
 
 	@Test public void testTrust() {
+		// Root CNS node should only trust governance account
 		assertFalse(evalB("(trust/trusted? [cns []] *address*)"));
 		assertTrue(evalB("(query-as #6 `(~trust/trusted? [~cns []] *address*))"));
 	}
@@ -70,26 +71,26 @@ public class CNSTest extends ACVMTest {
 		// HERO shouldn't be able to create a top level CNS entry
 		assertTrustError(step("(*registry*/create 'foo)"));
 
-		// INIT should be able to create a top level CNS entry
-		Context ictx=context().forkWithAddress(Init.GOVERNANCE_ADDRESS);
-		ictx=step(ictx,"(import convex.trust :as trust)");
-		ictx=(step(ictx,"(*registry*/create 'foo #17)"));
-		assertNotError(ictx);
-		ictx=step(ictx,"(def ref [*registry* [\"foo\"]])");
-		AVector<?> ref=ictx.getResult();
+		// NEed governance address to be able to create a top level CNS entry
+		Context ctx=context().forkWithAddress(Init.GOVERNANCE_ADDRESS);
+		ctx=step(ctx,"(import convex.trust :as trust)");
+		ctx=(step(ctx,"(*registry*/create 'foo #17)"));
+		assertNotError(ctx);
+		ctx=step(ctx,"(def ref [*registry* [\"foo\"]])");
+		AVector<?> ref=ctx.getResult();
 		assertNotNull(ref);
 
 		// System.out.println(eval(ictx,"*registry*/cns-database"));
 
-		assertEquals(Address.create(17),eval(ictx,"(*registry*/resolve 'foo)"));
+		assertEquals(Address.create(17),eval(ctx,"(*registry*/resolve 'foo)"));
 
-		ictx=(step(ictx,"(*registry*/create 'foo #666)"));
-		assertEquals(Address.create(666),eval(ictx,"(*registry*/resolve 'foo)"));
+		ctx=(step(ctx,"(*registry*/create 'foo #666)"));
+		assertEquals(Address.create(666),eval(ctx,"(*registry*/resolve 'foo)"));
 
 		// HERO still shouldn't be able to update a top level CNS entry
-		ictx=ictx.forkWithAddress(HERO);
-		assertTrustError(step(ictx,"(*registry*/create 'foo *address* *address* {})"));
-		assertTrustError(step(ictx,"(trust/change-control "+ref+" *address*)"));
+		ctx=ctx.forkWithAddress(HERO);
+		assertTrustError(step(ctx,"(*registry*/create 'foo *address* *address* {})"));
+		assertTrustError(step(ctx,"(trust/change-control "+ref+" *address*)"));
 
 	}