Skip to content

Commit

Permalink
Merge branch 'develop' into release/cryptography-v1.4.2
Browse files Browse the repository at this point in the history
Signed-off-by: ochikov <[email protected]>
  • Loading branch information
ochikov committed Jan 13, 2023
2 parents 1080346 + 34e063e commit 3a73218
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 29 deletions.
27 changes: 27 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 10
- package-ecosystem: npm
directory: "packages/cryptography"
schedule:
interval: weekly
open-pull-requests-limit: 10
- package-ecosystem: npm
directory: "packages/proto"
schedule:
interval: weekly
open-pull-requests-limit: 10
- package-ecosystem: npm
directory: "/examples"
schedule:
interval: weekly
open-pull-requests-limit: 5
- package-ecosystem: npm
directory: "/examples/react-native-example"
schedule:
interval: weekly
open-pull-requests-limit: 5
24 changes: 0 additions & 24 deletions .github/renovate.json

This file was deleted.

10 changes: 5 additions & 5 deletions test/integration/ContractCallIntegrationTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ describe("ContractCallIntegration", function () {
}
});

it("should timeout when network node takes longer than 10s to execute the transaction", async function () {
this.timeout(50000);
it("should mark as busy when network node takes longer than 10s to execute the transaction", async function () {
this.timeout(120000);

const myAccountId = AccountId.fromString("0.0.47439");
const myPrivateKey = PrivateKey.fromString(
Expand Down Expand Up @@ -377,7 +377,7 @@ describe("ContractCallIntegration", function () {
try {
const contractQuery = await new ContractCallQuery()
//Set the gas for the query
.setGas(15000000)
.setGas(16000000)
//Set the contract ID to return the request for
.setContractId(contractId)
//Set the contract function to call
Expand All @@ -387,7 +387,7 @@ describe("ContractCallIntegration", function () {
)
//Set the query payment for the node returning the request
//This value must cover the cost of the request otherwise will fail
.setQueryPayment(new Hbar(2));
.setQueryPayment(new Hbar(35));

//Submit to a Hedera network
// const txResponse = await contractQuery.execute(client);
Expand All @@ -397,7 +397,7 @@ describe("ContractCallIntegration", function () {
} catch (error) {
err = error;
}
expect(err.toString()).to.includes("TIMEOUT");
expect(err.toString()).to.includes("BUSY");

if (!err) {
throw new Error("query did not error");
Expand Down

0 comments on commit 3a73218

Please sign in to comment.