test: add indent utility to store contracts in code

Author: davidyuk

test/integration/AeSdkMethods.ts

@@ -1,7 +1,7 @@
 import { describe, it, before } from 'mocha';
 import { expect } from 'chai';
 import { getSdk } from '.';
-import { assertNotNull, ensureInstanceOf } from '../utils';
+import { assertNotNull, ensureInstanceOf, indent } from '../utils';
 import { AeSdkMethods, AccountBase, MemoryAccount, Contract } from '../../src';
 
 describe('AeSdkMethods', () => {
@@ -28,7 +28,9 @@ describe('AeSdkMethods', () => {
   it('created contract remains connected to sdk', async () => {
     const contract = await Contract.initialize({
       ...aeSdkMethods.getContext(),
-      sourceCode: '' + 'contract Identity =\n' + '  entrypoint getArg(x : int) = x',
+      sourceCode: indent`
+        contract Identity =
+          entrypoint getArg(x : int) = x`,
     });
     expect(contract.$options.onAccount?.address).to.be.eql(accounts[0].address);
     [, aeSdkMethods._options.onAccount] = accounts;

test/integration/Middleware.ts

@@ -383,7 +383,7 @@ describe('Middleware API', () => {
               blockHash: 'mh_zmcTZSgZcuQ9fL6h6iNNp3ftFvbQ2FjtgPHg9qEHgbwyqFFpi',
               localIdx: 0,
               callTxHash: 'th_2cNd6j4CtZYaY6F6AWNbYDXZGkaQbaAjjjtBiLATiaiXJ1P812',
-              contractTxHash: 'th_giDXk5C5Fmvec2yBDEmSn74ZnKCMJv1Nso6uaSbfTup1xSx2Y',
+              contractTxHash: 'th_2TzSqAuvAAEVFpucVgEALitxyJSJCBsR3RbxpSzPhbYbaasXBb',
               internalTx: {
                 amount: 42,
                 fee: 0,
@@ -422,7 +422,7 @@ describe('Middleware API', () => {
               blockTime: new Date(1721968249016),
               eventHash: 'KGBGHR0NTNENA10FD9MJS5P39C1LD4T9AUBIPIDL772714A57HH0====',
               callTxHash: 'th_2cNd6j4CtZYaY6F6AWNbYDXZGkaQbaAjjjtBiLATiaiXJ1P812',
-              contractTxHash: 'th_giDXk5C5Fmvec2yBDEmSn74ZnKCMJv1Nso6uaSbfTup1xSx2Y',
+              contractTxHash: 'th_2TzSqAuvAAEVFpucVgEALitxyJSJCBsR3RbxpSzPhbYbaasXBb',
               microIndex: 0,
               extCallerContractId: null,
               extCallerContractTxHash: null,
@@ -448,7 +448,7 @@ describe('Middleware API', () => {
           abi_version: 3,
           amount: 100,
           call_data: 'cb_KxFE1kQfP4oEp9E=',
-          code: 'cb_+QEcRgOg8gEtln8gPwqlcH3Rv3q+KpWksD0m4iwiqY18jtURGonAuO+4wf5E1kQfADcANwAaDoI/AQM//mWl4A8CNwGHAjcBBzcCdwc3AAg9AAIERjYAAABiL1+fAYEFPg9NJAu8Y6cqlt/F0eAzEdVzQbFz6kWUaMkB2l2DOwABAz9GNgAAAEY2AgACYi4AnwGBpBcI7Bft3XUED2ptPhcjSwNWk6lXlyzJtTnEcJFFPGICAQM//pdbzNwANwFHADcADAOvggECASstdGVzdC1zdHJpbmdWAgMRZaXgDw8Cb4Imz2UNAFQBAz+oLwMRRNZEHxFpbml0EWWl4A8tQ2hhaW4uZXZlbnQRl1vM3BVzcGVuZIIvAIU4LjAuMABElFo5',
+          code: 'cb_+QEcRgOgzPAt3CM1MXJqVKUexArUzQqzhuZqPx4w8pc2S1dcOHXAuO+4wf5E1kQfADcANwAaDoI/AQM//mWl4A8CNwGHAjcBBzcCdwc3AAg9AAIERjYAAABiL1+fAYEFPg9NJAu8Y6cqlt/F0eAzEdVzQbFz6kWUaMkB2l2DOwABAz9GNgAAAEY2AgACYi4AnwGBpBcI7Bft3XUED2ptPhcjSwNWk6lXlyzJtTnEcJFFPGICAQM//pdbzNwANwFHADcADAOvggECASstdGVzdC1zdHJpbmdWAgMRZaXgDw8Cb4Imz2UNAFQBAz+oLwMRRNZEHxFpbml0EWWl4A8tQ2hhaW4uZXZlbnQRl1vM3BVzcGVuZIIvAIU4LjAuMAAyWaKG',
           deposit: 0,
           fee: 82160000000000,
           gas: 76,
@@ -459,7 +459,7 @@ describe('Middleware API', () => {
           vm_version: 8,
         },
         aexnType: null,
-        sourceTxHash: 'th_giDXk5C5Fmvec2yBDEmSn74ZnKCMJv1Nso6uaSbfTup1xSx2Y',
+        sourceTxHash: 'th_2TzSqAuvAAEVFpucVgEALitxyJSJCBsR3RbxpSzPhbYbaasXBb',
         sourceTxType: 'ContractCreateTx',
       };
       copyFields(expectedRes, res, ['blockHash']);

test/integration/account-generalized.ts

@@ -15,9 +15,10 @@ import {
   Encoded,
   ArgumentError,
 } from '../../src';
-import { ensureEqual } from '../utils';
+import { ensureEqual, indent } from '../utils';
 
-const sourceCode = `contract BlindAuth =
+const sourceCode = `
+contract BlindAuth =
   record state = { txHash: option(hash) }
   entrypoint init() : state = { txHash = None }
 
@@ -172,14 +173,13 @@ describe('Generalized Account', () => {
       setState: (value: number) => void;
     }>({
       ...aeSdk.getContext(),
-      sourceCode:
-        '' +
-        'contract Stateful =\n' +
-        '  record state = { value: int }\n' +
-        '  entrypoint init(_value: int) : state = { value = _value }\n' +
-        '  entrypoint getState(): int = state.value\n' +
-        '  stateful entrypoint setState(_value: int): unit =\n' +
-        '    put(state{ value = _value })',
+      sourceCode: indent`
+        contract Stateful =
+          record state = { value: int }
+          entrypoint init(_value: int) : state = { value = _value }
+          entrypoint getState(): int = state.value
+          stateful entrypoint setState(_value: int): unit =
+            put(state{ value = _value })`,
     });
     await contract.$deploy([42], { authData: { sourceCode, args: [genSalt()] } });
     expect((await contract.getState()).decodedResult).to.be.equal(42);

test/integration/aens.ts

@@ -2,7 +2,7 @@ import { describe, it, before } from 'mocha';
 import { expect } from 'chai';
 import { RestError } from '@azure/core-rest-pipeline';
 import { getSdk, isLimitedCoins, timeoutBlock } from '.';
-import { assertNotNull, ensureEqual, randomName, randomString } from '../utils';
+import { assertNotNull, ensureEqual, indent, randomName, randomString } from '../utils';
 import {
   AeSdk,
   Name,
@@ -218,7 +218,9 @@ describe('Aens', () => {
   });
 
   it('calls contract using AENS name', async () => {
-    const sourceCode = 'contract Identity =' + '  entrypoint getArg(x : int) = x';
+    const sourceCode = indent`
+      contract Identity =
+        entrypoint getArg(x : int) = x`;
     interface ContractApi extends ContractMethodsBase {
       getArg: (x: number) => bigint;
     }

test/integration/chain.ts

@@ -3,7 +3,7 @@ import { expect } from 'chai';
 import { stub } from 'sinon';
 import { getSdk, timeoutBlock } from '.';
 import { AeSdk, Tag, MemoryAccount, Encoded, Node, Contract } from '../../src';
-import { assertNotNull, bindRequestCounter } from '../utils';
+import { assertNotNull, bindRequestCounter, indent } from '../utils';
 
 describe('Node Chain', () => {
   let aeSdk: AeSdk;
@@ -190,7 +190,9 @@ describe('Node Chain', () => {
   it('multiple contract dry-runs calls at one request', async () => {
     const contract = await Contract.initialize<{ foo: (x: number) => bigint }>({
       ...aeSdk.getContext(),
-      sourceCode: 'contract Test =\n' + '  entrypoint foo(x : int) = x * 100',
+      sourceCode: indent`
+        contract Test =
+          entrypoint foo(x : int) = x * 100`,
     });
     await contract.$deploy([]);
     const { result } = await contract.foo(5);

test/integration/compiler.ts

@@ -11,6 +11,7 @@ import {
   getFileSystem,
   Encoded,
 } from '../../src';
+import { indent } from '../utils';
 
 function testCompiler(compiler: CompilerBase): void {
   const inclSourceCodePath = './test/integration/contracts/Includes.aes';
@@ -94,36 +95,38 @@ function testCompiler(compiler: CompilerBase): void {
 
   it('throws clear exception if compile broken contract', async () => {
     await expect(
-      compiler.compileBySourceCode(
-        'contract Foo =\n' +
-          '  entrypoint getArg(x : bar) = x\n' +
-          '  entrypoint getArg(x : int) = baz\n' +
-          '  entrypoint getArg1(x : int) = baz\n',
-      ),
+      compiler.compileBySourceCode(indent`
+        contract Foo =
+          entrypoint getArg(x : bar) = x
+          entrypoint getArg(x : int) = baz
+          entrypoint getArg1(x : int) = baz`),
     ).to.be.rejectedWith(
       CompilerError,
       compiler instanceof CompilerCli
         ? /Command failed: escript .+[\\/]bin[\\/]aesophia_cli(_8)?( --create_json_aci)? .+\.aes( --no_warning all)?\nType error( in '.+\.aes')? at line 3, col 3:\nDuplicate definitions of `getArg` at\n {2}- line 2, column 3\n {2}- line 3, column 3\n\n/m
-        : 'compile error:\n' +
-            'type_error:3:3: Duplicate definitions of `getArg` at\n' +
-            '  - line 2, column 3\n' +
-            '  - line 3, column 3\n' +
-            'type_error:3:32: Unbound variable `baz`\n' +
-            'type_error:4:33: Unbound variable `baz`',
+        : indent`
+            compile error:
+            type_error:3:3: Duplicate definitions of \`getArg\` at
+              - line 2, column 3
+              - line 3, column 3
+            type_error:3:32: Unbound variable \`baz\`
+            type_error:4:33: Unbound variable \`baz\``,
     );
   });
 
   it('returns warnings', async () => {
     const { warnings } = await compiler.compileBySourceCode(
-      'include "./lib/Library.aes"\n' +
-        '\n' +
-        'main contract Foo =\n' +
-        '  entrypoint getArg(x: int) =\n' +
-        '    let t = 42\n' +
-        '    x\n',
+      indent`
+        include "./lib/Library.aes"
+
+        main contract Foo =
+          entrypoint getArg(x: int) =
+            let t = 42
+            x`,
       {
-        './lib/Library.aes':
-          '' + 'contract Library =\n' + '  entrypoint getArg() =\n' + '    1 / 0\n',
+        './lib/Library.aes': indent`
+          contract Library =
+            entrypoint getArg() = 1 / 0`,
       },
     );
     expect(warnings).to.eql([
@@ -133,7 +136,7 @@ function testCompiler(compiler: CompilerBase): void {
       },
       {
         message: 'Division by zero.',
-        pos: { file: './lib/Library.aes', col: 5, line: 3 },
+        pos: { file: './lib/Library.aes', col: 25, line: 2 },
       },
     ]);
   });
@@ -183,11 +186,15 @@ describe('CompilerHttp', () => {
     it('reads file system', async () => {
       expect(await getFileSystem('./test/integration/contracts/Includes.aes')).to.be.eql({
         './lib/Library.aes':
-          'include"lib/Sublibrary.aes"\n\n' +
-          'namespace Library =\n' +
-          '  function sum(x: int, y: int): int = Sublibrary.sum(x, y)\n',
+          indent`
+          include"lib/Sublibrary.aes"
+
+          namespace Library =
+            function sum(x: int, y: int): int = Sublibrary.sum(x, y)` + '\n',
         'lib/Sublibrary.aes':
-          'namespace Sublibrary =\n' + '  function sum(x: int, y: int): int = x + y\n',
+          indent`
+          namespace Sublibrary =
+            function sum(x: int, y: int): int = x + y` + '\n',
       });
     });
   });