From 52df60ec123fead5d4c8a0455ec45ec5dd04d83e Mon Sep 17 00:00:00 2001 From: Foivos Date: Mon, 28 Oct 2024 16:20:02 +0200 Subject: [PATCH] clean logs and lint --- src/node/node-utils.ts | 2 +- src/node/tx-builder.ts | 7 +------ test/its.js | 4 ++-- test/squid.js | 4 ++-- test/testutils.js | 1 - 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/node/node-utils.ts b/src/node/node-utils.ts index dde9edc9..50cc2be4 100644 --- a/src/node/node-utils.ts +++ b/src/node/node-utils.ts @@ -77,7 +77,6 @@ export function updateMoveToml( moveDir: string = `${__dirname}/../../move`, prepToml: undefined | ((moveJson: Record) => Record) = undefined, ) { - console.log(packageName, packageId, moveDir); // Path to the Move.toml file for the package const movePath = `${moveDir}/${packageName}/Move.toml`; @@ -102,6 +101,7 @@ export function updateMoveToml( if (prepToml) { moveJson = prepToml(moveJson); } + fs.writeFileSync(movePath, toml.stringify(moveJson)); } diff --git a/src/node/tx-builder.ts b/src/node/tx-builder.ts index 131c781d..7e259437 100644 --- a/src/node/tx-builder.ts +++ b/src/node/tx-builder.ts @@ -3,7 +3,6 @@ import { Bytes } from 'ethers'; import { TxBuilderBase } from '../common/tx-builder-base'; import { InterchainTokenOptions } from '../common/types'; import { getContractBuild as getMoveContractBuild, removeFile, writeInterchainToken } from './node-utils'; -import { execSync } from 'child_process'; export class TxBuilder extends TxBuilderBase { getContractBuild( @@ -24,7 +23,6 @@ export class TxBuilder extends TxBuilderBase { } async publishPackage(packageName: string, moveDir: string = `${__dirname}/../../move`): Promise { - console.log(packageName, moveDir); const { modules, dependencies } = this.getContractBuild(packageName, moveDir); return this.tx.publish({ @@ -35,10 +33,7 @@ export class TxBuilder extends TxBuilderBase { async publishPackageAndTransferCap(packageName: string, to: string, moveDir = `${__dirname}/../../move`) { const cap = await this.publishPackage(packageName, moveDir); - console.log(execSync(`cat ${__dirname}/../../move_compile/${packageName}/Move.toml`, { - encoding: 'utf-8', - stdio: 'pipe', - })); + this.tx.transferObjects([cap], to); } } diff --git a/test/its.js b/test/its.js index 67e17342..02d0c57b 100644 --- a/test/its.js +++ b/test/its.js @@ -129,7 +129,7 @@ describe('ITS', () => { creatorCap: findObjectId(deployments.axelar_gateway.publishTxn, 'CreatorCap'), itsOwnerCap: findObjectId(deployments.its.publishTxn, `${deployments.its.packageId}::owner_cap::OwnerCap`), }; - // Mint some coins for tests + // Mint some coins for tests const tokenTxBuilder = new TxBuilder(client); await tokenTxBuilder.moveCall({ @@ -254,7 +254,7 @@ describe('ITS', () => { destination_id: destinationAddress, payload, payload_hash: keccak256(payload), - }; + }; await approveAndExecute(client, keypair, gatewayInfo, discoveryInfo, message); }); }); diff --git a/test/squid.js b/test/squid.js index 11ee388a..f17d9521 100644 --- a/test/squid.js +++ b/test/squid.js @@ -25,7 +25,7 @@ const { keccak256, defaultAbiCoder, hexlify, randomBytes } = require('ethers/lib const SUI = '0x2'; -describe.only('Squid', () => { +describe('Squid', () => { // Sui Client let client; const network = process.env.NETWORK || 'localnet'; @@ -283,6 +283,7 @@ describe.only('Squid', () => { type, }; } + pools.ab = await createPool('a', 'b'); pools.bc = await createPool('b', 'c'); await fundPool('a', 'b', 1000000); @@ -296,7 +297,6 @@ describe.only('Squid', () => { }); it('should succesfully perform a swap', async () => { - return; const swap = bcsStructs.squid.DeepbookV3SwapData.serialize({ swap_type: { DeepbookV3: null }, pool_id: pools.ab, diff --git a/test/testutils.js b/test/testutils.js index 996a48b0..852e3b69 100644 --- a/test/testutils.js +++ b/test/testutils.js @@ -48,7 +48,6 @@ async function publishExternalPackage(client, keypair, packageName, packageDir, const publishTxn = await builder.signAndExecute(keypair, options); const packageId = (publishTxn.objectChanges?.find((a) => a.type === 'published') ?? []).packageId; - console.log(packageId); updateMoveToml(packageName, packageId, compileDir); return { packageId, publishTxn }; }