fix(types and tests): update evalTo to allow undefined sortKey and bl…

…ock and test that
ar-io · Mar 22, 2024 · a59f05c · a59f05c
1 parent 2867abc
commit a59f05c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/src/common.ts b/src/common.ts
@@ -59,7 +59,7 @@ export function isContractTxIdConfiguration(
 }
 
 export type EvaluationOptions = {
-  evalTo?: { sortKey: SortKey } | { blockHeight: BlockHeight };
+  evalTo?: { sortKey?: SortKey } | { blockHeight?: BlockHeight };
   // TODO: any other evaluation constraints
 };
 

diff --git a/src/common/contracts/warp-contract.ts b/src/common/contracts/warp-contract.ts
@@ -80,7 +80,7 @@ export class WarpContract<T> implements BaseContract<T>, ReadContract {
     let sortKeyOrBlockHeight: string | number | undefined;
     if (evalTo && 'sortKey' in evalTo) {
       sortKeyOrBlockHeight = evalTo.sortKey;
-    } else if (evalTo && 'blockHeight') {
+    } else if (evalTo && 'blockHeight' in evalTo) {
       sortKeyOrBlockHeight = evalTo.blockHeight;
     }
 

diff --git a/tests/ant.test.ts b/tests/ant.test.ts
@@ -41,7 +41,9 @@ describe('ANT contract apis', () => {
   });
 
   it.each([
+    [{ sortKey: undefined }],
     [{ sortKey: evaluateToSortKey.toString() }],
+    [{ blockHeight: undefined }],
     [{ blockHeight: evaluateToBlockHeight }],
   ])(
     `should get contract state with evaluation options: ${JSON.stringify('%s')}`,
@@ -52,7 +54,9 @@ describe('ANT contract apis', () => {
   );
 
   it.each([
+    [{ sortKey: undefined }],
     [{ sortKey: evaluateToSortKey.toString() }],
+    [{ blockHeight: undefined }],
     [{ blockHeight: evaluateToBlockHeight }],
   ])(`should get record: ${JSON.stringify('%s')}`, async (evalTo) => {
     const record = await ant.getRecord({
@@ -63,7 +67,9 @@ describe('ANT contract apis', () => {
   });
 
   it.each([
+    [{ sortKey: undefined }],
     [{ sortKey: evaluateToSortKey.toString() }],
+    [{ blockHeight: undefined }],
     [{ blockHeight: evaluateToBlockHeight }],
   ])(
     `should get records with evaluation options: ${JSON.stringify('%s')}`,
@@ -74,7 +80,9 @@ describe('ANT contract apis', () => {
   );
 
   it.each([
+    [{ sortKey: undefined }],
     [{ sortKey: evaluateToSortKey.toString() }],
+    [{ blockHeight: undefined }],
     [{ blockHeight: evaluateToBlockHeight }],
   ])(
     `should get owner with evaluation options: ${JSON.stringify('%s')}`,
@@ -85,7 +93,9 @@ describe('ANT contract apis', () => {
   );
 
   it.each([
+    [{ sortKey: undefined }],
     [{ sortKey: evaluateToSortKey.toString() }],
+    [{ blockHeight: undefined }],
     [{ blockHeight: evaluateToBlockHeight }],
   ])(
     `should get controllers with evaluation options: ${JSON.stringify('%s')}`,
@@ -98,7 +108,9 @@ describe('ANT contract apis', () => {
   );
 
   it.each([
+    [{ sortKey: undefined }],
     [{ sortKey: evaluateToSortKey.toString() }],
+    [{ blockHeight: undefined }],
     [{ blockHeight: evaluateToBlockHeight }],
   ])(
     `should get name with evaluation options: ${JSON.stringify('%s')}`,
@@ -109,7 +121,9 @@ describe('ANT contract apis', () => {
   );
 
   it.each([
+    [{ sortKey: undefined }],
     [{ sortKey: evaluateToSortKey.toString() }],
+    [{ blockHeight: undefined }],
     [{ blockHeight: evaluateToBlockHeight }],
   ])(
     `should get ticker with evaluation options: ${JSON.stringify('%s')}`,
@@ -120,7 +134,9 @@ describe('ANT contract apis', () => {
   );
 
   it.each([
+    [{ sortKey: undefined }],
     [{ sortKey: evaluateToSortKey.toString() }],
+    [{ blockHeight: undefined }],
     [{ blockHeight: evaluateToBlockHeight }],
   ])(
     `should get balances with evaluation options: ${JSON.stringify('%s')}`,
@@ -131,7 +147,9 @@ describe('ANT contract apis', () => {
   );
 
   it.each([
+    [{ sortKey: undefined }],
     [{ sortKey: evaluateToSortKey.toString() }],
+    [{ blockHeight: undefined }],
     [{ blockHeight: evaluateToBlockHeight }],
   ])(
     `should get balance with evaluation options: ${JSON.stringify('%s')}`,