Skip to content

Commit

Permalink
fix: new test implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
@olehbairak
olehbairak committed Feb 26, 2024
1 parent d8d0a70 commit 13542ac
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 29 deletions.
2 changes: 2 additions & 0 deletions packages/integration-tests/src/entities.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ export enum Token {
ETHER_PULL_Address = "0x0000000000000000000000000000000000008001",
ETHER_Address = "0x0000000000000000000000000000000000000000",
ETHER_ERC20_Address = "0x000000000000000000000000000000000000800A",
tokenTypeERC20 = "ERC20",
tokenTypeETH = "ETH",
}

export enum TransactionsType {
Expand Down
116 changes: 87 additions & 29 deletions packages/integration-tests/tests/api/transactions.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,25 +57,36 @@ describe("Transactions", () => {
apiRoute = `/transactions/${txHash}/transfers`;
response = await helper.performGETrequest(apiRoute);

console.log(response.body);

expect(response.status).toBe(200);
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ from: Wallets.richWalletAddress }));
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ to: Token.ETHER_PULL_Address }));
expect(typeof response.body.items[0].blockNumber).toStrictEqual("number");
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ transactionHash: txHash }));
expect(typeof response.body.items[0].timestamp).toStrictEqual("string");
expect(typeof response.body.items[0].amount).toStrictEqual("string");
expect(response.body.items[0]).toStrictEqual(
expect.objectContaining({ tokenAddress: Token.ETHER_ERC20_Address })
);
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ type: "fee" }));
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ from: Wallets.richWalletAddress }));
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ to: Token.ETHER_ERC20_Address }));
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ transactionHash: txHash }));
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ amount: "9000000000000" }));
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ type: "transfer" }));
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ from: Wallets.richWalletAddress }));
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ to: Wallets.richWalletAddress }));
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ transactionHash: txHash }));
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ amount: "9000000000000" }));
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ type: "withdrawal" }));
expect(response.body.items[3]).toStrictEqual(expect.objectContaining({ from: Token.ETHER_PULL_Address }));
expect(response.body.items[3]).toStrictEqual(expect.objectContaining({ to: Wallets.richWalletAddress }));
expect(response.body.items[3]).toStrictEqual(expect.objectContaining({ transactionHash: txHash }));
expect(response.body.items[3]).toStrictEqual(expect.objectContaining({ type: "refund" }));
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ tokenType: Token.tokenTypeETH }));
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ fields: null }));
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ isInternal: false }));
expect(response.body.items[0]).toStrictEqual(
expect.objectContaining({
token: {
decimals: 18,
iconURL: "https://assets.coingecko.com/coins/images/279/large/ethereum.png?1698873266",
l1Address: Token.ETHER_Address,
l2Address: Token.ETHER_ERC20_Address,
liquidity: 220000000000,
symbol: "ETH",
name: "Ether",
usdPrice: 1800,
},
})
);
});
});

Expand All @@ -86,25 +97,33 @@ describe("Transactions", () => {
apiRoute = `/transactions/${txHash}/transfers`;
response = await helper.performGETrequest(apiRoute);

console.log(response.body);

expect(response.status).toBe(200);
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ from: Wallets.richWalletAddress }));
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ to: Token.ETHER_PULL_Address }));
expect(typeof response.body.items[0].blockNumber).toStrictEqual("number");
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ transactionHash: txHash }));
expect(typeof response.body.items[0].timestamp).toStrictEqual("string");
expect(typeof response.body.items[0].amount).toStrictEqual("string");
expect(response.body.items[0]).toStrictEqual(
expect.objectContaining({ tokenAddress: Token.ETHER_ERC20_Address })
);
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ type: "fee" }));
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ from: Wallets.richWalletAddress }));
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ to: Token.ETHER_ERC20_Address }));
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ transactionHash: txHash }));
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ amount: "9000000000000" }));
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ type: "transfer" }));
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ from: Wallets.richWalletAddress }));
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ to: Wallets.mainWalletAddress }));
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ transactionHash: txHash }));
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ amount: "9000000000000" }));
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ type: "withdrawal" }));
expect(response.body.items[3]).toStrictEqual(expect.objectContaining({ from: Token.ETHER_PULL_Address }));
expect(response.body.items[3]).toStrictEqual(expect.objectContaining({ to: Wallets.richWalletAddress }));
expect(response.body.items[3]).toStrictEqual(expect.objectContaining({ transactionHash: txHash }));
expect(response.body.items[3]).toStrictEqual(expect.objectContaining({ type: "refund" }));
});
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ fields: null }));
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ isInternal: false }));
expect.objectContaining({
token: {
decimals: 18,
iconURL: "https://assets.coingecko.com/coins/images/279/large/ethereum.png?1698873266",
l1Address: Token.ETHER_Address,
l2Address: Token.ETHER_ERC20_Address,
liquidity: 220000000000,
symbol: "ETH",
name: "Ether",
usdPrice: 1800,
},
});
});

