Skip to content

Commit

Permalink
lowercase candidDefinitionArb
Browse files Browse the repository at this point in the history
  • Loading branch information
bdemann committed Dec 6, 2023
1 parent 22ad557 commit b220700
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,12 @@ import {
TupleCandidDefinition,
VariantCandidDefinition,
VecCandidDefinition,
CandidDefinitionArb as CoolThing,
CandidDefinitionArb
} from './types';
import { BlobDefinitionArb } from '../constructed/blob_arb/definition_arb';
import { recursiveOptions } from '../recursive';

export function CandidDefinitionArb(): CandidDefinitionArb {
export function candidDefinitionArb(): CandidDefinitionArb {
return fc.letrec((tie) => ({
CandidDefinition: fc.oneof(
BlobDefinitionArb(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { CandidDefinitionArb } from '../../candid_definition_arb/types';
import { OptDefinitionArb } from './definition_arb';
import { OptValuesArb } from './values_arb';
import { CandidValueAndMetaArbGenerator } from '../../candid_value_and_meta_arb_generator';
import { CandidDefinitionArb as candidDefinitionArb } from '../../candid_definition_arb';
import { candidDefinitionArb } from '../../candid_definition_arb';
import { CorrespondingJSType } from '../../corresponding_js_type';

export type Opt = [CorrespondingJSType] | never[];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
import fc from 'fast-check';

import { CandidValueAndMeta } from '../../candid_value_and_meta_arb';
import {
CandidDefinition,
CandidDefinitionArb
} from '../../candid_definition_arb/types';
import { CandidDefinitionArb } from '../../candid_definition_arb/types';
import { RecordDefinitionArb } from './definition_arb';
import { RecordValuesArb } from './values_arb';
import { CandidValueAndMetaArbGenerator } from '../../candid_value_and_meta_arb_generator';
import { CorrespondingJSType } from '../../corresponding_js_type';
import { CandidDefinitionArb as candidDefinitionArb } from '../../candid_definition_arb';
import { candidDefinitionArb } from '../../candid_definition_arb';

export type Record = {
[x: string]: CorrespondingJSType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CorrespondingJSType } from '../../corresponding_js_type';
import { CandidDefinitionArb } from '../../candid_definition_arb';
import { candidDefinitionArb } from '../../candid_definition_arb';
import { CandidValueAndMeta } from '../../candid_value_and_meta_arb';
import { CandidDefinition } from '../../candid_definition_arb/types';
import { TupleDefinitionArb } from './definition_arb';
Expand All @@ -11,10 +11,10 @@ export type Tuple = CorrespondingJSType[];
export type ReturnTuple = Tuple | {};

export function TupleArb(
candidDefinitionArb: fc.Arbitrary<CandidDefinition> = CandidDefinitionArb()
fieldCandidDefinitionArb: fc.Arbitrary<CandidDefinition> = candidDefinitionArb()
): fc.Arbitrary<CandidValueAndMeta<Tuple, ReturnTuple>> {
return CandidValueAndMetaArbGenerator(
TupleDefinitionArb(candidDefinitionArb),
TupleDefinitionArb(fieldCandidDefinitionArb),
TupleValuesArb
);
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fc from 'fast-check';

import { CandidDefinitionArb } from '../../candid_definition_arb';
import { candidDefinitionArb } from '../../candid_definition_arb';
import { CorrespondingJSType } from '../../corresponding_js_type';
import { CandidValueAndMeta } from '../../candid_value_and_meta_arb';
import { CandidDefinition } from '../../candid_definition_arb/types';
Expand All @@ -13,10 +13,10 @@ export type Variant = {
};

export function VariantArb(
candidDefinitionArb: fc.Arbitrary<CandidDefinition> = CandidDefinitionArb()
fieldCandidDefinitionArb: fc.Arbitrary<CandidDefinition> = candidDefinitionArb()
): fc.Arbitrary<CandidValueAndMeta<Variant>> {
return CandidValueAndMetaArbGenerator(
VariantDefinitionArb(candidDefinitionArb),
VariantDefinitionArb(fieldCandidDefinitionArb),
VariantValuesArb
);
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fc from 'fast-check';

import { CandidDefinitionArb } from '../../candid_definition_arb';
import { candidDefinitionArb } from '../../candid_definition_arb';
import { CorrespondingJSType } from '../../corresponding_js_type';
import { CandidValueAndMeta } from '../../candid_value_and_meta_arb';
import { CandidDefinition } from '../../candid_definition_arb/types';
Expand All @@ -20,10 +20,10 @@ export type Vec =
| BigInt64Array;

export function VecArb(
candidDefinitionArb: fc.Arbitrary<CandidDefinition> = CandidDefinitionArb()
elementCandidDefinitionArb: fc.Arbitrary<CandidDefinition> = candidDefinitionArb()
): fc.Arbitrary<CandidValueAndMeta<Vec>> {
return CandidValueAndMetaArbGenerator(
VecDefinitionArb(candidDefinitionArb),
VecDefinitionArb(elementCandidDefinitionArb),
VecValuesArb
);
}
2 changes: 1 addition & 1 deletion property_tests/arbitraries/candid/recursive/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
import { RecursiveDefinitionArb } from './definition_arb';
import { RecursiveValuesArb } from './values_arb';
import { CandidValueAndMetaArbGenerator } from '../candid_value_and_meta_arb_generator';
import { CandidDefinitionArb as candidDefinitionArb } from '../candid_definition_arb';
import { candidDefinitionArb } from '../candid_definition_arb';

export const recursiveShapes: { [key: string]: RecursiveGlobalDefinition } = {};
export const recursiveOptions: RecursiveCandidDefinition[] = [];
Expand Down
6 changes: 3 additions & 3 deletions property_tests/arbitraries/candid/reference/func_arb/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fc from 'fast-check';
import { Principal } from '@dfinity/principal';

import { CandidDefinitionArb } from '../../candid_definition_arb';
import { candidDefinitionArb } from '../../candid_definition_arb';
import { CandidValueAndMeta } from '../../candid_value_and_meta_arb';
import { CandidDefinition } from '../../candid_definition_arb/types';
import { FuncDefinitionArb } from './definition_arb';
Expand All @@ -11,10 +11,10 @@ import { CandidValueAndMetaArbGenerator } from '../../candid_value_and_meta_arb_
export type Func = [Principal, string];

export function FuncArb(
candidDefinitionArb: fc.Arbitrary<CandidDefinition> = CandidDefinitionArb()
innerCandidDefinitionArb: fc.Arbitrary<CandidDefinition> = candidDefinitionArb()
): fc.Arbitrary<CandidValueAndMeta<Func>> {
return CandidValueAndMetaArbGenerator(
FuncDefinitionArb(candidDefinitionArb),
FuncDefinitionArb(innerCandidDefinitionArb),
FuncValueArb
);
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fc from 'fast-check';
import { Principal } from '@dfinity/principal';

import { CandidDefinitionArb } from '../../candid_definition_arb';
import { candidDefinitionArb } from '../../candid_definition_arb';
import { CandidValueAndMeta } from '../../candid_value_and_meta_arb';
import { CandidDefinition } from '../../candid_definition_arb/types';
import { ServiceValueArb } from './values_arb';
Expand All @@ -21,10 +21,10 @@ import { CandidValueAndMetaArbGenerator } from '../../candid_value_and_meta_arb_
// });

export function ServiceArb(
candidDefinitionArb: fc.Arbitrary<CandidDefinition> = CandidDefinitionArb()
innerCandidDefinitionArb: fc.Arbitrary<CandidDefinition> = candidDefinitionArb()
): fc.Arbitrary<CandidValueAndMeta<Principal>> {
return CandidValueAndMetaArbGenerator(
ServiceDefinitionArb(candidDefinitionArb),
ServiceDefinitionArb(innerCandidDefinitionArb),
ServiceValueArb
);
}

0 comments on commit b220700

Please sign in to comment.