Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
62 changes: 28 additions & 34 deletions tests/near-bindgen/assembly/hello/main.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
// @nearfile out
// tslint:disable as-variables
//@nearfile out
import { context, storage, ContractPromise, near, logging } from "near-runtime-ts";

import { PromiseArgs, InputPromiseArgs, MyCallbackResult, MyContractPromiseResult } from "./model";
import { u128 } from 'bignum';

import { u128 } from "bignum";

export function hello(name: string): string {

Expand Down Expand Up @@ -146,48 +145,43 @@ export function callPromise(args: PromiseArgs): void {
let promise = ContractPromise.create(
args.receiver,
args.methodName,
//@ts-ignore
// tslint:disable-next-line: no-unsafe-any
inputArgs.serialize(),
inputArgs.encode().serialize(),
args.gas,
new u128(args.balance));
if (args.callback) {
inputArgs.args = args.callbackArgs;
let callbackBalance = new u128(args.callbackBalance as u64);
let callbackBalance = args.callbackBalance as u64;

promise = promise.then(
context.contractName,
args.callback,
"Method name", //TODO
//@ts-ignore
// tslint:disable-next-line: no-unsafe-any
inputArgs.serialize(),
//@ts-ignore
// tslint:disable-next-line: no-unsafe-any
callbackBalance
inputArgs.encode().serialize(),
args.callbackGas,
new u128(callbackBalance)
);
}
promise.returnAsResult();
}

// export function callbackWithName(args: PromiseArgs): MyCallbackResult {
// let contractResults = ContractPromise.getResults();
// let allRes = Array.create<MyContractPromiseResult>(contractResults.length);
// for (let i = 0; i < contractResults.length; ++i) {
// let res = contractResults[i];
// allRes[i] = new MyContractPromiseResult();
// allRes[i].ok = res.success;
// if (allRes[i].ok && res.buffer != null && res.buffer.length > 0) {
// allRes[i].r = decode<MyCallbackResult>(res.buffer);
// }
// }
// let result: MyCallbackResult = {
// rs: allRes,
// n: context.contractName,
// };
// let bytes = result.serialize();
// storage.setBytes("lastResult", bytes);
// return result;
// }
export function callbackWithName(args: PromiseArgs): MyCallbackResult {
let contractResults = ContractPromise.getResults();
let allRes = Array.create<MyContractPromiseResult>(contractResults.length);
for (let i = 0; i < contractResults.length; ++i) {
allRes[i] = new MyContractPromiseResult();
allRes[i].ok = (contractResults[i].status == 1);
if (allRes[i].ok && contractResults[i].buffer != null && contractResults[i].buffer.length > 0) {
allRes[i].r = MyCallbackResult.decode(contractResults[i].buffer);
}
}
let result: MyCallbackResult = {
rs: allRes,
n: context.contractName,
};
let bytes = result.encode().serialize();
storage.setBytes("lastResult", bytes);
return result;
}

export function getLastResult(): MyCallbackResult {
return MyCallbackResult.decode(storage.getBytes("lastResult"));
}

7 changes: 3 additions & 4 deletions tests/near-bindgen/assembly/hello/model.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
// @nearfile out

//@nearfile out
export class PromiseArgs {
receiver: string;
methodName: string;
args: PromiseArgs;
gas: i32;
balance: i32;
callback: string;
callbackArgs: PromiseArgs;
callbackBalance: i32;
isbool: bool;
str: string;
callbackGas: i32;
}

export class InputPromiseArgs {
Expand Down