Skip to content

Commit

Permalink
Add release acceptance tests tag support (#365)
Browse files Browse the repository at this point in the history 
* Add filter flag for release only test runs

The acceptance tests suite is large.
In non-local envs this case result in expensive tests

Add a @Release tag to core happy path tests
Add npm run command support to kick off filtered tests

Signed-off-by: Nana-EC <[email protected]>
  • Loading branch information
@Nana-EC
Nana-EC committed Jul 21, 2022
1 parent 96c6764 commit dad8a94
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 41 deletions.
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
},
"scripts": {
"acceptancetest": "ts-mocha packages/server/tests/acceptance/index.spec.ts --exit",
"acceptancetest:release": "ts-mocha packages/server/tests/acceptance/index.spec.ts -g '@release' --exit",
"build": "npx lerna run build",
"build-and-test": "npx lerna run build && npx lerna run test",
"build:docker": "docker build . -t ${npm_package_name}",
Expand Down
8 changes: 4 additions & 4 deletions packages/server/tests/acceptance/erc20.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ describe('ERC20 Acceptance Tests', async function () {

describe('should behave like erc20', function() {
describe('total supply', function () {
it('returns the total amount of tokens', async function () {
it('@release returns the total amount of tokens', async function () {
const supply = await contract.totalSupply();
expect(supply.toString()).to.be.equal(initialSupply.toString());
});
Expand All @@ -108,7 +108,7 @@ describe('ERC20 Acceptance Tests', async function () {
});

describe('when the requested account has some tokens', function () {
it('returns the total amount of tokens', async function () {
it('@release returns the total amount of tokens', async function () {
const balance = await contract.balanceOf(initialHolder);
expect(balance.toString()).to.be.equal(initialSupply.toString());
});
Expand Down Expand Up @@ -144,7 +144,7 @@ describe('ERC20 Acceptance Tests', async function () {
amount = initialSupply;
});

it ('contract owner transfers tokens', async function () {
it ('@release contract owner transfers tokens', async function () {
tx = await contract.connect(tokenOwnerWallet).transfer(to, amount);
const ownerBalance = await contract.balanceOf(tokenOwner);
const toBalance = await contract.balanceOf(to);
Expand Down Expand Up @@ -275,7 +275,7 @@ describe('ERC20 Acceptance Tests', async function () {
});
});

describe('when the spender has unlimited allowance', function () {
describe('@release when the spender has unlimited allowance', function () {
beforeEach(async function () {
await contract.connect(tokenOwnerWallet).approve(spender, ethers.constants.MaxUint256);
});
Expand Down
6 changes: 3 additions & 3 deletions packages/server/tests/acceptance/index.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ describe('RPC Server Acceptance Tests', function () {
this.timeout(240 * 1000); // 240 seconds

let relayServer; // Relay Server
global.servicesNode = new ServicesClient(NETWORK, OPERATOR_ID, OPERATOR_KEY, logger.child({name: `services-client`}));
global.mirrorNode = new MirrorClient(MIRROR_NODE_URL, logger.child({name: `mirror-node-client`}));
global.relay = new RelayClient(RELAY_URL, logger.child({name: `relay-client`}));
global.servicesNode = new ServicesClient(NETWORK, OPERATOR_ID, OPERATOR_KEY, logger.child({name: `services-test-client`}));
global.mirrorNode = new MirrorClient(MIRROR_NODE_URL, logger.child({name: `mirror-node-test-client`}));
global.relay = new RelayClient(RELAY_URL, logger.child({name: `relay-test-client`}));
global.relayServer = relayServer;
global.logger = logger;

Expand Down
60 changes: 29 additions & 31 deletions packages/server/tests/acceptance/rpc.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ describe('RPC Server Acceptance Tests', function () {
const FEE_SCHEDULE_FILE_ID = "0.0.111";
const FEE_SCHEDULE_FILE_CONTENT_DEFAULT = "0a280a0a08541a061a04408888340a0a08061a061a0440889d2d0a0a08071a061a0440b0b63c120208011200"; // Eth gas = 853000
const FEE_SCHEDULE_FILE_CONTENT_UPDATED = "0a280a0a08541a061a0440a8953a0a0a08061a061a0440889d2d0a0a08071a061a0440b0b63c120208011200"; // Eth gas = 953000
const publicNetworks = ['previewnet', 'testnet', 'mainnet'];

describe('RPC Server Acceptance Tests', function () {
this.timeout(240 * 1000); // 240 seconds
Expand Down Expand Up @@ -102,7 +101,7 @@ describe('RPC Server Acceptance Tests', function () {

let log0Block, log4Block, contractAddress;

it('should deploy a contract', async () => {
it('@release should deploy a contract', async () => {
const logsContract = await servicesNode.deployContract(logsContractJson);
const mirrorNodeResp = await mirrorNode.get(`/contracts/${logsContract.contractId}`);
expect(mirrorNodeResp).to.have.property('evm_address');
Expand Down Expand Up @@ -260,7 +259,7 @@ describe('RPC Server Acceptance Tests', function () {
Assertions.block(blockResult, mirrorBlock, mirrorTransactions, false);
});

it('should execute "eth_getBlockByHash", hydrated transactions = true', async function () {
it('@release should execute "eth_getBlockByHash", hydrated transactions = true', async function () {
const blockResult = await relay.call('eth_getBlockByHash', [mirrorBlock.hash, true]);
Assertions.block(blockResult, mirrorBlock, mirrorTransactions, true);
});
Expand All @@ -285,7 +284,7 @@ describe('RPC Server Acceptance Tests', function () {
Assertions.block(blockResult, mirrorBlock, mirrorTransactions, false);
});

it('should execute "eth_getBlockByNumber", hydrated transactions = true', async function () {
it('@release should execute "eth_getBlockByNumber", hydrated transactions = true', async function () {
const blockResult = await relay.call('eth_getBlockByNumber', [mirrorBlock.number, true]);
Assertions.block(blockResult, mirrorBlock, mirrorTransactions, true);
});
Expand All @@ -300,7 +299,7 @@ describe('RPC Server Acceptance Tests', function () {
expect(blockResult).to.be.null;
});

it('should execute "eth_getBlockTransactionCountByNumber"', async function () {
it('@release should execute "eth_getBlockTransactionCountByNumber"', async function () {
const res = await relay.call('eth_getBlockTransactionCountByNumber', [mirrorBlock.number]);
expect(res).to.be.equal(mirrorBlock.count);
});
Expand All @@ -310,7 +309,7 @@ describe('RPC Server Acceptance Tests', function () {
expect(res).to.be.null;
});

it('should execute "eth_getBlockTransactionCountByHash"', async function () {
it('@release should execute "eth_getBlockTransactionCountByHash"', async function () {
const res = await relay.call('eth_getBlockTransactionCountByHash', [mirrorBlock.hash]);
expect(res).to.be.equal(mirrorBlock.count);
});
Expand All @@ -322,7 +321,7 @@ describe('RPC Server Acceptance Tests', function () {

it('should execute "eth_getBlockTransactionCountByNumber"', async function () {

it('should execute "eth_blockNumber"', async function () {
it('@release should execute "eth_blockNumber"', async function () {

const mirrorBlocks = await mirrorNode.get(`blocks`);
expect(mirrorBlocks).to.have.property('blocks');
Expand Down Expand Up @@ -370,7 +369,7 @@ describe('RPC Server Acceptance Tests', function () {
type: 1
};

it('should execute "eth_getTransactionByBlockHashAndIndex"', async function () {
it('@release should execute "eth_getTransactionByBlockHashAndIndex"', async function () {
const response = await relay.call('eth_getTransactionByBlockHashAndIndex',
[mirrorContractDetails.block_hash, mirrorContractDetails.transaction_index]);
Assertions.transaction(response, mirrorContractDetails);
Expand All @@ -388,7 +387,7 @@ describe('RPC Server Acceptance Tests', function () {
expect(response).to.be.null;
});

it('should execute "eth_getTransactionByBlockNumberAndIndex"', async function () {
it('@release should execute "eth_getTransactionByBlockNumberAndIndex"', async function () {
const response = await relay.call('eth_getTransactionByBlockNumberAndIndex', [mirrorContractDetails.block_number, mirrorContractDetails.transaction_index]);
Assertions.transaction(response, mirrorContractDetails);
});
Expand All @@ -403,7 +402,7 @@ describe('RPC Server Acceptance Tests', function () {
expect(response).to.be.null;
});

it('should execute "eth_getTransactionReceipt" for hash of legacy transaction', async function () {
it('@release should execute "eth_getTransactionReceipt" for hash of legacy transaction', async function () {
const transaction = {
...default155TransactionData,
to: mirrorContract.evm_address,
Expand All @@ -422,7 +421,7 @@ describe('RPC Server Acceptance Tests', function () {
Assertions.transactionReceipt(res, mirrorResult);
});

it('should execute "eth_getTransactionReceipt" for hash of London transaction', async function () {
it('@release should execute "eth_getTransactionReceipt" for hash of London transaction', async function () {
const gasPrice = await relay.gasPrice();
const transaction = {
...defaultLondonTransactionData,
Expand Down Expand Up @@ -465,7 +464,7 @@ describe('RPC Server Acceptance Tests', function () {
}
});

it('should execute "eth_sendRawTransaction" for legacy EIP 155 transactions', async function () {
it('@release should execute "eth_sendRawTransaction" for legacy EIP 155 transactions', async function () {
const receiverInitialBalance = await relay.getBalance(mirrorContract.evm_address);
const transaction = {
...default155TransactionData,
Expand Down Expand Up @@ -606,9 +605,8 @@ describe('RPC Server Acceptance Tests', function () {
expect(balanceChange.toString()).to.eq(ONE_TINYBAR.toString());
});

it('should execute "eth_sendRawTransaction" and deploy a large contract', async function() {
it('should execute "eth_sendRawTransaction" and deploy a large contract', async function () {
const gasPrice = await relay.gasPrice();

const transaction = {
type: 2,
chainId: Number(CHAIN_ID),
Expand Down Expand Up @@ -660,7 +658,7 @@ describe('RPC Server Acceptance Tests', function () {
await relay.sendRawTransaction(signedTx);
Assertions.expectedError();
}
catch(e) {
catch (e) {
Assertions.jsonRpcError(e, predefined.GAS_LIMIT_TOO_LOW);
}
});
Expand Down Expand Up @@ -696,7 +694,7 @@ describe('RPC Server Acceptance Tests', function () {
await relay.sendRawTransaction(signedTx);
Assertions.expectedError();
}
catch(e) {
catch (e) {
Assertions.jsonRpcError(e, predefined.GAS_LIMIT_TOO_LOW);
}
});
Expand Down Expand Up @@ -729,7 +727,7 @@ describe('RPC Server Acceptance Tests', function () {
});
});

it('should execute "eth_getTransactionCount" primary', async function () {
it('@release should execute "eth_getTransactionCount" primary', async function () {
const res = await relay.call('eth_getTransactionCount', [mirrorPrimaryAccount.evm_address, mirrorContractDetails.block_number]);
expect(res).to.be.equal('0x0');
});
Expand All @@ -739,17 +737,17 @@ describe('RPC Server Acceptance Tests', function () {
expect(res).to.be.equal('0x0');
});

it('should execute "eth_getTransactionCount" contract', async function () {
it('@release should execute "eth_getTransactionCount" contract', async function () {
const res = await relay.call('eth_getTransactionCount', [mirrorContract.evm_address, mirrorContractDetails.block_number]);
expect(res).to.be.equal('0x1');
});

it('should execute "eth_getTransactionCount" for account with id converted to evm_address', async function () {
it('@release should execute "eth_getTransactionCount" for account with id converted to evm_address', async function () {
const res = await relay.call('eth_getTransactionCount', [Utils.idToEvmAddress(mirrorPrimaryAccount.account), mirrorContractDetails.block_number]);
expect(res).to.be.equal('0x0');
});

it('should execute "eth_getTransactionCount" contract with id converted to evm_address', async function () {
it('@release should execute "eth_getTransactionCount" contract with id converted to evm_address', async function () {
const res = await relay.call('eth_getTransactionCount', [Utils.idToEvmAddress(contractId.toString()), mirrorContractDetails.block_number]);
expect(res).to.be.equal('0x1');
});
Expand Down Expand Up @@ -779,7 +777,7 @@ describe('RPC Server Acceptance Tests', function () {
expect(res).to.be.equal('0x1');
});

it('should execute "eth_getTransactionByHash" for existing transaction', async function () {
it('@release should execute "eth_getTransactionByHash" for existing transaction', async function () {
const transaction = {
...defaultLondonTransactionData,
to: mirrorContract.evm_address,
Expand All @@ -799,14 +797,14 @@ describe('RPC Server Acceptance Tests', function () {
});
});

it('should execute "eth_estimateGas"', async function () {
it('@release should execute "eth_estimateGas"', async function () {
const res = await relay.call('eth_estimateGas', []);
expect(res).to.contain('0x');
expect(res).to.not.be.equal('0x');
expect(res).to.not.be.equal('0x0');
});

it('should call eth_gasPrice', async function () {
it('@release should call eth_gasPrice', async function () {
const res = await relay.call('eth_gasPrice', []);
expect(res).to.exist;
if (process.env.LOCAL_NODE && process.env.LOCAL_NODE !== 'false') {
Expand All @@ -817,7 +815,7 @@ describe('RPC Server Acceptance Tests', function () {
}
});

it('should execute "eth_getBalance" for newly created account with 10 HBAR', async function () {
it('@release should execute "eth_getBalance" for newly created account with 10 HBAR', async function () {
const account = await servicesNode.createAliasAccount(10);
// Wait for account creation to propagate
await mirrorNode.get(`/accounts/${account.accountId}`);
Expand All @@ -834,17 +832,17 @@ describe('RPC Server Acceptance Tests', function () {
expect(res).to.eq('0x0');
});

it('should execute "eth_getBalance" for contract', async function () {
it('@release should execute "eth_getBalance" for contract', async function () {
const res = await relay.call('eth_getBalance', [Utils.idToEvmAddress(contractId.toString()), 'latest']);
expect(res).to.eq(ethers.utils.hexValue(ONE_WEIBAR));
});

it('should execute "eth_getBalance" for contract with id converted to evm_address', async function () {
it('@release should execute "eth_getBalance" for contract with id converted to evm_address', async function () {
const res = await relay.call('eth_getBalance', [Utils.idToEvmAddress(contractId.toString()), 'latest']);
expect(res).to.eq(ethers.utils.hexValue(ONE_WEIBAR));
});

describe('Hardcoded RPC Endpoints', () => {
describe('@release Hardcoded RPC Endpoints', () => {
let mirrorBlock;

before(async () => {
Expand Down Expand Up @@ -928,7 +926,7 @@ describe('RPC Server Acceptance Tests', function () {

});

describe('Unsupported RPC Endpoints', () => {
describe('@release Unsupported RPC Endpoints', () => {

it('should not support "eth_submitHashrate"', async function () {
await relay.callUnsupported('eth_submitHashrate', []);
Expand Down Expand Up @@ -969,13 +967,13 @@ describe('RPC Server Acceptance Tests', function () {
await mirrorNode.get(`/contracts/${basicContract.contractId}`);
});

it('should execute "eth_getCode" for contract evm_address', async function () {
it('@release should execute "eth_getCode" for contract evm_address', async function () {
const evmAddress = basicContract.contractId.toSolidityAddress();
const res = await relay.call('eth_getCode', [evmAddress]);
expect(res).to.eq(basicContractJson.deployedBytecode);
});

it('should execute "eth_getCode" for contract with id converted to evm_address', async function () {
it('@release should execute "eth_getCode" for contract with id converted to evm_address', async function () {
const evmAddress = Utils.idToEvmAddress(basicContract.contractId.toString());
const res = await relay.call('eth_getCode', [evmAddress]);
expect(res).to.eq(basicContractJson.deployedBytecode);
Expand Down Expand Up @@ -1010,7 +1008,7 @@ describe('RPC Server Acceptance Tests', function () {
evmAddress = `0x${basicContract.contractId.toSolidityAddress()}`;
});

it('should execute "eth_call" request to Basic contract', async function () {
it('@release should execute "eth_call" request to Basic contract', async function () {
const callData = {
from: accounts[2].address,
to: evmAddress,
Expand Down
4 changes: 1 addition & 3 deletions packages/server/tests/clients/servicesClient.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,7 @@ export default class ServicesClient {
const publicKey = privateKey.publicKey;
const aliasAccountId = publicKey.toAccountId(0, 0);

this.logger.trace(`New Eth compatible privateKey: ${privateKey}`);
this.logger.trace(`New Eth compatible publicKey: ${publicKey}`);
this.logger.debug(`New Eth compatible account ID: ${aliasAccountId.toString()}`);
this.logger.trace(`Create new Eth compatible account w privateKey: ${privateKey}, publicKey: ${publicKey}, alias: ${aliasAccountId.toString()} and balance ~${initialBalance} hb`);

const aliasCreationResponse = await this.executeTransaction(new TransferTransaction()
.addHbarTransfer(this._thisAccountId(), new Hbar(initialBalance).negated())
Expand Down

0 comments on commit dad8a94

Please sign in to comment.