Tests for child node creation

Convex-Dev · Dec 21, 2023 · f6c5624 · f6c5624
1 parent 63ba128
commit f6c5624
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/convex-core/src/main/cvx/convex/registry.cvx b/convex-core/src/main/cvx/convex/registry.cvx
@@ -128,9 +128,9 @@
 				(recur (inc i) (first rec))	
 
 				;; need to construct a new CNS node
-				(let [] 
+				(let [nref (call ref (cns-create-node pname cont))] 
 				   (call ref (cns-write pname nref cont nil) )
-				   (recur (inc i) (call ref (cns-read pname)))))
+				   (recur (inc i) nref)))
 		 ))
 	  )
 	)
@@ -200,6 +200,19 @@
                 path
                 [addr monitor meta])))))
 
+(defn cns-create-node
+	^{:callable? true
+	  :doc {:description "Creates a child CNS node."
+			:examples    [{:code "(call [cns-node cns-key] (cns-create-node \\\"child-name\\\"))"}]
+			:signature   [{:params [sym]}]}}
+	[pname owner]
+	(or (trust/trusted? (get cns-owners *scope*) *caller* :create pname) (fail :TRUST "No permission to create CNS node"))
+	(let [path (conj *scope* pname)]
+	  (if (get cns-database path) (fail :STATE "CNS node already exists"))
+	  (set-in! cns-owners [path] owner)
+	  (set-in! cns-database [path] {})
+	  [~*address* path]))
+
 (defn cns-read
 	^{:callable? true
 	  :doc {:description "Reads a child CNS record from this CNS node. Assumes a record key passed in *scope*."

diff --git a/convex-core/src/main/cvx/convex/trust/monitors.cvx b/convex-core/src/main/cvx/convex/trust/monitors.cvx
@@ -36,6 +36,9 @@
 (defn all [arg & more]
   [~*address* [:all (apply vector arg more)]])
 
+(defn everyone []
+  [~*address* [:all []]])
+
 (defn before [end]
   [~*address* [:time [*timestamp* (int end)]]])
 

diff --git a/convex-core/src/test/java/convex/lib/CNSTest.java b/convex-core/src/test/java/convex/lib/CNSTest.java
@@ -37,13 +37,19 @@ public class CNSTest extends ACVMTest {
 			assertEquals(eval("[#1 #1 nil]"), eval("(*registry*/read 'init)"));
 		}
 
-
+		@Test public void testCreateFromTop() {
+			Context ctx=context().forkWithAddress(Init.INIT_ADDRESS);
+			ctx=(step(ctx,"(*registry*/create 'foo.bar.bax #17)"));
+			assertNotError(ctx);
+		}
+
 		@Test public void testCreateTopLevel() {
 			// 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.INIT_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\"]])");
@@ -62,8 +68,6 @@ public class CNSTest extends ACVMTest {
 			assertTrustError(step(ictx,"(*registry*/create 'foo *address* *address* {})"));
 			assertTrustError(step(ictx,"(trust/change-control "+ref+" *address*)"));
 
-			ictx=ictx.forkWithAddress(Init.INIT_ADDRESS);
-			ictx=(step(ictx,"(trust/change-control ref "+HERO+")"));
 		}
 
 	}