Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: search all levels of struct nesting before codegenning primitive types #3970

Merged
merged 4 commits into from
Jan 8, 2024
Merged

fix: search all levels of struct nesting before codegenning primitive types #3970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
082d3c8
fix: search all levels of struct nesting before codegenning primitive…
TomAFrench Jan 5, 2024
8a8dda9
Merge branch 'master' into tf/fix-primitive-type-gen
TomAFrench Jan 8, 2024
8e6c2c1
chore: update tests
TomAFrench Jan 8, 2024
6be11ac
Merge branch 'master' into tf/fix-primitive-type-gen
kevaundray Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tooling/noir_codegen/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ crs
lib

test/codegen
test/test_lib/export
4 changes: 2 additions & 2 deletions tooling/noir_codegen/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ export const codegen = (programs: [string, CompiledCircuit][]): string => {
functions.push(codegenFunction(name, stripUnwantedFields(program), function_sig));
}

const structTypeDefinitions: string = codegenStructDefinitions(structTypeMap, primitiveTypeMap);

// Add the primitive Noir types that do not have a 1-1 mapping to TypeScript.
const primitiveTypeAliases: string[] = [];
for (const value of primitiveTypeMap.values()) {
primitiveTypeAliases.push(`export type ${value.aliasName} = ${value.tsType};`);
}

const structTypeDefinitions: string = codegenStructDefinitions(structTypeMap, primitiveTypeMap);

results = results.concat(...primitiveTypeAliases, '', structTypeDefinitions, ...functions);

return results.join('\n');
Expand Down
8 changes: 4 additions & 4 deletions tooling/noir_codegen/test/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { expect } from 'chai';
import { exported_function_foo, MyStruct, u64, ForeignCallHandler } from './codegen/index.js';

it('codegens a callable function', async () => {
const my_struct = { foo: true, bar: ['12345', '12345', '12345'] };
const my_struct = { foo: true, bar: ['12345', '12345', '12345'], baz: '0x00' };

const [sum, constant, struct]: [u64, u64, MyStruct] = await exported_function_foo(
'2',
Expand All @@ -20,7 +20,7 @@ it('codegens a callable function', async () => {

expect(sum).to.be.eq('0x05');
expect(constant).to.be.eq('0x03');
expect(struct).to.be.deep.eq({ foo: true, bar: ['12345', '12345', '12345'] });
expect(struct).to.be.deep.eq(my_struct);
});

it('allows passing a custom foreign call handler', async () => {
Expand All @@ -35,7 +35,7 @@ it('allows passing a custom foreign call handler', async () => {
return [];
};

const my_struct = { foo: true, bar: ['12345', '12345', '12345'] };
const my_struct = { foo: true, bar: ['12345', '12345', '12345'], baz: '0x00' };

const [sum, constant, struct]: [u64, u64, MyStruct] = await exported_function_foo(
'2',
Expand Down Expand Up @@ -102,5 +102,5 @@ it('allows passing a custom foreign call handler', async () => {

expect(sum).to.be.eq('0x05');
expect(constant).to.be.eq('0x03');
expect(struct).to.be.deep.eq({ foo: true, bar: ['12345', '12345', '12345'] });
expect(struct).to.be.deep.eq(my_struct);
});
1 change: 1 addition & 0 deletions tooling/noir_codegen/test/test_lib/src/lib.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
struct MyStruct {
foo: bool,
bar: [str<5>; 3],
baz: Field
}

struct NestedStruct {
Expand Down
Loading