Skip to content

Commit

Permalink
Merge pull request #126 from ainblockchain/release/v1.5.0
Browse files Browse the repository at this point in the history 
Upgrade version to 1.5.0
  • Loading branch information
@platfowner
platfowner authored Jul 18, 2023
2 parents 8527c5b + 53cd761 commit f7af4d9
Show file tree
Hide file tree
Showing 7 changed files with 238 additions and 39 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr_test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
group: ${{ github.event.pull_request.number }}
cancel-in-progress: true
jobs:
run_test_on_testnet:
run_test_on_develop_branch:
if: ${{ github.base_ref == 'develop' }}
runs-on: ubuntu-latest
steps:
Expand All @@ -17,7 +17,7 @@ jobs:
id: test-pipeline
with:
environment: 'dev'
run_test_on_mainnet:
run_test_on_master_branch:
if: ${{ github.base_ref == 'master' }}
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion __tests__/__snapshots__/ain.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ Object {
"#num_children": 2,
"#num_children:username": 0,
"#num_parents": 1,
"#num_parents:username": 2,
"#num_parents:username": 1,
"#tree_bytes": 698,
"#tree_bytes:username": 178,
"#tree_height": 2,
Expand Down
195 changes: 190 additions & 5 deletions __tests__/ain.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
// @ts-nocheck
import Ain from '../src/ain';
import Reference from '../src/ain-db/ref';
import { TransactionBody, SetOperation, Transaction, TransactionInput, SetOperationType } from '../src/types';
import { createSecretKey } from 'crypto';
import { anyTypeAnnotation } from '@babel/types';
import { TransactionBody, SetOperation, TransactionInput } from '../src/types';
import axios from 'axios';
import { fail, eraseProtoVer } from './test_util';
const {
Expand Down Expand Up @@ -207,6 +204,16 @@ describe('ain-js', function() {
expect(balance).toBeGreaterThan(0);
});

it('transfer with isDryrun = true', async function() {
const balanceBefore = await ain.wallet.getBalance();
const response = await ain.wallet.transfer({
to: '0xbA58D93edD8343C001eC5f43E620712Ba8C10813', value: 100, nonce: -1
}, true); // isDryrun = true
expect(response.result.is_dryrun).toBe(true);
const balanceAfter = await ain.wallet.getBalance();
expect(balanceAfter).toBe(balanceBefore); // NOT changed!
});

it('transfer', async function() {
const balanceBefore = await ain.wallet.getBalance();
const response = await ain.wallet.transfer({
Expand Down Expand Up @@ -376,6 +383,25 @@ describe('ain-js', function() {
expect(thrownError.message).toEqual('Invalid app name for state label: app/path');
});

it('sendTransaction with isDryrun = true', async function() {
await ain.sendTransaction({ operation: targetTx }, true)
.then(res => {
expect(res.result.code).toBe(0);
expect(res.tx_hash).toEqual(expect.stringMatching(TX_PATTERN));
expect(res.result.is_dryrun).toBe(true);
targetTxHash = res.tx_hash;
})
.catch(e => {
console.log("ERROR:", e)
fail('should not happen');
})
});

it('getTransaction for sendTransaction with isDryrun = true', async function () {
const tx = await ain.getTransaction(targetTxHash);
expect(tx).toStrictEqual(null); // The tx is NOT in the blockchain.
});

it('sendTransaction', async function() {
await ain.sendTransaction({ operation: targetTx })
.then(res => {
Expand All @@ -389,11 +415,47 @@ describe('ain-js', function() {
})
});

it('getTransaction', async function () {
it('getTransaction for sendTransaction', async function () {
const tx = await ain.getTransaction(targetTxHash);
expect(tx.transaction.tx_body.operation).toStrictEqual(targetTx);
});

it('sendSignedTransaction with isDryrun = true', async function() {
const tx: TransactionBody = {
nonce: -1,
gas_price: 500,
timestamp: Date.now(),
operation: {
type: "SET_OWNER",
ref: "/apps/bfan",
value: {
".owner": {
"owners": {
"*": {
write_owner: true,
write_rule: true,
branch_owner: true,
write_function: true,
}
}
}
}
}
}
const sig = ain.wallet.signTransaction(tx);

await ain.sendSignedTransaction(sig, tx, true)
.then(res => {
expect(res.code).toBe(undefined);
expect(res.tx_hash).toEqual(expect.stringMatching(TX_PATTERN));
expect(res.result.code).toBe(0);
expect(res.result.is_dryrun).toBe(true);
})
.catch(e => {
console.log("ERROR:", e);
fail('should not happen');
})
});

it('sendSignedTransaction', async function() {
const tx: TransactionBody = {
Expand Down Expand Up @@ -597,6 +659,31 @@ describe('ain-js', function() {
expect(ain.db.ref(test_path).path).toBe('/' + test_path);
});

it('setOwner with isDryrun = true', async function() {
await ain.db.ref(allowed_path).setOwner({
value: {
".owner": {
"owners": {
"*": {
write_owner: true,
write_rule: true,
write_function: true,
branch_owner: true
}
}
}
}
}, true) // isDryrun = true
.then(res => {
expect(res.result.code).toBe(0);
expect(res.result.is_dryrun).toBe(true);
})
.catch((error) => {
console.log("setOwner error:", error);
fail('should not happen');
});
});

it('setOwner', async function() {
await ain.db.ref(allowed_path).setOwner({
value: {
Expand Down Expand Up @@ -645,6 +732,20 @@ describe('ain-js', function() {
});
});

it('setRule with isDryrun = true', async function() {
await ain.db.ref(allowed_path).setRule({
value: { '.rule': { 'write': "true" } }
}, true) // isDryrun = true
.then(res => {
expect(res.result.code).toBe(0);
expect(res.result.is_dryrun).toBe(true);
})
.catch((error) => {
console.log("setRule error:", error);
fail('should not happen');
});
});

it('setRule', async function() {
await ain.db.ref(allowed_path).setRule({
value: { '.rule': { 'write': "true" } }
Expand All @@ -658,6 +759,20 @@ describe('ain-js', function() {
});
});

it('setValue with isDryrun = true', async function() {
await ain.db.ref(allowed_path + '/username').setValue({
value: "test_user"
}, true) // isDryrun = true
.then(res => {
expect(res.result.code).toBe(0);
expect(res.result.is_dryrun).toBe(true);
})
.catch((error) => {
console.log("setValue error:", error);
fail('should not happen');
});
});

it('setValue', async function() {
await ain.db.ref(allowed_path + '/username').setValue({
value: "test_user"
Expand All @@ -671,6 +786,28 @@ describe('ain-js', function() {
});
});

it('setFunction with isDryrun = true', async function() {
await ain.db.ref(allowed_path).setFunction({
value: {
".function": {
'0xFUNCTION_HASH': {
function_url: "https://events.ainetwork.ai/trigger",
function_id: '0xFUNCTION_HASH',
function_type: "REST"
}
}
}
}, true) // isDryrun = true
.then(res => {
expect(res.result.code).toBe(0);
expect(res.result.is_dryrun).toBe(true);
})
.catch((error) => {
console.log("setFunction error:", error);
fail('should not happen');
})
});

it('setFunction', async function() {
await ain.db.ref(allowed_path).setFunction({
value: {
Expand All @@ -692,6 +829,42 @@ describe('ain-js', function() {
})
});

it('set with isDryrun = true', async function() {
await ain.db.ref(allowed_path).set({
op_list: [
{
type: 'SET_RULE',
ref: 'can/write/',
value: { '.rule': { 'write': "true" } }
},
{
type: 'SET_RULE',
ref: 'cannot/write',
value: { '.rule': { 'write': "false" } }
},
{
type: 'INC_VALUE',
ref: 'can/write/',
value: 5
},
{
type: 'DEC_VALUE',
ref: 'can/write',
value: 10,
}
],
nonce: -1
}, true) // isDryrun = true
.then(res => {
expect(Object.keys(res.result).length).toBe(5);
expect(res.result.is_dryrun).toBe(true);
})
.catch((error) => {
console.log("set error:",error);
fail('should not happen');
});
});

it('set', async function() {
await ain.db.ref(allowed_path).set({
op_list: [
Expand Down Expand Up @@ -857,6 +1030,18 @@ describe('ain-js', function() {
expect(getWithVersion['#version']).not.toBeNull();
});

it('deleteValue with isDryrun = true', async function() {
await ain.db.ref(`${allowed_path}/can/write`).deleteValue({}, true)
.then(res => {
expect(res.result.code).toBe(0);
expect(res.result.is_dryrun).toBe(true);
}) // isDryrun = true
.catch((error) => {
console.log("deleteValue error:",error);
fail('should not happen');
});
});

it('deleteValue', async function() {
await ain.db.ref(`${allowed_path}/can/write`).deleteValue()
.then(res => {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ainblockchain/ain-js",
"version": "1.4.0",
"version": "1.5.0",
"description": "",
"main": "lib/ain.js",
"scripts": {
Expand Down
Loading

0 comments on commit f7af4d9

Please sign in to comment.