candid type fixes

demergent-labs · Nov 2, 2023 · 9dbc653 · 9dbc653
1 parent 63cd7d5
commit 9dbc653
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/property_tests/arbitraries/candid/candid_arb.ts b/property_tests/arbitraries/candid/candid_arb.ts
@@ -1,8 +1,9 @@
 import fc from 'fast-check';
 import { deepEqual } from 'fast-equals';
+import { CandidType } from './candid_type_arb';
 
 // TODO we're thinking that Candid is not the best name for this. What is better?
-export type Candid<T> = {
+export type Candid<T extends CandidType> = {
     value: T;
     src: {
         candidType: string;
@@ -13,7 +14,7 @@ export type Candid<T> = {
     equals(a: T, b: T): boolean;
 };
 
-export const CandidArb = <T>(
+export const CandidArb = <T extends CandidType>(
     arb: fc.Arbitrary<T>,
     candidType: string,
     toLiteral: (value: T) => string,

diff --git a/property_tests/arbitraries/candid/candid_type_arb.ts b/property_tests/arbitraries/candid/candid_type_arb.ts
@@ -18,6 +18,8 @@ import { Float64Arb } from './primitive/floats/float64_arb';
 import { TextArb } from './primitive/text';
 import { BlobArb } from './constructed/blob_arb';
 import { Candid } from './candid_arb';
+import { Func } from './reference/func_arb';
+import { Opt } from './constructed/opt_arb';
 
 export type CandidType =
     | number
@@ -26,7 +28,9 @@ export type CandidType =
     | boolean
     | Principal
     | Uint8Array
-    | string;
+    | string
+    | Func
+    | Opt;
 
 /**
  * An arbitrary representing all possible Candid types.

diff --git a/property_tests/arbitraries/candid/constructed/opt_arb.ts b/property_tests/arbitraries/candid/constructed/opt_arb.ts
@@ -10,7 +10,7 @@ type Base = {
 
 type RecursiveOpt<T> = { base: T } | { nextLayer: RecursiveOpt<T> };
 
-export type Opt = [CandidType | Opt] | never[];
+export type Opt = [CandidType] | never[];
 
 // TODO look into making this recursive
 // TODO we need to add all constructed and reference types