Skip to content
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

Jump to bottom

Extending contract #319

Closed
wants to merge 4 commits into from
Closed

Extending contract #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21f476b
extended contract added (now working), counter tests improved
volovyks Dec 4, 2022
b26d0fc
NearBindgen added
volovyks Dec 4, 2022
c9aa8d2
conflicts solved
volovyks Dec 5, 2022
540bcc1
lint fix
volovyks Dec 5, 2022
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
31 changes: 24 additions & 7 deletions examples/__tests__/test-counter.ava.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,31 @@ test.beforeEach(async (t) => {
// Prepare sandbox for tests, create accounts, deploy contracts, etc.
const root = worker.rootAccount;

let counterContract;

switch (process.env.COUNTER_CONTRACT_TYPE) {
case "COUNTER_LOW_LEVEL": {
counterContract = "./build/counter-lowlevel.wasm";
break;
}
case "COUNTER_TS": {
counterContract = "./build/counter-ts.wasm";
break;
}
case "COUNTER_JS": {
counterContract = "./build/counter.wasm";
break;
}
case "COUNTER_EXTENDED": {
counterContract = "./build/counter-extended.wasm";
break;
}
default:
throw Error("Unknown COUNTER_CONTRACT_TYPE");
}

// Deploy the counter contract.
const counter = await root.devDeploy(
process.env["COUNTER_LOWLEVEL"]
? "./build/counter-lowlevel.wasm"
: process.env["COUNTER_TS"]
? "./build/counter-ts.wasm"
: "./build/counter.wasm"
);
const counter = await root.devDeploy(counterContract);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding a test for reset?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh I didn't see this:

Note 1: now it does not work, functions from the parent class are not generated or exported.

NearBindgen doesn't walk through parent class, it may be possible to identify extends pattern in our babel pass then recursively NearBindgen on parent class

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it should be possible (not tested), the question is - is it the best approach? I will experiment with this.


// Test users
const ali = await root.createSubAccount("ali");
Expand Down
8 changes: 5 additions & 3 deletions examples/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"build:counter": "near-sdk-js build src/counter.js build/counter.wasm",
"build:counter-lowlevel": "near-sdk-js build src/counter-lowlevel.js build/counter-lowlevel.wasm",
"build:counter-ts": "near-sdk-js build src/counter.ts build/counter-ts.wasm",
"build:counter-extended": "near-sdk-js build src/counter-extended.ts build/counter-extended.wasm",
"build:cross-contract-call": "near-sdk-js build src/status-message.js build/status-message.wasm && near-sdk-js build src/cross-contract-call.js build/cross-contract-call.wasm",
"build:cross-contract-call-loop": "near-sdk-js build src/counter.js build/counter.wasm && near-sdk-js build src/cross-contract-call-loop.js build/cross-contract-call-loop.wasm",
"build:fungible-token-lockable": "near-sdk-js build src/fungible-token-lockable.js build/fungible-token-lockable.wasm",
Expand All @@ -29,9 +30,10 @@
"test:nft": "ava __tests__/standard-nft/*",
"test:status-message": "ava __tests__/test-status-message.ava.js",
"test:clean-state": "ava __tests__/test-clean-state.ava.js",
"test:counter": "ava __tests__/test-counter.ava.js",
"test:counter-lowlevel": "COUNTER_LOWLEVEL=1 ava __tests__/test-counter.ava.js",
"test:counter-ts": "COUNTER_TS=1 ava __tests__/test-counter.ava.js",
"test:counter": "COUNTER_CONTRACT_TYPE=COUNTER_JS ava __tests__/test-counter.ava.js",
"test:counter-lowlevel": "COUNTER_CONTRACT_TYPE=COUNTER_LOW_LEVEL ava __tests__/test-counter.ava.js",
"test:counter-ts": "COUNTER_CONTRACT_TYPE=COUNTER_TS ava __tests__/test-counter.ava.js",
"test:counter-extended": "COUNTER_CONTRACT_TYPE=COUNTER_EXTENDED ava __tests__/test-counter.ava.js",
"test:cross-contract-call": "ava __tests__/test-cross-contract-call.ava.js",
"test:cross-contract-call-loop": "ava __tests__/test-cross-contract-call-loop.ava.js",
"test:fungible-token-lockable": "ava __tests__/test-fungible-token-lockable.ava.js",
Expand Down
11 changes: 11 additions & 0 deletions examples/src/counter-extended.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { near, NearBindgen, call } from "near-sdk-js";
import { Counter } from "./counter";

@NearBindgen({})
export class CounterWithReset extends Counter {
@call({})
reset() {
this.count = 0;
near.log(`Counter is set to 0`);
}
}