refactor: testgen and tests

Author: PacificYield

contracts/codegen/common.ts

@@ -178,7 +178,7 @@ export enum OperatorArguments {
  * Enum representing the possible return types.
  */
 export enum ReturnType {
-  Uint,
+  Euint,
   Ebool,
 }
 

contracts/codegen/generateOverloads.ts

@@ -1,12 +1,18 @@
 import { mkdirSync, writeFileSync } from 'fs';
+import path from 'path';
 
 import { validateFHETypes, validateOperators } from './common';
+import { generateOverloads } from './generateOverloads';
 import { ALL_OPERATORS } from './operators';
 import operatorsPrices from './operatorsPrices.json';
 import { generateSolidityFHEGasLimit } from './payments';
 import { generateSolidityImplLib, generateSolidityTFHELibAndOverloads } from './templates';
-import { generateSolidityOverloads } from './templates-testgen';
-import { generateSolidityUnitTestContracts, generateTypeScriptTestCode, splitOverloadsToShards } from './testgen';
+import {
+  generateSolidityOverloadTestFiles,
+  generateSolidityUnitTestContracts,
+  generateTypeScriptTestCode,
+  splitOverloadsToShards,
+} from './testgen';
 import { ALL_FHE_TYPES } from './types';
 
 /**
@@ -36,9 +42,15 @@ function generateAllFiles() {
   writeFileSync('lib/TFHE.sol', tfheSolSource);
   writeFileSync('contracts/FHEGasLimit.sol', generateSolidityFHEGasLimit(operatorsPrices));
 
-  /// Generate unit test files.
-  const overloads = generateSolidityOverloads(ALL_OPERATORS, ALL_FHE_TYPES);
-  const overloadShards = splitOverloadsToShards(overloads);
+  // TODO: For now, the testgen only supports automatically generated tests for euintXX.
+  /// Generate overloads, split them into shards, and generate Solidity contracts to be used for TypeScript unit test files.
+  writeFileSync(
+    `${path.resolve(__dirname)}/overloads.json`,
+    JSON.stringify(generateOverloads(ALL_FHE_TYPES), (_key, value) =>
+      typeof value === 'bigint' ? value.toString() : value,
+    ),
+  );
+  const overloadShards = splitOverloadsToShards(generateSolidityOverloadTestFiles(ALL_OPERATORS, ALL_FHE_TYPES));
   mkdirSync('contracts/tests', { recursive: true });
   overloadShards.forEach((os) => {
     writeFileSync(`examples/tests/TFHETestSuite${os.shardNumber}.sol`, generateSolidityUnitTestContracts(os));

contracts/codegen/main.ts

@@ -22,15 +22,15 @@ export const ALL_OPERATORS: Operator[] = [
     hasScalar: true,
     hasEncrypted: true,
     arguments: OperatorArguments.Binary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     fheLibName: 'fheAdd',
   },
   {
     name: 'sub',
     hasScalar: true,
     hasEncrypted: true,
     arguments: OperatorArguments.Binary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     leftScalarEncrypt: true,
     fheLibName: 'fheSub',
   },
@@ -39,15 +39,15 @@ export const ALL_OPERATORS: Operator[] = [
     hasScalar: true,
     hasEncrypted: true,
     arguments: OperatorArguments.Binary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     fheLibName: 'fheMul',
   },
   {
     name: 'div',
     hasScalar: true,
     hasEncrypted: false,
     arguments: OperatorArguments.Binary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     leftScalarDisable: true,
     fheLibName: 'fheDiv',
   },
@@ -56,7 +56,7 @@ export const ALL_OPERATORS: Operator[] = [
     hasScalar: true,
     hasEncrypted: false,
     arguments: OperatorArguments.Binary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     leftScalarDisable: true,
     fheLibName: 'fheRem',
   },
@@ -65,31 +65,31 @@ export const ALL_OPERATORS: Operator[] = [
     hasScalar: true,
     hasEncrypted: true,
     arguments: OperatorArguments.Binary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     fheLibName: 'fheBitAnd',
   },
   {
     name: 'or',
     hasScalar: true,
     hasEncrypted: true,
     arguments: OperatorArguments.Binary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     fheLibName: 'fheBitOr',
   },
   {
     name: 'xor',
     hasScalar: true,
     hasEncrypted: true,
     arguments: OperatorArguments.Binary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     fheLibName: 'fheBitXor',
   },
   {
     name: 'shl',
     hasScalar: true,
     hasEncrypted: true,
     arguments: OperatorArguments.Binary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     leftScalarEncrypt: true,
     shiftOperator: true,
     fheLibName: 'fheShl',
@@ -99,7 +99,7 @@ export const ALL_OPERATORS: Operator[] = [
     hasScalar: true,
     hasEncrypted: true,
     arguments: OperatorArguments.Binary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     leftScalarEncrypt: true,
     shiftOperator: true,
     fheLibName: 'fheShr',
@@ -109,7 +109,7 @@ export const ALL_OPERATORS: Operator[] = [
     hasScalar: true,
     hasEncrypted: true,
     arguments: OperatorArguments.Binary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     leftScalarEncrypt: true,
     rotateOperator: true,
     fheLibName: 'fheRotl',
@@ -119,7 +119,7 @@ export const ALL_OPERATORS: Operator[] = [
     hasScalar: true,
     hasEncrypted: true,
     arguments: OperatorArguments.Binary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     leftScalarEncrypt: true,
     rotateOperator: true,
     fheLibName: 'fheRotr',
@@ -181,31 +181,31 @@ export const ALL_OPERATORS: Operator[] = [
     hasScalar: true,
     hasEncrypted: true,
     arguments: OperatorArguments.Binary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     fheLibName: 'fheMin',
   },
   {
     name: 'max',
     hasScalar: true,
     hasEncrypted: true,
     arguments: OperatorArguments.Binary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     fheLibName: 'fheMax',
   },
   {
     name: 'neg',
     hasScalar: true,
     hasEncrypted: true,
     arguments: OperatorArguments.Unary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     fheLibName: 'fheNeg',
   },
   {
     name: 'not',
     hasScalar: true,
     hasEncrypted: true,
     arguments: OperatorArguments.Unary,
-    returnType: ReturnType.Uint,
+    returnType: ReturnType.Euint,
     fheLibName: 'fheNot',
   },
 ];