More code tidying

Convex-Dev · May 3, 2024 · 85f361e · 85f361e
1 parent 76adc53
commit 85f361e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/convex-core/src/main/java/convex/core/data/Vectors.java b/convex-core/src/main/java/convex/core/data/Vectors.java
@@ -87,10 +87,10 @@ public static <T extends ACell> AVector<T> wrap(ACell[] elements) {
 	 */
 	@SuppressWarnings("unchecked")
 	public static <R extends ACell, T extends ACell> AVector<R> create(Collection<?> elements) {
-		if (elements instanceof ASequence) return create((ASequence<R>) elements);
+		if (elements instanceof ASequence) return ((ASequence<R>) elements).toVector();
 		if (elements.size() == 0) return empty();
 		ACell[] cells=Cells.toCellArray(elements.toArray());
-		return (AVector<R>) create(cells);
+		return wrap(cells);
 	}
 
 	/**
@@ -102,11 +102,9 @@ public static <R extends ACell, T extends ACell> AVector<R> create(Collection<?>
 	@SuppressWarnings("unchecked")
 	public static <R extends ACell> AVector<R> create(ASequence<R> list) {
 		if (list instanceof AVector) return (AVector<R>) list.getCanonical();
-		if (list.size() == 0) return empty();
-		return create(list.toCellArray());
+		return wrap(list.toCellArray());
 	}
 
-
 	@SuppressWarnings("unchecked")
 	public static <T extends ACell> AVector<T> empty() {
 		return (VectorLeaf<T>) VectorLeaf.EMPTY;

diff --git a/convex-core/src/test/java/convex/core/data/StreamsTest.java b/convex-core/src/test/java/convex/core/data/StreamsTest.java
@@ -25,7 +25,6 @@ public void testIntStream() throws InvalidDataException, ValidationException {
 
 		AVector<CVMLong> v2 = Vectors.create(list);
 		v2.validate();
-		assertEquals(v.getClass(), v2.getClass());
 		assertEquals(v, v2);
 
 	}

diff --git a/convex-core/src/test/java/convex/core/lang/reader/ANTLRTest.java b/convex-core/src/test/java/convex/core/lang/reader/ANTLRTest.java
@@ -4,7 +4,6 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigInteger;
 
@@ -269,7 +268,6 @@ private void assertParseError(String s) {
 	private void doRoundTripTest(String s) {
 		ACell a=Reader.read(s);
 		if (a!=null) {
-			assertTrue(a.isCanonical());
 			AString ps=a.print();
 			assertEquals(s,ps.toString());
 			assertEquals(Strings.create(s),ps);