Merge pull request #63 from nearprotocol/update-hello-contract

Update hello contract to latest version
nearprotocol · Aug 30, 2019 · f8c8736 · f8c8736
2 parents c4f05f5 + 33a6399
commit f8c8736
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 38 deletions.
diff --git a/tests/near-bindgen/assembly/hello/main.ts b/tests/near-bindgen/assembly/hello/main.ts
@@ -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 {
 
@@ -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"));
 }
-
diff --git a/tests/near-bindgen/assembly/hello/model.ts b/tests/near-bindgen/assembly/hello/model.ts
@@ -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 {