Skip to content

Feat: Replace Standalone with Local in TS Boilerplate #2251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Feat: Replace Standalone with Local in TS Boilerplate #2251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/crates/soroban-spec-typescript/src/boilerplate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ static PROJECT_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/src/project_temp

const NETWORK_PASSPHRASE_TESTNET: &str = "Test SDF Network ; September 2015";
const NETWORK_PASSPHRASE_FUTURENET: &str = "Test SDF Future Network ; October 2022";
const NETWORK_PASSPHRASE_STANDALONE: &str = "Standalone Network ; February 2017";
const NETWORK_PASSPHRASE_LOCAL: &str = "Standalone Network ; February 2017";

pub struct Project(PathBuf);

Expand Down Expand Up @@ -125,7 +125,7 @@ impl Project {
let network = match network_passphrase {
NETWORK_PASSPHRASE_TESTNET => "testnet",
NETWORK_PASSPHRASE_FUTURENET => "futurenet",
NETWORK_PASSPHRASE_STANDALONE => "standalone",
NETWORK_PASSPHRASE_LOCAL => "local",
_ => "unknown",
};
format!(
Expand Down
338 changes: 184 additions & 154 deletions cmd/crates/soroban-spec-typescript/ts-tests/src/test-custom-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,193 +1,223 @@
import test from 'ava'
import { root, rpcUrl, signer } from './util.js'
import { Client, networks, contract as ContractClient } from 'test-custom-types'
import test from "ava";
import { root, rpcUrl, signer } from "./util.js";
import {
Client,
networks,
contract as ContractClient,
} from "test-custom-types";

const publicKey = root.keypair.publicKey();

const contract = new Client({
...networks.standalone,
...networks.local,
rpcUrl,
allowHttp: true,
publicKey: root.keypair.publicKey(),
...signer,
});

test('hello', async t => {
const { result } = await contract.hello({ hello: 'tests' })
t.is(result, 'tests')
})
test("hello", async (t) => {
const { result } = await contract.hello({ hello: "tests" });
t.is(result, "tests");
});

test('woid', async t => {
t.is((await contract.woid()).result, null)
})
test("woid", async (t) => {
t.is((await contract.woid()).result, null);
});

test('u32_fail_on_even', async t => {
test("u32_fail_on_even", async (t) => {
t.deepEqual(
(await contract.u32_fail_on_even({ u32_: 1 })).result,
new ContractClient.Ok(1)
)
new ContractClient.Ok(1),
);
t.deepEqual(
(await contract.u32_fail_on_even({ u32_: 0 })).result,
new ContractClient.Err({ message: "Please provide an odd number" })
)
})
new ContractClient.Err({ message: "Please provide an odd number" }),
);
});

test('u32_', async t => {
t.is((await contract.u32_({ u32_: 1 })).result, 1)
})
test("u32_", async (t) => {
t.is((await contract.u32_({ u32_: 1 })).result, 1);
});

test('i32_', async t => {
t.is((await contract.i32_({ i32_: 1 })).result, 1)
})
test("i32_", async (t) => {
t.is((await contract.i32_({ i32_: 1 })).result, 1);
});

test('i64_', async t => {
t.is((await contract.i64_({ i64_: 1n })).result, 1n)
})
test("i64_", async (t) => {
t.is((await contract.i64_({ i64_: 1n })).result, 1n);
});

test("strukt_hel", async (t) => {
const test = { a: 0, b: true, c: "world" }
t.deepEqual((await contract.strukt_hel({ strukt: test })).result, ["Hello", "world"])
})
const test = { a: 0, b: true, c: "world" };
t.deepEqual((await contract.strukt_hel({ strukt: test })).result, [
"Hello",
"world",
]);
});

test("strukt", async (t) => {
const test = { a: 0, b: true, c: "hello" }
t.deepEqual((await contract.strukt({ strukt: test })).result, test)
})

test('simple first', async t => {
const arg = { tag: 'First', values: undefined } as const
const ret = { tag: 'First' }
t.deepEqual((await contract.simple({ simple: arg })).result, ret)
})

test('simple second', async t => {
const arg = { tag: 'Second', values: undefined } as const
const ret = { tag: 'Second' }
t.deepEqual((await contract.simple({ simple: arg })).result, ret)
})

test('simple third', async t => {
const arg = { tag: 'Third', values: undefined } as const
const ret = { tag: 'Third' }
t.deepEqual((await contract.simple({ simple: arg })).result, ret)
})

