[NONEVM-2276] TS tests Timelock Execute (#100)

Author: patricios-space

contracts/tests/mcms/BaseTest.ts

@@ -44,7 +44,7 @@ export interface TestContracts {
 
 export class BaseTestSetup {
   static readonly MIN_DELAY = 24n * 60n * 60n * 7n
-  static readonly DONE_TIMESTAMP = 1
+  static readonly DONE_TIMESTAMP = 1n
   static readonly NO_PREDECESSOR = 0n
   static readonly EMPTY_SALT = 0n
 
@@ -190,9 +190,9 @@ export class BaseTestSetup {
   /**
    * Setup the call proxy contract
    */
-  async setupCallProxyContract(): Promise<void> {
+  async setupCallProxyContract(testId: string): Promise<void> {
     const data = {
-      id: crc32('mcms.call-proxy.test-integration'),
+      id: crc32(`mcms.call-proxy.${testId}`),
       target: this.bind.timelock.address,
     }
     this.bind.callProxy = this.blockchain.openContract(
@@ -203,9 +203,9 @@ export class BaseTestSetup {
   /**
    * Setup the counter contract
    */
-  async setupCounterContract(): Promise<void> {
+  async setupCounterContract(testId: string): Promise<void> {
     const data = {
-      id: crc32('mcms.counter.test-integration'),
+      id: crc32(`mcms.counter.${testId}`),
       value: 0,
       ownable: {
         owner: this.bind.timelock.address,
@@ -239,15 +239,29 @@ export class BaseTestSetup {
     expect(await this.bind.ac.getRoleAdmin(rbactl.roles.admin)).toEqual(rbactl.roles.admin)
   }
 
+  // TODO
+  // deployCallProxyContract() {
+  //   const body = callproxy.builder.message.topUp.encode({ queryId: 1n })
+  //   return this.bind.callProxy.sendInternal(this.acc.deployer.getSender(), toNano('0.05'), body)
+  // }
+
+  deployCounterContract() {
+    // const body = counter.builder.message.topUp.encode({ queryId: 1n }) // TODO use TopUp after it is implemented
+    const body = beginCell().endCell()
+    return this.bind.counter.sendInternal(this.acc.deployer.getSender(), toNano('0.05'), body)
+  }
+
   /**
    * Complete setup for all contracts - convenience method that combines all setup steps
    */
   async setupAll(testId: string): Promise<void> {
     await this.initializeBlockchain()
     await this.setupTimelockContract(testId)
-    await this.setupCallProxyContract()
-    await this.setupCounterContract()
     await this.deployTimelockContract()
+    await this.setupCallProxyContract(testId)
+    // await this.deployCallProxyContract()
+    await this.setupCounterContract(testId)
+    await this.deployCounterContract()
   }
 
   /**

contracts/tests/mcms/RBACTimelock.spec.ts

@@ -6,6 +6,7 @@ import '@ton/test-utils'
 import * as rbactl from '../../wrappers/mcms/RBACTimelock'
 import * as ac from '../../wrappers/lib/access/AccessControl'
 import { crc32 } from 'zlib'
+import { asSnakeData } from '../../utils'
 
 describe('RBACTimelock', () => {
   let code: Cell
@@ -371,12 +372,15 @@ describe('RBACTimelock', () => {
     const targetAccount = deployer.address
     const msgToSend = beginCell().endCell()
 
-    const op = {
-      calls: rbactl.builder.data.call.encode({
+    const calls = [
+      {
         target: targetAccount,
         value: tonValue,
         data: msgToSend,
-      }), // TODO: this should be an array of calls: vec<Call>
+      },
+    ]
+    const op = {
+      calls: asSnakeData<rbactl.Call>(calls, (c) => rbactl.builder.data.call.encode(c).asBuilder()),
       predecessor: predecessor,
       salt: salt,
     }