Skip to content

Commit ac16bcc

Browse files
litchipilitchipi
authored
Merge pull request #33 from massalabs/tim/validate_address
Add unit test for new ABI "validate_address"
2 parents b3ccbfc + 8551a75 commit ac16bcc

File tree

11 files changed

+71
-56
lines changed

11 files changed

+71
-56
lines changed

‎assembly/massa/datastore_manipulations/main.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* which is ready to be send on Massa network node!
88
**/
99

10-
import {Storage, getKeys, getKeysOf, generateEvent, Context, print} from "@massalabs/massa-as-sdk";
10+
import { Storage, getKeys, getKeysOf, generateEvent, Context, print } from "@massalabs/massa-as-sdk";
1111

1212
export function main(_args: string): void {
1313

@@ -25,7 +25,7 @@ export function main(_args: string): void {
2525
generateEvent(msg);
2626

2727
let addr_ = Context.callee();
28-
let addr = addr_.toByteString();
28+
let addr = addr_.toString();
2929
let keys2 = getKeysOf(addr);
3030
let msg2 = `keys2: ${keys2}`;
3131
// print(msg2);

‎assembly/massa/get_call_coins/call_coins.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { generateEvent, Context} from "@massalabs/massa-as-sdk";
1+
import { generateEvent, Context } from "@massalabs/massa-as-sdk";
22

3-
export function test(param: StaticArray<u8>): void {
4-
generateEvent("Caller_Address : " + Context.caller().toByteString() + " || tokens sent to the SC during the call : " + Context.transferedCoins().toString());
3+
export function test(param: StaticArray<u8>): void {
4+
generateEvent("Caller_Address : " + Context.caller().toString() + " || tokens sent to the SC during the call : " + Context.transferredCoins().toString());
55
}

‎assembly/massa/get_call_coins/main.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
* which is ready to be send on Massa network node!
88
**/
99

10-
import {createSC, generateEvent, getOpData, getOpKeys} from "@massalabs/massa-as-sdk";
10+
import { createSC, generateEvent, getOpData, getOpKeys } from "@massalabs/massa-as-sdk";
1111

1212
export function main(_args: string): void {
13-
// Create every SC available in the ExecuteSC operation datastore
14-
const keys = getOpKeys();
15-
keys.forEach(function (key) {
16-
const bytecode = getOpData(key);
17-
const address = createSC(bytecode);
18-
generateEvent(address.toByteString());
19-
});
20-
13+
// Create every SC available in the ExecuteSC operation datastore
14+
const keys = getOpKeys();
15+
keys.forEach(function (key) {
16+
const bytecode = getOpData(key);
17+
const address = createSC(bytecode);
18+
generateEvent(address.toString());
19+
});
20+
2121
}

‎assembly/massa/message_trigger/main.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import { generateEvent, createSC, call, Address, getOpData, toBytes } from "@massalabs/massa-as-sdk";
2-
import { Args } from '@massalabs/as-types';
1+
import { generateEvent, createSC, call, Address, getOpData } from "@massalabs/massa-as-sdk";
2+
import { Args, stringToBytes } from '@massalabs/as-types';
33

44
function createContract(): Address {
55
// Source of this SC is in assembly/massa/message_trigger/smart-contract.ts
6-
const bytes: StaticArray<u8> = getOpData(toBytes("smart-contract"));
6+
const bytes: StaticArray<u8> = getOpData(stringToBytes("smart-contract"));
77
const sc_address = createSC(bytes);
88
return sc_address;
99
}
1010

1111
export function main(_args: StaticArray<u8>): void {
1212
const sc_address = createContract();
1313
call(sc_address, "test", new Args(), 0);
14-
generateEvent("Created at:" + sc_address.toByteString());
14+
generateEvent("Created at:" + sc_address.toString());
1515
return;
1616
}

‎assembly/massa/message_trigger/smart-contract.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { sendMessage, Context, currentPeriod, currentThread, generateEvent, Address, toBytes } from "@massalabs/massa-as-sdk";
2-
import { Args } from '@massalabs/as-types';
1+
import { sendMessage, Context, currentPeriod, currentThread, generateEvent, Address } from "@massalabs/massa-as-sdk";
2+
import { Args, stringToBytes } from '@massalabs/as-types';
33

44
export function test(_args: StaticArray<u8>): void {
55
let period = currentPeriod();
66
let thread = currentThread();
77
generateEvent("Triggered");
8-
sendMessage(Context.callee(), "test", period, thread, period + 30, thread, 10000000, 0, 0, new Args().serialize(), new Address("AU1BXFcS8qUwLKbcc2gmMprp1AjbDR7JFd1WTc82RFdWE1Nho9gN"), toBytes("test2"));
8+
sendMessage(Context.callee(), "test", period, thread, period + 30, thread, 10000000, 0, 0, new Args().serialize(), new Address("AU1BXFcS8qUwLKbcc2gmMprp1AjbDR7JFd1WTc82RFdWE1Nho9gN"), stringToBytes("test2"));
99
}

‎assembly/massa/message_trigger/trigger.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { Context, generateEvent, Storage, toBytes } from "@massalabs/massa-as-sdk";
1+
import { stringToBytes } from "@massalabs/as-types";
2+
import { Context, generateEvent, Storage } from "@massalabs/massa-as-sdk";
23

34
export function main(_args: StaticArray<u8>): void {
4-
generateEvent(`Trigger on ${Context.callee().toByteString()}`);
5-
Storage.set(toBytes("test2"), toBytes("test"));
5+
generateEvent(`Trigger on ${Context.callee().toString()}`);
6+
Storage.set(stringToBytes("test2"), stringToBytes("test"));
67
return;
78
}

‎assembly/massa/message_trigger/wrong_trigger.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { Context, generateEvent, Storage, toBytes } from "@massalabs/massa-as-sdk";
1+
import { stringToBytes } from '@massalabs/as-types';
2+
import { Context, generateEvent, Storage } from "@massalabs/massa-as-sdk";
23

34
export function main(_args: StaticArray<u8>): void {
4-
generateEvent(`Trigger on ${Context.callee().toByteString()}`);
5-
Storage.set(toBytes("test"), toBytes("test"));
5+
generateEvent(`Trigger on ${Context.callee().toString()}`);
6+
Storage.set(stringToBytes("test"), stringToBytes("test"));
67
return;
78
}

‎assembly/massa/nested_call/main.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
* which is ready to be send on Massa network node!
88
**/
99

10-
import {createSC, generateEvent, getOpData, getOpKeys, print} from "@massalabs/massa-as-sdk";
10+
import { createSC, generateEvent, getOpData, getOpKeys, print } from "@massalabs/massa-as-sdk";
1111

1212
export function main(_args: string): void {
13-
// Create every SC available in the ExecuteSC operation datastore
14-
const keys = getOpKeys();
15-
keys.forEach(function (key) {
16-
const bytecode = getOpData(key);
17-
const address = createSC(bytecode);
18-
generateEvent(address.toByteString());
19-
print("main:" + address.toByteString());
20-
});
21-
13+
// Create every SC available in the ExecuteSC operation datastore
14+
const keys = getOpKeys();
15+
keys.forEach(function (key) {
16+
const bytecode = getOpData(key);
17+
const address = createSC(bytecode);
18+
generateEvent(address.toString());
19+
print("main:" + address.toString());
20+
});
21+
2222
}

‎assembly/massa/validate_address/main.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { generateEvent, print, validateAddress } from '@massalabs/massa-as-sdk';
2+
3+
export function main(_args: string): void {
4+
let result_ok = validateAddress('AU12E6N5BFAdC2wyiBV6VJjqkWhpz1kLVp2XpbRdSnL1mKjCWT6oR');
5+
let msg_ok = `result ok: ${result_ok}`;
6+
// print(msg_ok);
7+
generateEvent(msg_ok);
8+
9+
let result_bad = validateAddress('AUé2E6N5BFAdC2wyiBV6VJjqkWhpz1kLVp2XpbRdSnL1mKjCWT6oR');
10+
let msg_bad = `result bad: ${result_bad}`;
11+
// print(msg_bad);
12+
generateEvent(msg_bad);
13+
}

‎package-lock.json‎

Lines changed: 16 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)