test('complex with struct', async t => {
const arg = { tag: 'Struct', values: [{ a: 0, b: true, c: 'hello' }] } as const
const ret = { tag: 'Struct', values: [{ a: 0, b: true, c: 'hello' }] }
t.deepEqual((await contract.complex({ complex: arg })).result, ret)
})

test('complex with tuple', async t => {
const arg = { tag: 'Tuple', values: [[{ a: 0, b: true, c: 'hello' }, { tag: 'First', values: undefined }]] } as const
const ret = { tag: 'Tuple', values: [[{ a: 0, b: true, c: 'hello' }, { tag: 'First' }]] }
t.deepEqual((await contract.complex({ complex: arg })).result, ret)
})

test('complex with enum', async t => {
const arg = { tag: 'Enum', values: [{ tag: 'First', values: undefined }] } as const
const ret = { tag: 'Enum', values: [{ tag: 'First' }] }
t.deepEqual((await contract.complex({ complex: arg })).result, ret)
})

test('complex with asset', async t => {
const arg = { tag: 'Asset', values: [publicKey, 1n] } as const
const ret = { tag: 'Asset', values: [publicKey, 1n] }
t.deepEqual((await contract.complex({ complex: arg })).result, ret)
})

test('complex with void', async t => {
const arg = { tag: 'Void', values: undefined } as const
const ret = { tag: 'Void' }
t.deepEqual((await contract.complex({ complex: arg })).result, ret)
})

test('addresse', async t => {
t.deepEqual((await contract.addresse({ addresse: publicKey })).result, publicKey)
})

test('bytes', async t => {
const bytes = Buffer.from('hello')
t.deepEqual((await contract.bytes({ bytes })).result, bytes)
})

test('bytes_n', async t => {
const bytes_n = Buffer.from('123456789') // what's the correct way to construct bytes_n?
t.deepEqual((await contract.bytes_n({ bytes_n })).result, bytes_n)
})

test('card', async t => {
const card = 11
t.is((await contract.card({ card })).result, card)
})

test('boolean', async t => {
t.is((await contract.boolean({ boolean: true })).result, true)
})

test('not', async t => {
t.is((await contract.not({ boolean: true })).result, false)
})

test('i128', async t => {
t.is((await contract.i128({ i128: -1n })).result, -1n)
})

test('u128', async t => {
t.is((await contract.u128({ u128: 1n })).result, 1n)
})

test('multi_args', async t => {
t.is((await contract.multi_args({ a: 1, b: true })).result, 1)
t.is((await contract.multi_args({ a: 1, b: false })).result, 0)
})

test('map', async t => {
const map = new Map()
map.set(1, true)
map.set(2, false)
const test = { a: 0, b: true, c: "hello" };
t.deepEqual((await contract.strukt({ strukt: test })).result, test);
});

test("simple first", async (t) => {
const arg = { tag: "First", values: undefined } as const;
const ret = { tag: "First" };
t.deepEqual((await contract.simple({ simple: arg })).result, ret);
});

test("simple second", async (t) => {
const arg = { tag: "Second", values: undefined } as const;
const ret = { tag: "Second" };
t.deepEqual((await contract.simple({ simple: arg })).result, ret);
});

test("simple third", async (t) => {
const arg = { tag: "Third", values: undefined } as const;
const ret = { tag: "Third" };
t.deepEqual((await contract.simple({ simple: arg })).result, ret);
});

test("complex with struct", async (t) => {
const arg = {
tag: "Struct",
values: [{ a: 0, b: true, c: "hello" }],
} as const;
const ret = { tag: "Struct", values: [{ a: 0, b: true, c: "hello" }] };
t.deepEqual((await contract.complex({ complex: arg })).result, ret);
});

test("complex with tuple", async (t) => {
const arg = {
tag: "Tuple",
values: [
[
{ a: 0, b: true, c: "hello" },
{ tag: "First", values: undefined },
],
],
} as const;
const ret = {
tag: "Tuple",
values: [[{ a: 0, b: true, c: "hello" }, { tag: "First" }]],
};
t.deepEqual((await contract.complex({ complex: arg })).result, ret);
});

test("complex with enum", async (t) => {
const arg = {
tag: "Enum",
values: [{ tag: "First", values: undefined }],
} as const;
const ret = { tag: "Enum", values: [{ tag: "First" }] };
t.deepEqual((await contract.complex({ complex: arg })).result, ret);
});

