Fix scan ordering bug and tendermint tests (#57)

* Fix scan ordering bug

* Also fix the tendermint tests

* Fix node version

Co-authored-by: Luke Wilson <[email protected]>

Author: lukedawilson

.github/workflows/main.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node: ['14.x']
+        node: ['18.x']
         os: [ubuntu-latest]
 
     steps:

src/backend/storage.ts

@@ -123,7 +123,7 @@ export class BasicKVIterStorage extends BasicKVStorage implements IIterStorage {
     }
 
     let data: Record[] = [];
-    for (const key of this.dict.keys()) {
+    for (const key of Array.from(this.dict.keys()).sort()) {
       if (start?.length && compare(start, fromBase64(key)) === 1) continue;
       if (end?.length && compare(fromBase64(key), end) > -1) break;
 

src/helpers/byte-array.ts

@@ -38,7 +38,7 @@ export function toByteArray(number: number, fixedLength?: number | undefined): U
   const bytesOriginal = fromHex(hex);
 
   if (!fixedLength) {
-    return bytesOriginal;
+    return new Uint8Array([...bytesOriginal]);
   }
 
   let bytesFixedLength = [...bytesOriginal];

test/integration/crypto-verify.test.ts

@@ -19,7 +19,7 @@ const mockEnv = {
   contract: {address: mockContractAddr}
 };
 
-const mockInfo: { sender: string, funds: { amount: string, denom: string }[] } = {
+const mockInfo = {
   sender: creator,
   funds: []
 };
@@ -124,7 +124,7 @@ describe('crypto-verify', () => {
     };
     const raw = wrapResult(vm.query(mockEnv, verify_msg)).unwrap();
     const res = parseBase64Response(raw);
-    // TODO: Still failing
+
     expect(res).toEqual({
       verifies: true,
     });
@@ -242,7 +242,7 @@ describe('crypto-verify', () => {
   it('tendermint_signature_verify_fails', async () => {
     vm.instantiate(mockEnv, mockInfo, {});
 
-    const message = testData.ED25519_MESSAGE_HEX;
+    const message = new Uint8Array([... testData.ED25519_MESSAGE_HEX]);
     message[0] ^= 0x01;
 
     const verify_msg = {

test/integration/queue.test.ts

@@ -148,27 +148,25 @@ describe('queue', () => {
     // Arrange
     vm.instantiate(mockEnv, mockInfo, {});
 
-    for (let i = 0; i < 3; i++) { // ToDo: iterate 37 (0x25) times (currently breaks when you do this)
+    for (let i = 0; i < 37; i++) {
       vm.execute(mockEnv, mockInfo, { enqueue: { value: 40 } });
     }
 
-    for (let i = 0; i < 2; i++) { // ToDo: iterate 25 (0x19) times (currently breaks when you do this)
+    for (let i = 0; i < 25; i++) {
       vm.execute(mockEnv, mockInfo, { dequeue: {} });
     }
 
     // Act
     const listResponse = vm.query(mockEnv, { list: {} });
 
     // Assert
+    const countResponse = vm.query(mockEnv, { count: {} });
+    expect(parseBase64OkResponse(countResponse)).toEqual({ count: 12 });
+
     const list = parseBase64OkResponse(listResponse);
     expect(list.empty).toStrictEqual([]);
-    expect(list.early).toStrictEqual([1]);
-    expect(list.late).toStrictEqual([]);
-
-    // ToDo: implement asserts from original rust test
-    // expect(list.empty).toStrictEqual([]);
-    // expect(list.early).toStrictEqual([25, 26, 27, 28, 29, 30, 31]);
-    // expect(list.late).toStrictEqual([32, 33, 34, 35, 36]);
+    expect(list.early).toStrictEqual([25, 26, 27, 28, 29, 30, 31]);
+    expect(list.late).toStrictEqual([32, 33, 34, 35, 36]);
   });
 
   it('query_open_iterators', async () => {