Expand Down Expand Up @@ -258,11 +277,36 @@ describe("Transactions", () => {
apiRoute = `/transactions/${txHash}`;
response = await helper.performGETrequest(apiRoute);

console.log(response.body);

expect(response.status).toBe(200);
expect(response.body.hash).toBe(txHash);
expect(response.body.to).toBe("0x000000000000000000000000000000000000800A");
expect(response.body.from).toBe(Wallets.richWalletAddress);
expect(typeof response.body.blockNumber).toStrictEqual("number");
expect(response.body.value).toBe("9000000000000");
expect(typeof response.body.isL1Originated).toStrictEqual("boolean");
expect(typeof response.body.fee).toStrictEqual("string");
expect(typeof response.body.nonce).toStrictEqual("number");
expect(typeof response.body.gasLimit).toStrictEqual("string");
expect(typeof response.body.gasPrice).toStrictEqual("string");
expect(typeof response.body.gasPerPubdata).toStrictEqual("string");
expect(typeof response.body.maxFeePerGas).toStrictEqual("string");
expect(typeof response.body.maxPriorityFeePerGas).toStrictEqual("string");
expect(typeof response.body.blockNumber).toStrictEqual("number");
expect(typeof response.body.l1BatchNumber).toStrictEqual("number");
expect(typeof response.body.blockHash).toStrictEqual("string");
expect(typeof response.body.type).toStrictEqual("number");
expect(typeof response.body.transactionIndex).toStrictEqual("number");
expect(typeof response.body.receivedAt).toStrictEqual("string");
expect(typeof response.body.error).toBeTruthy(); //can be null
expect(typeof response.body.revertReason).toBeTruthy(); //can be null
expect(response.body.status).toBe("verified");
expect(typeof response.body.commitTxHash).toStrictEqual("string");
expect(typeof response.body.executeTxHash).toStrictEqual("string");
expect(typeof response.body.proveTxHash).toStrictEqual("string");
expect(typeof response.body.isL1BatchSealed).toStrictEqual("boolean");
expect(typeof response.body.gasUsed).toStrictEqual("string");
});
});

Expand Down Expand Up @@ -663,11 +707,15 @@ describe("Transactions", () => {
expect(response.status).toBe(200);
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ from: emptyWallet }));
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ to: paymasterAddress }));
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ amount: "1" }));
expect(typeof response.body.items[0].blockNumber).toStrictEqual("number");
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ transactionHash: txHash }));
expect(typeof response.body.items[0].timestamp).toStrictEqual("string");
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ amount: "1" }));
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ tokenAddress: token }));
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ type: TransactionsType.transfer }));
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ tokenType: Token.tokenTypeERC20 }));
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ fields: null }));
expect(response.body.items[0]).toStrictEqual(expect.objectContaining({ isInternal: false }));
expect(response.body.items[0]).toStrictEqual(
expect.objectContaining({
token: {
Expand All @@ -684,12 +732,17 @@ describe("Transactions", () => {
);
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ from: paymasterAddress }));
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ to: Token.ETHER_PULL_Address }));
expect(typeof response.body.items[1].blockNumber).toStrictEqual("number");
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ transactionHash: txHash }));
expect(typeof response.body.items[1].timestamp).toStrictEqual("string");
expect(typeof response.body.items[1].amount).toStrictEqual("string");
expect(response.body.items[1]).toStrictEqual(
expect.objectContaining({ tokenAddress: Token.ETHER_ERC20_Address })
);
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ type: TransactionsType.fee }));
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ tokenType: Token.tokenTypeETH }));
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ fields: null }));
expect(response.body.items[1]).toStrictEqual(expect.objectContaining({ isInternal: false }));
expect(response.body.items[1]).toStrictEqual(
expect.objectContaining({
token: {
Expand All @@ -706,12 +759,17 @@ describe("Transactions", () => {
);
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ from: Token.ETHER_PULL_Address }));
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ to: paymasterAddress }));
expect(typeof response.body.items[2].blockNumber).toStrictEqual("number");
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ transactionHash: txHash }));
expect(typeof response.body.items[2].timestamp).toStrictEqual("string");
expect(typeof response.body.items[2].amount).toStrictEqual("string");
expect(response.body.items[2]).toStrictEqual(
expect.objectContaining({ tokenAddress: Token.ETHER_ERC20_Address })
);
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ type: TransactionsType.refund }));
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ tokenType: Token.tokenTypeETH }));
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ fields: null }));
expect(response.body.items[2]).toStrictEqual(expect.objectContaining({ isInternal: false }));
expect(response.body.items[2]).toStrictEqual(
expect.objectContaining({
token: {
Expand Down

0 comments on commit 13542ac

Please sign in to comment.