test("complex with asset", async (t) => {
const arg = { tag: "Asset", values: [publicKey, 1n] } as const;
const ret = { tag: "Asset", values: [publicKey, 1n] };
t.deepEqual((await contract.complex({ complex: arg })).result, ret);
});

test("complex with void", async (t) => {
const arg = { tag: "Void", values: undefined } as const;
const ret = { tag: "Void" };
t.deepEqual((await contract.complex({ complex: arg })).result, ret);
});

test("addresse", async (t) => {
t.deepEqual(
(await contract.addresse({ addresse: publicKey })).result,
publicKey,
);
});

test("bytes", async (t) => {
const bytes = Buffer.from("hello");
t.deepEqual((await contract.bytes({ bytes })).result, bytes);
});

test("bytes_n", async (t) => {
const bytes_n = Buffer.from("123456789"); // what's the correct way to construct bytes_n?
t.deepEqual((await contract.bytes_n({ bytes_n })).result, bytes_n);
});

test("card", async (t) => {
const card = 11;
t.is((await contract.card({ card })).result, card);
});

test("boolean", async (t) => {
t.is((await contract.boolean({ boolean: true })).result, true);
});

test("not", async (t) => {
t.is((await contract.not({ boolean: true })).result, false);
});

test("i128", async (t) => {
t.is((await contract.i128({ i128: -1n })).result, -1n);
});

test("u128", async (t) => {
t.is((await contract.u128({ u128: 1n })).result, 1n);
});

test("multi_args", async (t) => {
t.is((await contract.multi_args({ a: 1, b: true })).result, 1);
t.is((await contract.multi_args({ a: 1, b: false })).result, 0);
});

test("map", async (t) => {
const map = new Map();
map.set(1, true);
map.set(2, false);
// map.set(3, 'hahaha') // should throw an error
const ret = Array.from(map.entries())
t.deepEqual((await contract.map({ map })).result, ret)
})
const ret = Array.from(map.entries());
t.deepEqual((await contract.map({ map })).result, ret);
});

test('vec', async t => {
const vec = [1, 2, 3]
t.deepEqual((await contract.vec({ vec })).result, vec)
})
test("vec", async (t) => {
const vec = [1, 2, 3];
t.deepEqual((await contract.vec({ vec })).result, vec);
});

test('tuple', async t => {
const tuple = ['hello', 1] as const
t.deepEqual((await contract.tuple({ tuple })).result, tuple)
})
test("tuple", async (t) => {
const tuple = ["hello", 1] as const;
t.deepEqual((await contract.tuple({ tuple })).result, tuple);
});

test('option', async t => {
test("option", async (t) => {
// this makes sense
t.deepEqual((await contract.option({ option: 1 })).result, 1)
t.deepEqual((await contract.option({ option: 1 })).result, 1);

// this passes but shouldn't
t.deepEqual((await contract.option({ option: undefined })).result, undefined)
t.deepEqual((await contract.option({ option: undefined })).result, undefined);

// this is the behavior we probably want, but fails
// t.deepEqual(await contract.option(), undefined) // typing and implementation require the object
// t.deepEqual((await contract.option({})).result, undefined) // typing requires argument; implementation would be fine with this
// t.deepEqual((await contract.option({ option: undefined })).result, undefined)
})
});

test('u256', async t => {
t.is((await contract.u256({ u256: 1n })).result, 1n)
})
test("u256", async (t) => {
t.is((await contract.u256({ u256: 1n })).result, 1n);
});

test('i256', async t => {
t.is((await contract.i256({ i256: -1n })).result, -1n)
})
test("i256", async (t) => {
t.is((await contract.i256({ i256: -1n })).result, -1n);
});

test('string', async t => {
t.is((await contract.string({ string: 'hello' })).result, 'hello')
})
test("string", async (t) => {
t.is((await contract.string({ string: "hello" })).result, "hello");
});

test('tuple_strukt', async t => {
const arg = [{ a: 0, b: true, c: 'hello' }, { tag: 'First', values: undefined }] as const
const res = [{ a: 0, b: true, c: 'hello' }, { tag: 'First' }]
t.deepEqual((await contract.tuple_strukt({ tuple_strukt: arg })).result, res)
})
test("tuple_strukt", async (t) => {
const arg = [
{ a: 0, b: true, c: "hello" },
{ tag: "First", values: undefined },
] as const;
const res = [{ a: 0, b: true, c: "hello" }, { tag: "First" }];
t.deepEqual((await contract.tuple_strukt({ tuple_strukt: arg })).result, res);
});
Loading