refactor: remove unused test suite

package.json

@@ -20,13 +20,7 @@
  "prepare": "husky install",
  "test": "jest ./*/*.spec.ts --verbose",
  "build": "tsc",
- "integration": "npx ts-node src/scripts/test-sdk.ts",
- "integration:sendtrade": "npx ts-node src/scripts/test-sdk.ts -s sendtrade",
- "integration:tradesend": "npx ts-node src/scripts/test-sdk.ts -s tradesend",
- "integration:tradesendtrade": "npx ts-node src/scripts/test-sdk.ts -s tradesendtrade",
- "integration:sendOnly": "npx ts-node src/scripts/test-sdk.ts -s sendOnly",
- "integration:sendOnlyCosmos": "npx ts-node src/scripts/test-sdk.ts -s sendOnlyCosmos",
- "integration:tradeSendCosmos": "npx ts-node src/scripts/test-sdk.ts -s tradeSendCosmos",
+ "integration": "npx ts-node src/scripts/basic-test-script.ts",
  "release": "release-it",
  "release:pre": "release-it --preRelease=beta",
  "release:ci": "release-it --ci",

src/0xsquid/v2/route.ts

@@ -10,7 +10,7 @@ import {
  SquidData
 } from "@0xsquid/squid-types";
 import { parseTokenData } from "./tokens";
-import { RouteResponse } from "types";
+import { RouteData, RouteResponse } from "types";
 
 export const parseFeeCost = (data: any[]): FeeCost[] =>
  data.map((item: any) => {
@@ -137,17 +137,18 @@ export const parseRouteResponse = (
  response: any,
  headers: AxiosResponseHeaders
 ): RouteResponse => {
- const { route, status, message } = response;
-
+ const { data, status, message } = response;
  const routeResponse = {
  ...getHeaderTracker(headers),
- route: route && {
- estimate: parseEstimate(route.estimate),
- transactionRequest:
- route.transactionRequest &&
- parseTransactionRequest(route.transactionRequest),
- params: parseParams(route.params)
- },
+ route:
+ data &&
+ ({
+ estimate: parseEstimate(data.estimate),
+ transactionRequest:
+ data.transactionRequest &&
+ parseTransactionRequest(data.transactionRequest),
+ params: parseParams(data.params)
+ } as RouteData),
  status,
  message
  };

src/index.ts

@@ -255,10 +255,7 @@ export class Squid {
  });
  }
 
- const route: RouteResponse = parseRouteResponse(
- response.data,
- response.headers
- );
+ const route: RouteResponse = parseRouteResponse(response, response.headers);
  return route;
  }
 
@@ -284,13 +281,8 @@ export class Squid {
  const { fromIsNative, fromChain, fromTokenContract, fromProvider } =
  this.validateRouteParams(route.params);
 
- const {
- targetAddress,
- maxFeePerGas,
- maxPriorityFeePerGas,
- gasPrice,
- gasLimit
- } = route.transactionRequest;
+ const { target, maxFeePerGas, maxPriorityFeePerGas, gasPrice, gasLimit } =
+ route.transactionRequest;
 
  let _gasParams = {};
  if (executionSettings?.setGasPrice) {
@@ -315,7 +307,7 @@ export class Squid {
  if (!fromIsNative) {
  await this.validateBalanceAndApproval({
  fromTokenContract: fromTokenContract as ethers.Contract,
- targetAddress,
+ targetAddress: target,
  fromProvider,
  fromIsNative,
  fromAmount: params.fromAmount,
@@ -329,7 +321,7 @@ export class Squid {
  const value = ethers.BigNumber.from(route.transactionRequest.value);
 
  let tx = {
- to: targetAddress,
+ to: target,
  data: transactionRequest.data,
  ..._overrides
  } as ethers.utils.Deferrable<ethers.providers.TransactionRequest>;

src/scripts/basic-test-script.ts

@@ -1,35 +1,43 @@
 import { ethers } from "ethers";
 import * as dotenv from "dotenv";
-import { Squid } from "../../src";
-import { getTestCases } from "./basic-test-config";
+import { GetRoute, Squid } from "../../src";
 
 dotenv.config();
-const privateKey = process.env.privateKey as string;
-const rpcEndPoint = process.env.ethereumRpcEndPoint as string; // be sure that rpc corresponds to env
-const provider = new ethers.providers.JsonRpcProvider(rpcEndPoint);
+const privateKey = process.env.testerPk as string;
 
 async function main() {
- const signer = new ethers.Wallet(privateKey, provider);
  const squidSdk = new Squid({
- baseUrl: "update this" // "http://localhost:3000" | "http://testnet.api.0xsquid.com"
+ baseUrl: "http://localhost:3000" // "http://localhost:3000" | "http://testnet.api.0xsquid.com"
  });
 
  await squidSdk.init();
- const testCases = await getTestCases(squidSdk, signer.address); //configure test in test cases
- for (let i = 0; i < testCases.length; i++) {
- console.log(`\n >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`);
- const config = testCases[i];
- console.log(`> test case index: ${i}`);
- console.log("> params: ", config);
+ const ethereum = squidSdk.chains.find(c => c.chainId === "5");
+ const polygon = squidSdk.chains.find(c => c.chainId === "80001");
+ const fromToken = squidSdk.tokens.find(
+ t => t.symbol === "aUSDC" && t.chainId === "5"
+ )?.address as string;
+ const toToken = squidSdk.tokens.find(
+ t => t.symbol === "aUSDC" && t.chainId === "80001"
+ )?.address as string;
+ const provider = new ethers.providers.JsonRpcProvider(ethereum?.rpc);
+ const signer = new ethers.Wallet(privateKey, provider);
+ console.log("signer: ", signer.address);
+ const params = {
+ toAddress: signer.address,
+ fromChain: ethereum?.chainId,
+ fromToken,
+ fromAmount: ethers.utils.parseUnits("0.1", 6).toString(),
+ toChain: polygon?.chainId,
+ toToken,
+ slippage: 1
+ };
 
- const { route } = await squidSdk.getRoute(config.params);
- const tx = await squidSdk.executeRoute({
- signer,
- route
- });
- const txReceipt = await tx.wait(1);
- console.log("> txReceipt: ", txReceipt.transactionHash);
- }
+ const routeResponse = await squidSdk.getRoute(params as GetRoute);
+ // const Tx = await squidSdk.executeRoute({
+ // signer,
+ // route: routeResponse.route
+ // });
+ // console.log("Tx: ", Tx);
 }
 
 main()