Skip to content

Commit

Permalink
script to use init plus some initial changes to tests
Browse files Browse the repository at this point in the history
  • Loading branch information
BlaineHeffron committed Jun 27, 2024
1 parent d0302f9 commit 30e1fcd
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 14 deletions.
1 change: 1 addition & 0 deletions test/e2e/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ yarn.lock
contract-*.txt
.soroban
wasms/specs/*.json
test-contracts
34 changes: 34 additions & 0 deletions test/e2e/initialize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,37 @@ if [[ "$NETWORK_STATUS" != "healthy" ]]; then
fi

$soroban keys generate $SOROBAN_ACCOUNT

# retrieve the contracts using soroban contract init then build them if they dont already exist
# Define directory and WASM file paths
target_dir="$dirname/test-contracts/target/wasm32-unknown-unknown/release"
wasm_files=(
"soroban_custom_types_contract.wasm"
"soroban_atomic_swap_contract.wasm"
"soroban_token_contract.wasm"
"soroban_increment_contract.wasm"
"hello_world.wasm"
)

# Check if all WASM files exist
all_exist=true
for wasm_file in "${wasm_files[@]}"; do
if [ ! -f "$target_dir/$wasm_file" ]; then
all_exist=false
break
fi
done

# If any WASM file is missing, initialize and build the contracts
if [ "$all_exist" = false ]; then
echo "One or more WASM files are missing. Initializing and building contracts..."

# Initialize contracts
$soroban contract init "$dirname/test-contracts" --with-example increment custom_types atomic_swap token

# Change directory to test-contracts and build the contracts
cd "$dirname/test-contracts" || { echo "Failed to change directory!"; exit 1; }
$soroban contract build
else
echo "All WASM files are present."
fi
6 changes: 3 additions & 3 deletions test/e2e/src/test-contract-client-constructor.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ async function clientForFromTest(contractId, publicKey, keypair) {
describe("Client", function () {
before(async function () {
const { client, keypair, contractId } =
await clientFromConstructor("customTypes");
await clientFromConstructor("helloWorld");
const publicKey = keypair.publicKey();
const addr = Address.fromString(publicKey);
this.context = { client, publicKey, addr, contractId, keypair };
});

it("can be constructed with `new Client`", async function () {
const { result } = await this.context.client.hello({ hello: "tests" });
it("can be constructed with `new Client`", async function() {
const { result } = await this.context.client.hello({ to: "tests" });
expect(result).to.equal("tests");
});

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/src/test-custom-types.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ describe("Custom Types Tests", function () {
).to.equal("tests");
});

it("view method with empty keypair", async function () {
const { client: client2 } = await clientFor("customTypes", {
it("view method with empty keypair", async function() {
const { client: client2 } = await clientFor("helloWorld", {
keypair: undefined,
contractId: this.context.contractId,
});
Expand Down
37 changes: 28 additions & 9 deletions test/e2e/src/util.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const { spawnSync } = require("node:child_process");
const { contract, Keypair } = require("../../..");

const basePath = `${__dirname}/../test-contracts/target/wasm32-unknown-unknown/release`;
const contracts = {
customTypes: {
hash: spawnSync(
Expand All @@ -9,11 +10,11 @@ const contracts = {
"contract",
"install",
"--wasm",
`${__dirname}/../wasms/test_custom_types.wasm`,
`${basePath}/soroban_custom_types_contract.wasm`,
],
{ shell: true, encoding: "utf8" },
).stdout.trim(),
path: `${__dirname}/../wasms/test_custom_types.wasm`,
path: `${basePath}/soroban_custom_types_contract.wasm`,
},
helloWorld: {
hash: spawnSync(
Expand All @@ -22,19 +23,37 @@ const contracts = {
"contract",
"install",
"--wasm",
`${__dirname}/../wasms/test_hello_world.wasm`,
`${basePath}/hello_world.wasm`,
],
{ shell: true, encoding: "utf8" },
).stdout.trim(),
path: `${__dirname}/../wasms/test_hello_world.wasm`,
path: `${basePath}/hello_world.wasm`,
},
increment: {
hash: spawnSync(
"./target/bin/soroban",
[
"contract",
"install",
"--wasm",
`${basePath}/soroban_increment_contract.wasm`,
],
{ shell: true, encoding: "utf8" },
).stdout.trim(),
path: `${basePath}/soroban_increment_contract.wasm`,
},
swap: {
hash: spawnSync(
"./target/bin/soroban",
["contract", "install", "--wasm", `${__dirname}/../wasms/test_swap.wasm`],
[
"contract",
"install",
"--wasm",
`${basePath}/soroban_atomic_swap_contract.wasm`,
],
{ shell: true, encoding: "utf8" },
).stdout.trim(),
path: `${__dirname}/../wasms/test_swap.wasm`,
path: `${basePath}/soroban_atomic_swap_contract.wasm`,
},
token: {
hash: spawnSync(
Expand All @@ -43,11 +62,11 @@ const contracts = {
"contract",
"install",
"--wasm",
`${__dirname}/../wasms/test_token.wasm`,
`${basePath}/soroban_token_contract.wasm`,
],
{ shell: true, encoding: "utf8" },
).stdout.trim(),
path: `${__dirname}/../wasms/test_token.wasm`,
path: `${basePath}/soroban_token_contract.wasm`,
},
};
module.exports.contracts = contracts;
Expand All @@ -65,7 +84,7 @@ module.exports.friendbotUrl = friendbotUrl;

async function generateFundedKeypair() {
const keypair = Keypair.random();
await fetch(`${friendbotUrl}/friendbot?addr=${keypair.publicKey()}`);
await fetch(`${friendbotUrl}/?addr=${keypair.publicKey()}`);
return keypair;
}
module.exports.generateFundedKeypair = generateFundedKeypair;
Expand Down

0 comments on commit 30e1fcd

Please sign in to comment.