[Fix] Switch to Buffer[], remove excess changetype()

jtenner · jtenner · commit 6f5f8aa718e8 · 2019-07-19T12:03:44.000-04:00
diff --git a/assembly/buffer/index.ts b/assembly/buffer/index.ts
@@ -12,12 +12,7 @@ export class Buffer extends Uint8Array {
     return new Buffer(size);
   }
 
-  public static concat<T>(items: T, length: i32): Buffer {
-    if (!isArray<T>()) {
-      ERROR("Buffer.concat<T> must accept an Array where T extends Array<Uint8Array | Buffer>");
-    }
-    assert(unchecked(items[0]) instanceof Uint8Array); // Can this be a static check?
-
+  public static concat(items: Buffer[], length: i32): Buffer {
     let size: usize = 0;
     let itemCount = usize(items.length);
     let itemsDataStart = items.dataStart;
@@ -34,7 +29,7 @@ export class Buffer extends Uint8Array {
     let result = changetype<Buffer>(__alloc(offsetof<Buffer>(), idof<Buffer>()));
 
     result.data = changetype<ArrayBuffer>(buffer);
-    result.dataStart = changetype<usize>(buffer);
+    result.dataStart = buffer;
     let start: usize = result.dataStart;
     for (let i: usize = 0; i < itemCount && size > 0; i++) {
       let item = load<usize>(itemsDataStart + (i << alignof<usize>()));
@@ -55,7 +50,7 @@ export class Buffer extends Uint8Array {
     // This retains the pointer to the result Buffer.
     let result = changetype<Buffer>(__alloc(offsetof<Buffer>(), idof<Buffer>()));
     result.data = changetype<ArrayBuffer>(buffer);
-    result.dataStart = changetype<usize>(buffer);
+    result.dataStart = buffer;
     result.dataLength = size;
     return result;
   }
diff --git a/tests/buffer.spec.ts b/tests/buffer.spec.ts
@@ -1,3 +1,9 @@
+function bufferFrom(values: i32[]): Buffer {
+  let buffer = new Buffer(values.length);
+  for (let i = 0; i < values.length; i++) buffer[i] = <u8>values[i];
+  return buffer;
+}
+
 /**
  * This is the buffer test suite. For each prototype function, put a single test
  * function call here.
@@ -9,8 +15,6 @@
  *   });
  * });
  */
-import { BLOCK_MAXSIZE } from "rt/common";
-
 describe("buffer", () => {
   test("#constructor", () => {
     expect<Buffer>(new Buffer(0)).toBeTruthy();
@@ -52,19 +56,12 @@ describe("buffer", () => {
       }
       list.push(buff);
     }
-    let actual: Buffer = Buffer.concat<Buffer[]>(list, 15);
+    let actual: Buffer = Buffer.concat(list, 15);
+
+    let expected: Buffer = bufferFrom([0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 3, 3, 4]);
 
-    let expected: Buffer = Buffer.alloc(15);
-    expected[5] = 1;
-    expected[6] = 1;
-    expected[7] = 1;
-    expected[8] = 1;
-    expected[9] = 2;
-    expected[10] = 2;
-    expected[11] = 2;
-    expected[12] = 3;
-    expected[13] = 3;
-    expected[14] = 4;
+    // TODO: When as-pect releases 2.2.1
+    // expect<Buffer>(actual).toStrictEqual(expected);
     expect<ArrayBuffer>(actual.buffer).toStrictEqual(expected.buffer);
   });
 });
