/tests fixed

tests/__tests__/bytes.ava.js

@@ -1,11 +1,6 @@
 import { Worker } from 'near-workspaces';
-import { readFile } from 'fs/promises'
 import test from 'ava';
 
-function encodeCall(contract, method, args) {
-    return Buffer.concat([Buffer.from(contract), Buffer.from([0]), Buffer.from(method), Buffer.from([0]), Buffer.from(JSON.stringify(args))])
-}
-
 test.beforeEach(async t => {
     // Init the worker and start a Sandbox server
     const worker = await Worker.init();

tests/__tests__/function-params.ava.js

@@ -1,11 +1,6 @@
 import { Worker } from 'near-workspaces';
-import { readFile } from 'fs/promises'
 import test from 'ava';
 
-function encodeCall(contract, method, args) {
-    return Buffer.concat([Buffer.from(contract), Buffer.from([0]), Buffer.from(method), Buffer.from([0]), Buffer.from(JSON.stringify(args))])
-}
-
 test.before(async t => {
     // Init the worker and start a Sandbox server
     const worker = await Worker.init();
@@ -17,7 +12,6 @@ test.before(async t => {
     const functionParamsContract = await root.devDeploy(
         'build/function-params.wasm',
     );
-    await functionParamsContract.call(functionParamsContract, 'init', {});
 
     // Test users
     const ali = await root.createSubAccount('ali');

tests/__tests__/lookup-map.ava.js

@@ -1,11 +1,6 @@
 import { Worker } from 'near-workspaces';
-import { readFile } from 'fs/promises'
 import test from 'ava';
 
-function encodeCall(contract, method, args) {
-    return Buffer.concat([Buffer.from(contract), Buffer.from([0]), Buffer.from(method), Buffer.from([0]), Buffer.from(JSON.stringify(args))])
-}
-
 test.beforeEach(async t => {
     // Init the worker and start a Sandbox server
     const worker = await Worker.init();
@@ -17,7 +12,6 @@ test.beforeEach(async t => {
     const lookupMapContract = await root.devDeploy(
         'build/lookup-map.wasm',
     );
-    await lookupMapContract.call(lookupMapContract, 'init', {});
 
     // Test users
     const ali = await root.createSubAccount('ali');

tests/__tests__/lookup-set.ava.js

@@ -1,11 +1,6 @@
 import { Worker } from 'near-workspaces';
-import { readFile } from 'fs/promises'
 import test from 'ava';
 
-function encodeCall(contract, method, args) {
-    return Buffer.concat([Buffer.from(contract), Buffer.from([0]), Buffer.from(method), Buffer.from([0]), Buffer.from(JSON.stringify(args))])
-}
-
 test.beforeEach(async t => {
     // Init the worker and start a Sandbox server
     const worker = await Worker.init();
@@ -17,7 +12,6 @@ test.beforeEach(async t => {
     const lookupSetContract = await root.devDeploy(
         'build/lookup-set.wasm',
     );
-    await lookupSetContract.call(lookupSetContract, 'init', {});
     // Test users
     const ali = await root.createSubAccount('ali');
     const bob = await root.createSubAccount('bob');

tests/__tests__/test-public-key.ava.js

@@ -1,7 +1,6 @@
 import { Worker } from 'near-workspaces';
 import test from 'ava';
 
-
 test.before(async t => {
     // Init the worker and start a Sandbox server
     const worker = await Worker.init();

tests/__tests__/test_math_api.ava.js

@@ -1,7 +1,6 @@
 import { Worker } from 'near-workspaces';
 import test from 'ava';
 
-
 test.before(async t => {
     // Init the worker and start a Sandbox server
     const worker = await Worker.init();

tests/__tests__/test_storage_api.ava.js

@@ -1,7 +1,6 @@
 import { Worker } from 'near-workspaces';
 import test from 'ava';
 
-
 test.beforeEach(async t => {
     // Use beforeEach instead of before to start from scratch state for each test
     // Init the worker and start a Sandbox server

tests/__tests__/typescript.ava.js

@@ -1,7 +1,6 @@
 import { Worker } from 'near-workspaces';
 import test from 'ava';
 
-
 test.before(async t => {
     // Init the worker and start a Sandbox server
     const worker = await Worker.init();
@@ -13,8 +12,6 @@ test.before(async t => {
     const typescriptContract = await root.devDeploy(
         'build/typescript.wasm',
     );
-    await typescriptContract.call(typescriptContract, 'init', {})
-
     // Test users
     const ali = await root.createSubAccount('ali');
 

tests/__tests__/unordered-map.ava.js

@@ -1,11 +1,6 @@
 import { Worker } from 'near-workspaces';
-import { readFile } from 'fs/promises'
 import test from 'ava';
 
-function encodeCall(contract, method, args) {
-    return Buffer.concat([Buffer.from(contract), Buffer.from([0]), Buffer.from(method), Buffer.from([0]), Buffer.from(JSON.stringify(args))])
-}
-
 test.beforeEach(async t => {
     // Init the worker and start a Sandbox server
     const worker = await Worker.init();
@@ -17,7 +12,6 @@ test.beforeEach(async t => {
     const unorderedMapContract = await root.devDeploy(
         'build/unordered-map.wasm',
     );
-    await unorderedMapContract.call(unorderedMapContract, 'init', {});
     // Test users
     const ali = await root.createSubAccount('ali');
     const bob = await root.createSubAccount('bob');

tests/__tests__/unordered-set.ava.js

@@ -1,11 +1,6 @@
 import { Worker } from 'near-workspaces';
-import { readFile } from 'fs/promises'
 import test from 'ava';
 
-function encodeCall(contract, method, args) {
-    return Buffer.concat([Buffer.from(contract), Buffer.from([0]), Buffer.from(method), Buffer.from([0]), Buffer.from(JSON.stringify(args))])
-}
-
 test.beforeEach(async t => {
     // Init the worker and start a Sandbox server
     const worker = await Worker.init();
@@ -17,7 +12,6 @@ test.beforeEach(async t => {
     const unorderedSetContract = await root.devDeploy(
         'build/unordered-set.wasm',
     );
-    await unorderedSetContract.call(unorderedSetContract, 'init', {});
 
     // Test users
     const ali = await root.createSubAccount('ali');

tests/__tests__/vector.ava.js

@@ -1,5 +1,4 @@
 import { Worker } from 'near-workspaces';
-import { readFile } from 'fs/promises'
 import test from 'ava';
 
 test.beforeEach(async t => {
@@ -13,7 +12,6 @@ test.beforeEach(async t => {
     const vectorContract = await root.devDeploy(
         'build/vector.wasm',
     );
-    await vectorContract.call(vectorContract, 'init', {});
 
     // Test users
     const ali = await root.createSubAccount('ali');

tests/src/function-params.js

@@ -1,5 +1,4 @@
 import {
-    NearContract,
     NearBindgen,
     call,
     view,
@@ -9,10 +8,9 @@ import {
 /**
  * Simple contract to test function parameters
  */
-@NearBindgen
-class FunctionParamsTestContract extends NearContract {
+@NearBindgen({})
+class FunctionParamsTestContract {
     constructor() {
-        super()
         this.val1 = 'default1';
         this.val2 = 'default2';
         this.val3 = 'default3';
@@ -30,8 +28,4 @@ class FunctionParamsTestContract extends NearContract {
     get_values() {
         return { val3: this.val3, val2: this.val2, val1: this.val1 }
     }
-
-    default() {
-        return new FunctionParamsTestContract();
-    }
 }

tests/src/lookup-map.js

@@ -1,45 +1,39 @@
 import {
-    NearContract,
     NearBindgen,
     call,
     view,
     LookupMap
 } from 'near-sdk-js'
-import {House, Room} from './model.js';
+import { House, Room } from './model.js';
 
-@NearBindgen
-class LookupMapTestContract extends NearContract {
+@NearBindgen({})
+class LookupMapTestContract {
     constructor() {
-        super()
         this.lookupMap = new LookupMap('a');
     }
 
-    default() {
-        return new LookupMapTestContract();
-    }
-
     @view
-    get({key}) {
+    get({ key }) {
         return this.lookupMap.get(key);
     }
 
     @view
-    containsKey({key}) {
+    containsKey({ key }) {
         return this.lookupMap.containsKey(key);
     }
 
     @call
-    set({key, value}) {
+    set({ key, value }) {
         this.lookupMap.set(key, value);
     }
 
     @call
-    remove_key({key}) {
+    remove_key({ key }) {
         this.lookupMap.remove(key);
     }
 
     @call
-    extend({kvs}) {
+    extend({ kvs }) {
         this.lookupMap.extend(kvs);
     }
 
@@ -54,7 +48,7 @@ class LookupMapTestContract extends NearContract {
         // restore class object from serialized data
         const house = new House(houseObject.name, houseObject.rooms)
         const roomObject = house.rooms[0]
-        const room = new Room(roomObject.name, roomObject.size) 
+        const room = new Room(roomObject.name, roomObject.size)
         return house.describe() + room.describe()
     }
 }

tests/src/lookup-set.js

@@ -1,23 +1,17 @@
 import {
-    NearContract,
     NearBindgen,
     call,
     view,
     LookupSet
 } from 'near-sdk-js'
 import { House, Room } from './model.js';
 
-@NearBindgen
-class LookupSetTestContract extends NearContract {
+@NearBindgen({})
+class LookupSetTestContract {
     constructor() {
-        super()
         this.lookupSet = new LookupSet('a');
     }
 
-    default() {
-        return new LookupSetTestContract();
-    }
-
     @view
     contains({ key }) {
         return this.lookupSet.contains(key);

tests/src/typescript.ts

@@ -1,18 +1,13 @@
 import {
-    NearContract,
     NearBindgen,
     view,
 } from 'near-sdk-js'
 
-@NearBindgen
-class TypeScriptTestContract extends NearContract {
+@NearBindgen({})
+class TypeScriptTestContract {
     @view
     bigint() {
         // JSON.stringify cannot seriaize a BigInt, need manually toString
         return (1n + 2n).toString()
     }
-
-    default() {
-        return new TypeScriptTestContract()
-    }
 }

tests/src/unordered-map.js

@@ -1,24 +1,17 @@
 import {
-    NearContract,
     NearBindgen,
     call,
     view,
     UnorderedMap,
-    Vector
 } from 'near-sdk-js'
-import {House, Room} from './model.js';
+import { House, Room } from './model.js';
 
-@NearBindgen
-class UnorderedMapTestContract extends NearContract {
+@NearBindgen({})
+class UnorderedMapTestContract {
     constructor() {
-        super()
         this.unorderedMap = new UnorderedMap('a');
     }
 
-    default() {
-        return new UnorderedMapTestContract();
-    }
-
     @view
     len() {
         return this.unorderedMap.length;
@@ -30,17 +23,17 @@ class UnorderedMapTestContract extends NearContract {
     }
 
     @view
-    get({key}) {
+    get({ key }) {
         return this.unorderedMap.get(key);
     }
 
     @call
-    set({key, value}) {
+    set({ key, value }) {
         this.unorderedMap.set(key, value);
     }
 
     @call
-    remove_key({key}) {
+    remove_key({ key }) {
         this.unorderedMap.remove(key);
     }
 
@@ -55,7 +48,7 @@ class UnorderedMapTestContract extends NearContract {
     }
 
     @call
-    extend({kvs}) {
+    extend({ kvs }) {
         this.unorderedMap.extend(kvs);
     }