From 6e43d1b78940d795c22d62fc431e09d10ffcab92 Mon Sep 17 00:00:00 2001 From: xiaolou86 <20718693+xiaolou86@users.noreply.github.com> Date: Fri, 13 Oct 2023 02:08:51 +0800 Subject: [PATCH 1/2] Fix typos (#6494) --- .../guides/web3_upgrade_guide/1.x/web3_eth_migration_guide.md | 4 ++-- docs/src/theme/SearchBar/algolia.css | 2 +- packages/web3-eth/test/e2e/e2e_utils.ts | 2 +- packages/web3/test/e2e/e2e_utils.ts | 2 +- scripts/test-runner.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/docs/guides/web3_upgrade_guide/1.x/web3_eth_migration_guide.md b/docs/docs/guides/web3_upgrade_guide/1.x/web3_eth_migration_guide.md index e97578d1c84..10b57e1d261 100644 --- a/docs/docs/guides/web3_upgrade_guide/1.x/web3_eth_migration_guide.md +++ b/docs/docs/guides/web3_upgrade_guide/1.x/web3_eth_migration_guide.md @@ -176,7 +176,7 @@ await web3.eth.getFeeHistory('0x1', 'latest', []); #### sending -- In 1.x, the event listener would receive a `payload` object as an argument. In 4.x, just the sent transaction object is recieved +- In 1.x, the event listener would receive a `payload` object as an argument. In 4.x, just the sent transaction object is received ```typescript // in 1.x @@ -211,7 +211,7 @@ web3.eth.sendTransaction({ ... }).on('sending', (sendTransactionObject) => { ... #### sent -- In 1.x, the event listener would receive a `payload` object as an argument. In 4.x just the sent transaction object is recieved +- In 1.x, the event listener would receive a `payload` object as an argument. In 4.x just the sent transaction object is received ```typescript // in 1.x diff --git a/docs/src/theme/SearchBar/algolia.css b/docs/src/theme/SearchBar/algolia.css index c5590cfa486..8c3782ba827 100644 --- a/docs/src/theme/SearchBar/algolia.css +++ b/docs/src/theme/SearchBar/algolia.css @@ -10,7 +10,7 @@ .algolia-docsearch-suggestion--highlight { color: #3a33d1; } -/* Highligted search terms in the main category headers */ +/* Highlighted search terms in the main category headers */ .algolia-docsearch-suggestion--category-header .algolia-docsearch-suggestion--highlight { background-color: #4d47d5; diff --git a/packages/web3-eth/test/e2e/e2e_utils.ts b/packages/web3-eth/test/e2e/e2e_utils.ts index 6cc6d49e60e..56989fc927d 100644 --- a/packages/web3-eth/test/e2e/e2e_utils.ts +++ b/packages/web3-eth/test/e2e/e2e_utils.ts @@ -28,7 +28,7 @@ import { getSystemTestBackend } from '../fixtures/system_test_utils'; import secrets from '../../../../.secrets.json'; export const getSystemE2ETestProvider = (): string => { - if (process.env.WEB3_SYTEM_TEST_MODE === 'http') { + if (process.env.WEB3_SYSTEM_TEST_MODE === 'http') { return getSystemTestBackend() === 'sepolia' ? process.env.INFURA_SEPOLIA_HTTP ?? secrets.SEPOLIA.HTTP : process.env.INFURA_MAINNET_HTTP ?? secrets.MAINNET.HTTP; diff --git a/packages/web3/test/e2e/e2e_utils.ts b/packages/web3/test/e2e/e2e_utils.ts index 8001e72fc55..cfb680d8b81 100644 --- a/packages/web3/test/e2e/e2e_utils.ts +++ b/packages/web3/test/e2e/e2e_utils.ts @@ -28,7 +28,7 @@ import { getSystemTestBackend } from '../shared_fixtures/system_tests_utils'; import secrets from '../../../../.secrets.json'; export const getSystemE2ETestProvider = (): string => { - if (process.env.WEB3_SYTEM_TEST_MODE === 'http') { + if (process.env.WEB3_SYSTEM_TEST_MODE === 'http') { return getSystemTestBackend() === 'sepolia' ? process.env.INFURA_SEPOLIA_HTTP ?? secrets.SEPOLIA.HTTP : process.env.INFURA_MAINNET_HTTP ?? secrets.MAINNET.HTTP; diff --git a/scripts/test-runner.sh b/scripts/test-runner.sh index 5b60f75b59f..cdb3798e461 100755 --- a/scripts/test-runner.sh +++ b/scripts/test-runner.sh @@ -38,7 +38,7 @@ fi echo "Node software used for tests: " $BACKEND echo "Node running on: " "$MODE://127.0.0.1:$WEB3_SYSTEM_TEST_PORT" -export WEB3_SYTEM_TEST_MODE=$MODE +export WEB3_SYSTEM_TEST_MODE=$MODE export WEB3_SYSTEM_TEST_PROVIDER="$MODE://127.0.0.1:$WEB3_SYSTEM_TEST_PORT" export WEB3_SYSTEM_TEST_BACKEND=$BACKEND export WEB3_SYSTEM_TEST_ENGINE=$ENGINE From e760667d2595deafcf7606c84b15bda9b472c5a7 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 12 Oct 2023 21:56:40 -0400 Subject: [PATCH 2/2] update tests (#6474) --- .../integration/local_account/contract_erc721.test.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/web3-eth-contract/test/integration/local_account/contract_erc721.test.ts b/packages/web3-eth-contract/test/integration/local_account/contract_erc721.test.ts index 2b50e735257..d9226c580f1 100644 --- a/packages/web3-eth-contract/test/integration/local_account/contract_erc721.test.ts +++ b/packages/web3-eth-contract/test/integration/local_account/contract_erc721.test.ts @@ -19,7 +19,6 @@ along with web3.js. If not, see . import Web3 from 'web3'; // eslint-disable-next-line import/no-extraneous-dependencies import { Web3Account } from 'web3-eth-accounts'; -import { EventLog } from 'web3-types'; import { Contract } from '../../../src'; import { ERC721TokenAbi, ERC721TokenBytecode } from '../../shared_fixtures/build/ERC721Token'; import { getSystemTestProvider, createLocalAccount } from '../../fixtures/system_test_utils'; @@ -80,8 +79,7 @@ describe('contract', () => { tempAccount.address.toLowerCase(), ); - const logs = await contractDeployed.getPastEvents('Transfer'); - const tokenId = (logs[0] as EventLog)?.returnValues?.tokenId as string; + const tokenId = awardReceipt.events?.Transfer.returnValues?.tokenId as string; expect( toUpperCaseHex( @@ -113,8 +111,7 @@ describe('contract', () => { tempAccount.address.toLowerCase(), ); - const logs = await contractDeployed.getPastEvents('Transfer'); - const tokenId = (logs[0] as EventLog)?.returnValues?.tokenId as string; + const tokenId = awardReceipt.events?.Transfer.returnValues?.tokenId as string; const transferFromReceipt = await contractDeployed.methods .transferFrom(tempAccount.address, toAccount.address, tokenId) .send({ @@ -186,8 +183,7 @@ describe('contract', () => { tempAccount.address.toLowerCase(), ); - const logs = await contractDeployed.getPastEvents('Transfer'); - const tokenId = (logs[0] as EventLog)?.returnValues?.tokenId as string; + const tokenId = awardReceipt.events?.Transfer.returnValues?.tokenId as string; const approveReceipt = await contractDeployed.methods .approve(toAccount.address, tokenId)