Skip to content

Commit

Permalink
Merge pull request #87 from near/init-args
Browse files Browse the repository at this point in the history
Use named parameters in constructor
  • Loading branch information
volovyks authored Jun 7, 2022
2 parents 985e3e9 + 9a6aff8 commit d428b9e
Show file tree
Hide file tree
Showing 22 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion examples/clean-state/__tests__/test-clean-state.ava.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ test.beforeEach(async t => {
const cleanStateContract = await root.createSubAccount('clean-state');
let cleanStateContractBase64 = (await readFile('build/contract.base64')).toString();
await cleanStateContract.call(jsvm, 'deploy_js_contract', Buffer.from(cleanStateContractBase64, 'base64'), { attachedDeposit: '400000000000000000000000' });
await cleanStateContract.call(jsvm, 'call_js_contract', encodeCall(cleanStateContract.accountId, 'init', []), { attachedDeposit: '400000000000000000000000' });
await cleanStateContract.call(jsvm, 'call_js_contract', encodeCall(cleanStateContract.accountId, 'init', {}), { attachedDeposit: '400000000000000000000000' });

// Save state for test runs, it is unique for each test
t.context.worker = worker;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ test.beforeEach(async t => {
const statusMessageContract = await root.createSubAccount('status-message');
let statusContractBase64 = (await readFile('res/status-message.base64')).toString();
await statusMessageContract.call(jsvm, 'deploy_js_contract', Buffer.from(statusContractBase64, 'base64'), { attachedDeposit: '400000000000000000000000' });
await statusMessageContract.call(jsvm, 'call_js_contract', encodeCall(statusMessageContract.accountId, 'init', []), { attachedDeposit: '400000000000000000000000' });
await statusMessageContract.call(jsvm, 'call_js_contract', encodeCall(statusMessageContract.accountId, 'init', {}), { attachedDeposit: '400000000000000000000000' });

// Deploy on-call contrat
const onCallContract = await root.createSubAccount('on-call');
let cross_cc_contract_base64 = (await readFile('build/contract.base64')).toString();
await onCallContract.call(jsvm, 'deploy_js_contract', Buffer.from(cross_cc_contract_base64, 'base64'), { attachedDeposit: '400000000000000000000000' });
await onCallContract.call(jsvm, 'call_js_contract', encodeCall(onCallContract.accountId, 'init', []), { attachedDeposit: '400000000000000000000000' });
await onCallContract.call(jsvm, 'call_js_contract', encodeCall(onCallContract.accountId, 'init', {}), { attachedDeposit: '400000000000000000000000' });

// Create test accounts
const ali = await root.createSubAccount('ali');
Expand Down
2 changes: 1 addition & 1 deletion examples/cross-contract-call/res/status-message.base64
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Aj8uYnVpbGQvc3RhdHVzLW1lc3NhZ2UuanMUZ2V0X3N0YXR1cwhpbml0FHNldF9zdGF0dXMYTmVhckNvbnRyYWN0GlN0YXR1c01lc3NhZ2UyX2FwcGx5RGVjb3JhdGVkRGVzY3JpcHRvcghjYWxsCHZpZXcWTmVhckJpbmRnZW4OVTY0X01BWCBFVklDVEVEX1JFR0lTVEVSBmxvZx5zaWduZXJBY2NvdW50SWQQanN2bUFyZ3MganN2bVN0b3JhZ2VXcml0ZR5qc3ZtU3RvcmFnZVJlYWQMX2NsYXNzDl9jbGFzczIWZGVzZXJpYWxpemUSc2VyaWFsaXplHmRlc2VyaWFsaXplQXJncx5zZXJpYWxpemVSZXR1cm4QcHJvcGVydHkUZGVjb3JhdG9ycxRkZXNjcmlwdG9yDmNvbnRleHQIZGVzYwhrZXlzDmZvckVhY2gWaW5pdGlhbGl6ZXIKc2xpY2UOcmV2ZXJzZQxyZWR1Y2UGa2V5EmRlY29yYXRvcgpDbGFzcxpPcmlnaW5hbENsYXNzEE5ld0NsYXNzCF9nZXQIYXJncwZyZXQMY3JlYXRlBmVudiJzaWduZXJfYWNjb3VudF9pZBpyZWFkX3JlZ2lzdGVyEmpzdm1fYXJncwpleGlzdCRqc3ZtX3N0b3JhZ2Vfd3JpdGUianN2bV9zdG9yYWdlX3JlYWQKc3RhdGUKU1RBVEUMYXNzaWduCnBhcnNlLkNvbnRyYWN0IHN0YXRlIGlzIGVtcHR5EnN0cmluZ2lmeQR7fQ5yZWNvcmRzFGFjY291bnRfaWQyIHNldF9zdGF0dXMgd2l0aCBtZXNzYWdlIDRnZXRfc3RhdHVzIGZvciBhY2NvdW50X2lkIBJfY29udHJhY3QianN2bV92YWx1ZV9yZXR1cm4PvAMAAwAQvgMAD8ADABHCAwAADgAGAaABAAQACRIYtwIExAMCADDsAQMBcMYDBAAw7AEFA3DIAwABygMBAcwDAgHOAwMB0AMEDdIDBQ3UAwYB1gMHAdgDCAHaAwkB3AMKAcQDCwneAwwB4AMNAcYDDgnAAw8BvgMQAcIDEQEI6jbAAOHAAeLAAuPAA+TACF8GAMAJXwcAwApfCADAC18JAMAMXwoAwBVfDwDAFl8QAMAXXxEAKb8EvwWfvwaeXwQAZQQAvweeXwUAYQAABmEBAL8R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BgHAAwAAAAIBAAgAxgMOCGUAABEhAAApvAOLAQIDJg5DBgG+AwADAAUBAG4DtgQBACCMBAEBII4EAQIgxgMOCGECAGEBAGEAAGUAAEIFAQAAJAAAyWIAAELxAAAAJAAADmIAAEE8AAAAQvMAAAAkAADKYgAAQt8AAABiAQAkAQDLYgIAOEUAAACs6iI4CQEAAEIcAQAAYgAAQTwAAABC9AAAAGICACQBACQBAA4pvAOOAQYwQEBZTt8OQwYBwgMAAwAFAQB6A7YEAQAgjAQBASCOBAECIMYDDghhAgBhAQBhAABlAABCBQEAACQAAMliAABC8QAAACQAAA5iAABBPAAAAELzAAAAJAAAymIAAELhAAAAYgEAJAEAy2IAAELyAAAAJAAADmICADhFAAAArOoiOAkBAABCHAEAAGIAAEE8AAAAQvQAAABiAgAkAQAkAQAOKbwDmAEHMEBAWU9A3w==
Aj8uYnVpbGQvc3RhdHVzLW1lc3NhZ2UuanMUZ2V0X3N0YXR1cwhpbml0FHNldF9zdGF0dXMYTmVhckNvbnRyYWN0GlN0YXR1c01lc3NhZ2UyX2FwcGx5RGVjb3JhdGVkRGVzY3JpcHRvcghjYWxsCHZpZXcWTmVhckJpbmRnZW4OVTY0X01BWCBFVklDVEVEX1JFR0lTVEVSBmxvZx5zaWduZXJBY2NvdW50SWQQanN2bUFyZ3MganN2bVN0b3JhZ2VXcml0ZR5qc3ZtU3RvcmFnZVJlYWQMX2NsYXNzDl9jbGFzczIWZGVzZXJpYWxpemUSc2VyaWFsaXplHmRlc2VyaWFsaXplQXJncx5zZXJpYWxpemVSZXR1cm4QcHJvcGVydHkUZGVjb3JhdG9ycxRkZXNjcmlwdG9yDmNvbnRleHQIZGVzYwhrZXlzDmZvckVhY2gWaW5pdGlhbGl6ZXIKc2xpY2UOcmV2ZXJzZQxyZWR1Y2UGa2V5EmRlY29yYXRvcgpDbGFzcxpPcmlnaW5hbENsYXNzEE5ld0NsYXNzCF9nZXQIYXJncwZyZXQMY3JlYXRlBmVudiJzaWduZXJfYWNjb3VudF9pZBpyZWFkX3JlZ2lzdGVyEmpzdm1fYXJncwpleGlzdCRqc3ZtX3N0b3JhZ2Vfd3JpdGUianN2bV9zdG9yYWdlX3JlYWQKc3RhdGUKU1RBVEUMYXNzaWduCnBhcnNlLkNvbnRyYWN0IHN0YXRlIGlzIGVtcHR5EnN0cmluZ2lmeQR7fQ5yZWNvcmRzFGFjY291bnRfaWQyIHNldF9zdGF0dXMgd2l0aCBtZXNzYWdlIDRnZXRfc3RhdHVzIGZvciBhY2NvdW50X2lkIBJfY29udHJhY3QianN2bV92YWx1ZV9yZXR1cm4PvAMAAwAQvgMAD8ADABHCAwAADgAGAaABAAQACRIYtwIExAMCADDsAQMBcMYDBAAw7AEFA3DIAwABygMBAcwDAgHOAwMB0AMEDdIDBQ3UAwYB1gMHAdgDCAHaAwkB3AMKAcQDCwneAwwB4AMNAcYDDgnAAw8BvgMQAcIDEQEI6jbAAOHAAeLAAuPAA+TACF8GAMAJXwcAwApfCADAC18JAMAMXwoAwBVfDwDAFl8QAMAXXxEAKb8EvwWfvwaeXwQAZQQAvweeXwUAYQAABmEBAL8R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
2 changes: 1 addition & 1 deletion examples/cross-contract-call/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { NearContract, NearBindgen, call, view, near } from 'near-sdk-js'

@NearBindgen
class OnCall extends NearContract {
constructor() {
constructor({ }) {
super()
this.personOnCall = "undefined"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ test.beforeEach(async t => {
const fungibleTokenContract = await root.createSubAccount('fungible-token');
let ftContractBase64 = (await readFile('build/contract.base64')).toString();
await fungibleTokenContract.call(jsvm, 'deploy_js_contract', Buffer.from(ftContractBase64, 'base64'), { attachedDeposit: '400000000000000000000000' });
await fungibleTokenContract.call(jsvm, 'call_js_contract', encodeCall(fungibleTokenContract.accountId, 'init', ['a', '1000']), { attachedDeposit: '400000000000000000000000' });
await fungibleTokenContract.call(jsvm, 'call_js_contract', encodeCall(fungibleTokenContract.accountId, 'init', { prefix: 'a', totalSupply: '1000' }), { attachedDeposit: '400000000000000000000000' });

// Create test accounts
const ali = await root.createSubAccount('ali');
Expand Down
2 changes: 1 addition & 1 deletion examples/fungible-token/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function assert(b, str) {

@NearBindgen
class FungibleToken extends NearContract {
constructor(prefix, totalSupply) {
constructor({ prefix, totalSupply }) {
super()
this.accounts = new LookupMap(prefix)
this.totalSupply = totalSupply
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ test.beforeEach(async t => {
const lockableFt = await root.createSubAccount('lockable-ft');
let contract_base64 = (await readFile('build/contract.base64')).toString();
await lockableFt.call(jsvm, 'deploy_js_contract', Buffer.from(contract_base64, 'base64'), { attachedDeposit: '1000000000000000000000000' });
await lockableFt.call(jsvm, 'call_js_contract', encodeCall(lockableFt.accountId, 'init', ['prefix', 10000]), { attachedDeposit: '1000000000000000000000000' });
await lockableFt.call(jsvm, 'call_js_contract', encodeCall(lockableFt.accountId, 'init', { prefix: 'prefix', totalSupply: 10000 }), { attachedDeposit: '1000000000000000000000000' });

// Test users
const ali = await root.createSubAccount('ali');
Expand Down
2 changes: 1 addition & 1 deletion examples/lockable-fungible-token/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class Account {

@NearBindgen
class LockableFungibleToken extends NearContract {
constructor(prefix, totalSupply) {
constructor({ prefix, totalSupply }) {
super()
this.accounts = new LookupMap(prefix) // Account ID -> Account mapping
this.totalSupply = totalSupply // Total supply of the all tokens
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ test.beforeEach(async t => {
const nftContract = await root.createSubAccount('fungible-token');
let nftContractBase64 = (await readFile('build/contract.base64')).toString();
await nftContract.call(jsvm, 'deploy_js_contract', Buffer.from(nftContractBase64, 'base64'), { attachedDeposit: '400000000000000000000000' });
await nftContract.call(jsvm, 'call_js_contract', encodeCall(nftContract.accountId, 'init', [nftContract.accountId, 'prefix']), { attachedDeposit: '400000000000000000000000' });
await nftContract.call(jsvm, 'call_js_contract', encodeCall(nftContract.accountId, 'init', { owner_id: nftContract.accountId, owner_by_id_prefix: 'prefix' }), { attachedDeposit: '400000000000000000000000' });

// Deploy token receiver contract
const tokenReceiverContract = await root.createSubAccount('token-receiver');
let tokenReceiverContractBase64 = (await readFile('build/test-token-receiver.base64')).toString();
await tokenReceiverContract.call(jsvm, 'deploy_js_contract', Buffer.from(tokenReceiverContractBase64, 'base64'), { attachedDeposit: '400000000000000000000000' });
await tokenReceiverContract.call(jsvm, 'call_js_contract', encodeCall(tokenReceiverContract.accountId, 'init', [nftContract.accountId]), { attachedDeposit: '400000000000000000000000' });
await tokenReceiverContract.call(jsvm, 'call_js_contract', encodeCall(tokenReceiverContract.accountId, 'init', { nonFungibleTokenAccountId: nftContract.accountId }), { attachedDeposit: '400000000000000000000000' });

// Mint an NFT
let tokenId = 'my-cool-nft';
Expand Down
2 changes: 1 addition & 1 deletion examples/non-fungible-token/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class Token {

@NearBindgen
class NftContract extends NearContract {
constructor(owner_id, owner_by_id_prefix) {
constructor({ owner_id, owner_by_id_prefix }) {
super()
this.owner_id = owner_id
this.owner_by_id = new LookupMap(owner_by_id_prefix)
Expand Down
2 changes: 1 addition & 1 deletion examples/non-fungible-token/src/test-token-receiver.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function assert(b, str) {

@NearBindgen
class NftContract extends NearContract {
constructor(nonFungibleTokenAccountId) {
constructor({ nonFungibleTokenAccountId }) {
super()
this.nonFungibleTokenAccountId = nonFungibleTokenAccountId
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ test.beforeEach(async t => {
const statusMessage = await root.createSubAccount('status-message');
let contract_base64 = (await readFile('build/status-message-collections.base64')).toString();
await statusMessage.call(jsvm, 'deploy_js_contract', Buffer.from(contract_base64, 'base64'), { attachedDeposit: '400000000000000000000000' });
await statusMessage.call(jsvm, 'call_js_contract', encodeCall(statusMessage.accountId, 'init', []), { attachedDeposit: '400000000000000000000000' });
await statusMessage.call(jsvm, 'call_js_contract', encodeCall(statusMessage.accountId, 'init', {}), { attachedDeposit: '400000000000000000000000' });

// Test users
const ali = await root.createSubAccount('ali');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ test.before(async t => {
const statusMessage = await root.createSubAccount('status-message');
let contract_base64 = (await readFile('build/status-message.base64')).toString();
await statusMessage.call(jsvm, 'deploy_js_contract', Buffer.from(contract_base64, 'base64'), { attachedDeposit: '400000000000000000000000' });
await statusMessage.call(jsvm, 'call_js_contract', encodeCall(statusMessage.accountId, 'init', []), { attachedDeposit: '400000000000000000000000' });
await statusMessage.call(jsvm, 'call_js_contract', encodeCall(statusMessage.accountId, 'init', {}), { attachedDeposit: '400000000000000000000000' });

// Test users
const ali = await root.createSubAccount('ali');
Expand Down
2 changes: 1 addition & 1 deletion examples/template/__tests__/test-template.ava.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ test.beforeEach(async t => {
const counter = await root.createSubAccount('counter');
let contract_base64 = (await readFile('build/contract.base64')).toString();
await counter.call(jsvm, 'deploy_js_contract', Buffer.from(contract_base64, 'base64'), { attachedDeposit: '400000000000000000000000' });
await counter.call(jsvm, 'call_js_contract', encodeCall(counter.accountId, 'init', []), { attachedDeposit: '400000000000000000000000' });
await counter.call(jsvm, 'call_js_contract', encodeCall(counter.accountId, 'init', {}), { attachedDeposit: '400000000000000000000000' });

// Test users
const ali = await root.createSubAccount('ali');
Expand Down
2 changes: 1 addition & 1 deletion examples/template/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { isUndefined } from 'lodash-es'

@NearBindgen
class Counter extends NearContract {
constructor(initial = 0) {
constructor({ initial = 0 }) {
super()
this.count = initial
}
Expand Down
2 changes: 1 addition & 1 deletion src/near-bindgen.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export function NearBindgen (Class) {
let OriginalClass = Class
let NewClass = function() {
let args = OriginalClass.deserializeArgs()
let ret = new OriginalClass(...args)
let ret = new OriginalClass(args)
ret.serialize()
return ret
}
Expand Down
2 changes: 1 addition & 1 deletion tests/__tests__/function-params.ava.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ test.beforeEach(async t => {
const testContract = await root.createSubAccount('test-contract');
let contract_base64 = (await readFile('build/function-params.base64')).toString();
await testContract.call(jsvm, 'deploy_js_contract', Buffer.from(contract_base64, 'base64'), { attachedDeposit: '400000000000000000000000' });
await testContract.call(jsvm, 'call_js_contract', encodeCall(testContract.accountId, 'init', []), { attachedDeposit: '400000000000000000000000' });
await testContract.call(jsvm, 'call_js_contract', encodeCall(testContract.accountId, 'init', {}), { attachedDeposit: '400000000000000000000000' });

// Test users
const ali = await root.createSubAccount('ali');
Expand Down
2 changes: 1 addition & 1 deletion tests/__tests__/lookup-map.ava.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ test.beforeEach(async t => {
const testContract = await root.createSubAccount('test-contract');
let contract_base64 = (await readFile('build/lookup-map.base64')).toString();
await testContract.call(jsvm, 'deploy_js_contract', Buffer.from(contract_base64, 'base64'), { attachedDeposit: '400000000000000000000000' });
await testContract.call(jsvm, 'call_js_contract', encodeCall(testContract.accountId, 'init', []), { attachedDeposit: '400000000000000000000000' });
await testContract.call(jsvm, 'call_js_contract', encodeCall(testContract.accountId, 'init', {}), { attachedDeposit: '400000000000000000000000' });

// Test users
const ali = await root.createSubAccount('ali');
Expand Down
2 changes: 1 addition & 1 deletion tests/__tests__/lookup-set.ava.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ test.beforeEach(async t => {
const testContract = await root.createSubAccount('test-contract');
let contract_base64 = (await readFile('build/lookup-set.base64')).toString();
await testContract.call(jsvm, 'deploy_js_contract', Buffer.from(contract_base64, 'base64'), { attachedDeposit: '400000000000000000000000' });
await testContract.call(jsvm, 'call_js_contract', encodeCall(testContract.accountId, 'init', []), { attachedDeposit: '400000000000000000000000' });
await testContract.call(jsvm, 'call_js_contract', encodeCall(testContract.accountId, 'init', {}), { attachedDeposit: '400000000000000000000000' });

// Test users
const ali = await root.createSubAccount('ali');
Expand Down
Loading

0 comments on commit d428b9e

Please sign in to comment.