From 7d72e5b9304ed08f5e839cd60bf1c50e295f9ff0 Mon Sep 17 00:00:00 2001 From: Willem Wyndham Date: Wed, 23 Aug 2023 12:30:13 -0400 Subject: [PATCH] fix: update to use use .env and store standalone in local config --- .gitignore | 2 ++ .../fixtures/test_custom_types/dist/cjs/index.js | 1 - .../fixtures/test_custom_types/dist/cjs/invoke.js | 2 -- .../fixtures/test_custom_types/dist/esm/index.js | 1 - .../fixtures/test_custom_types/dist/esm/invoke.js | 2 -- .../fixtures/test_custom_types/src/index.ts | 1 - cmd/crates/soroban-spec-typescript/ts-tests/.env | 1 + cmd/crates/soroban-spec-typescript/ts-tests/.gitignore | 3 ++- cmd/crates/soroban-spec-typescript/ts-tests/package.json | 7 +++++-- cmd/crates/soroban-spec-typescript/ts-tests/soroban | 2 +- .../ts-tests/{src => tests}/test.ts | 7 ++++--- 11 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 cmd/crates/soroban-spec-typescript/ts-tests/.env rename cmd/crates/soroban-spec-typescript/ts-tests/{src => tests}/test.ts (95%) diff --git a/.gitignore b/.gitignore index 3c608cc13..d6c2b753a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ target/ !test.toml cmd/crates/soroban-spec-typescript/fixtures/ts/package-lock.json + +cmd/crates/soroban-spec-typescript/ts-tests/contract_id.txt diff --git a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/cjs/index.js b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/cjs/index.js index bd2b1e4ef..7815e5772 100644 --- a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/cjs/index.js +++ b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/cjs/index.js @@ -182,7 +182,6 @@ class Contract { }); } catch (e) { - console.log(e); if (typeof e === 'string') { let err = parseError(e); if (err) diff --git a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/cjs/invoke.js b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/cjs/invoke.js index f7de5eede..69e1a669e 100644 --- a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/cjs/invoke.js +++ b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/cjs/invoke.js @@ -39,9 +39,7 @@ async function invoke({ method, args = [], fee = 100, responseType, parseResultX .addOperation(contract.call(method, ...args)) .setTimeout(SorobanClient.TimeoutInfinite) .build(); - console.log(method, args); const simulated = await server.simulateTransaction(tx); - console.log("---\n", simulated.result.retval, "\n----"); if (simulated.error) throw simulated.error; if (responseType === "simulated") diff --git a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/esm/index.js b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/esm/index.js index 9552e6182..9a1518303 100644 --- a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/esm/index.js +++ b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/esm/index.js @@ -163,7 +163,6 @@ export class Contract { }); } catch (e) { - console.log(e); if (typeof e === 'string') { let err = parseError(e); if (err) diff --git a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/esm/invoke.js b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/esm/invoke.js index 0ea2d1a4c..c5714d4eb 100644 --- a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/esm/invoke.js +++ b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/dist/esm/invoke.js @@ -35,9 +35,7 @@ export async function invoke({ method, args = [], fee = 100, responseType, parse .addOperation(contract.call(method, ...args)) .setTimeout(SorobanClient.TimeoutInfinite) .build(); - console.log(method, args); const simulated = await server.simulateTransaction(tx); - console.log("---\n", simulated.result.retval, "\n----"); if (simulated.error) throw simulated.error; if (responseType === "simulated") diff --git a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/src/index.ts b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/src/index.ts index 07186bd45..5cce69fe0 100644 --- a/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/src/index.ts +++ b/cmd/crates/soroban-spec-typescript/fixtures/test_custom_types/src/index.ts @@ -277,7 +277,6 @@ export class Contract { }, }); } catch (e) { - console.log(e) if (typeof e === 'string') { let err = parseError(e); if (err) return err; diff --git a/cmd/crates/soroban-spec-typescript/ts-tests/.env b/cmd/crates/soroban-spec-typescript/ts-tests/.env new file mode 100644 index 000000000..b86805d8d --- /dev/null +++ b/cmd/crates/soroban-spec-typescript/ts-tests/.env @@ -0,0 +1 @@ +SOROBAN_NETWORK=standalone \ No newline at end of file diff --git a/cmd/crates/soroban-spec-typescript/ts-tests/.gitignore b/cmd/crates/soroban-spec-typescript/ts-tests/.gitignore index a9cc241d8..c4c731d6c 100644 --- a/cmd/crates/soroban-spec-typescript/ts-tests/.gitignore +++ b/cmd/crates/soroban-spec-typescript/ts-tests/.gitignore @@ -1,3 +1,4 @@ build node_modules -yarn.lock \ No newline at end of file +yarn.lock +!.soroban/network/standalone.toml \ No newline at end of file diff --git a/cmd/crates/soroban-spec-typescript/ts-tests/package.json b/cmd/crates/soroban-spec-typescript/ts-tests/package.json index 0011ad6b1..01066c3d3 100644 --- a/cmd/crates/soroban-spec-typescript/ts-tests/package.json +++ b/cmd/crates/soroban-spec-typescript/ts-tests/package.json @@ -2,7 +2,10 @@ "private": true, "type": "module", "scripts": { - "postinstall": "curl -X POST \"http://localhost:8000/soroban/rpc\" && ./soroban config network add standalone --rpc-url \"http://localhost:8000/soroban/rpc\" --network-passphrase \"Standalone Network ; February 2017\" && ./soroban config identity fund --network standalone && export CONTRACT_ID=$(./soroban contract deploy --wasm ../../../../target/wasm32-unknown-unknown/test-wasms/test_custom_types.wasm --network standalone) && ./soroban contract bindings typescript --contract-id $CONTRACT_ID --network standalone --output-dir ./node_modules/test-custom-types --overwrite || { echo \"Make sure you're running standalone RPC network on localhost:8000\" && exit 1; }", + "postinstall": "curl -X POST \"http://localhost:8000/soroban/rpc\" && npm run fund && npm run deploy && npm run bindings || { echo \"Make sure you're running standalone RPC network on localhost:8000\" && exit 1; }", + "fund": "./soroban config identity fund", + "bindings": "./soroban contract bindings typescript --contract-id $(cat contract_id.txt) --output-dir ./node_modules/test-custom-types --overwrite", + "deploy": "(./soroban contract deploy --wasm ../../../../target/wasm32-unknown-unknown/test-wasms/test_custom_types.wasm) > contract_id.txt", "test": "ava" }, "devDependencies": { @@ -14,7 +17,7 @@ "ava": { "typescript": { "rewritePaths": { - "src/": "build/" + "tests/": "build/" }, "compile": "tsc" } diff --git a/cmd/crates/soroban-spec-typescript/ts-tests/soroban b/cmd/crates/soroban-spec-typescript/ts-tests/soroban index 93b0bf350..8e5e7fcd5 100755 --- a/cmd/crates/soroban-spec-typescript/ts-tests/soroban +++ b/cmd/crates/soroban-spec-typescript/ts-tests/soroban @@ -1,3 +1,3 @@ #!/bin/bash -../../../../target/debug/soroban "$@" +cargo run -p soroban-cli -- "$@" diff --git a/cmd/crates/soroban-spec-typescript/ts-tests/src/test.ts b/cmd/crates/soroban-spec-typescript/ts-tests/tests/test.ts similarity index 95% rename from cmd/crates/soroban-spec-typescript/ts-tests/src/test.ts rename to cmd/crates/soroban-spec-typescript/ts-tests/tests/test.ts index 9d0a23e86..d8bcd570c 100644 --- a/cmd/crates/soroban-spec-typescript/ts-tests/src/test.ts +++ b/cmd/crates/soroban-spec-typescript/ts-tests/tests/test.ts @@ -1,8 +1,8 @@ import test from 'ava' -import { Contract, Ok, Err, networks } from 'test-custom-types' +import { Contract, Ok, Err, networks, Address } from 'test-custom-types' const rpcUrl = 'http://localhost:8000/soroban/rpc' -const publicKey = 'GCBVOLOM32I7OD5TWZQCIXCXML3TK56MDY7ZMTAILIBQHHKPCVU42XYW' +const publicKey = 'GDIY6AQQ75WMD4W46EYB7O6UYMHOCGQHLAQGQTKHDX4J2DYQCHVCR4W4' const addr = Address.fromString(publicKey) const contract = new Contract({ @@ -28,7 +28,8 @@ test('woid', async t => { t.is(await contract.woid(), undefined) }) -test('u32_fail_on_even', async t => { +// Bug in soroban client, will be fixed in next release +test.failing('u32_fail_on_even', async t => { t.deepEqual(await contract.u32FailOnEven({ u32_: 1 }), new Ok(1)) t.deepEqual(await contract.u32FailOnEven({ u32_: 0 }), new Err({ message: "Please provide an odd number" })) })