Skip to content

Commit

Permalink
revert added ft1_ prefix and eslit exception for _ (#122)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ben-Rey
Ben-Rey authored Aug 31, 2023
1 parent 8010503 commit 6eadc45
Show file tree
Hide file tree
Showing 9 changed files with 131 additions and 156 deletions.
68 changes: 31 additions & 37 deletions smart-contracts/assembly/contracts/FT/__tests__/ft-burn.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ import {
u256ToBytes,
} from '@massalabs/as-types';
import {
ft1_balanceOf,
ft1_totalSupply,
ft1_name,
ft1_symbol,
ft1_decimals,
ft1_version,
balanceOf,
totalSupply,
name,
symbol,
decimals,
version,
constructor,
ft1_increaseAllowance,
ft1_transfer,
ft1_allowance,
increaseAllowance,
transfer,
allowance,
} from '../token';
import { ft1_burn, ft1_burnFrom } from '../burnable/burn';
import { burn, burnFrom } from '../burnable/burn';
import { ownerAddress } from '../../utils/ownership';
import { u256 } from 'as-bignum/assembly';

Expand Down Expand Up @@ -60,23 +60,23 @@ describe('ERC20 BURN - Initialization', () => {
);

test('total supply is properly initialized', () => {
expect(ft1_totalSupply([])).toStrictEqual(u256ToBytes(TOTAL_SUPPLY));
expect(totalSupply([])).toStrictEqual(u256ToBytes(TOTAL_SUPPLY));
});

test('token name is properly initialized', () => {
expect(ft1_name([])).toStrictEqual(stringToBytes(TOKEN_NAME));
expect(name([])).toStrictEqual(stringToBytes(TOKEN_NAME));
});

test('symbol is properly initialized', () => {
expect(ft1_symbol([])).toStrictEqual(stringToBytes(TOKEN_SYMBOL));
expect(symbol([])).toStrictEqual(stringToBytes(TOKEN_SYMBOL));
});

test('decimals is properly initialized', () => {
expect(ft1_decimals([])).toStrictEqual(u8toByte(DECIMALS));
expect(decimals([])).toStrictEqual(u8toByte(DECIMALS));
});

test('version is properly initialized', () => {
expect(ft1_version([])).toStrictEqual(stringToBytes('0.0.0'));
expect(version([])).toStrictEqual(stringToBytes('0.0.0'));
});

test('owner is properly initialized', () => {
Expand All @@ -88,16 +88,16 @@ const burnAmount = new u256(5000, 0, 1);

describe('Burn ERC20 to U1', () => {
test('Should burn ERC20', () => {
ft1_burn(new Args().add(burnAmount).serialize());
burn(new Args().add(burnAmount).serialize());

// check balance of U1
expect(
bytesToU256(ft1_balanceOf(new Args().add(user1Address).serialize())),
bytesToU256(balanceOf(new Args().add(user1Address).serialize())),
// @ts-ignore
).toBe(TOTAL_SUPPLY - burnAmount);

// check totalSupply update
expect(ft1_totalSupply([])).toStrictEqual(
expect(totalSupply([])).toStrictEqual(
// @ts-ignore
u256ToBytes(TOTAL_SUPPLY - burnAmount),
);
Expand All @@ -106,7 +106,7 @@ describe('Burn ERC20 to U1', () => {

describe('Fails burn ERC20', () => {
throws('Fails to burn because of underflow ', () =>
ft1_burn(new Args().add(u256.Max).serialize()),
burn(new Args().add(u256.Max).serialize()),
);
});

Expand All @@ -116,14 +116,14 @@ describe('burnFrom', () => {
switchUser(user3Address);

// Increase allowance for U1 to spend U3 tokens
ft1_increaseAllowance(
increaseAllowance(
new Args().add(user1Address).add(allowAmount).serialize(),
);
switchUser(user1Address);
});

throws('on insufficient allowance ', () => {
ft1_burnFrom(
burnFrom(
new Args()
.add(user3Address)
// @ts-ignore
Expand All @@ -133,36 +133,30 @@ describe('burnFrom', () => {
});

throws('on insufficient balance', () =>
ft1_burnFrom(new Args().add(user2Address).add(allowAmount).serialize()),
burnFrom(new Args().add(user2Address).add(allowAmount).serialize()),
);

test('should burn tokens from an other address', () => {
const u1balanceBefore = ft1_balanceOf(
new Args().add(user1Address).serialize(),
);
const u3balanceBefore = ft1_balanceOf(
new Args().add(user3Address).serialize(),
);
const u1balanceBefore = balanceOf(new Args().add(user1Address).serialize());
const u3balanceBefore = balanceOf(new Args().add(user3Address).serialize());

ft1_transfer(new Args().add(user3Address).add(allowAmount).serialize());
transfer(new Args().add(user3Address).add(allowAmount).serialize());

ft1_burnFrom(new Args().add(user3Address).add(allowAmount).serialize());
burnFrom(new Args().add(user3Address).add(allowAmount).serialize());

// Check balance changes
expect(
ft1_balanceOf(new Args().add(user1Address).serialize()),
).toStrictEqual(
expect(balanceOf(new Args().add(user1Address).serialize())).toStrictEqual(
// @ts-ignore
u256ToBytes(bytesToU256(u1balanceBefore) - allowAmount),
);

expect(
ft1_balanceOf(new Args().add(user3Address).serialize()),
).toStrictEqual(u3balanceBefore);
expect(balanceOf(new Args().add(user3Address).serialize())).toStrictEqual(
u3balanceBefore,
);

// Verify allowances after transferFrom
expect(
ft1_allowance(new Args().add(user1Address).add(user3Address).serialize()),
allowance(new Args().add(user1Address).add(user3Address).serialize()),
).toStrictEqual(u256ToBytes(u256.Zero));
});
});
40 changes: 20 additions & 20 deletions smart-contracts/assembly/contracts/FT/__tests__/ft-mint.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import {
u8toByte,
u256ToBytes,
} from '@massalabs/as-types';
import { ft1_mint } from '../mintable/mint';
import { mint } from '../mintable/mint';
import {
ft1_balanceOf,
balanceOf,
constructor,
ft1_decimals,
ft1_name,
ft1_symbol,
ft1_totalSupply,
ft1_version,
decimals,
name,
symbol,
totalSupply,
version,
} from '../token';
import { ownerAddress } from '../../utils/ownership';
import { u256 } from 'as-bignum/assembly';
Expand Down Expand Up @@ -54,23 +54,23 @@ beforeAll(() => {

describe('ERC20 MINT - Initialization', () => {
test('total supply is properly initialized', () => {
expect(ft1_totalSupply([])).toStrictEqual(u256ToBytes(TOTAL_SUPPLY));
expect(totalSupply([])).toStrictEqual(u256ToBytes(TOTAL_SUPPLY));
});

test('token name is properly initialized', () => {
expect(ft1_name([])).toStrictEqual(stringToBytes(TOKEN_NAME));
expect(name([])).toStrictEqual(stringToBytes(TOKEN_NAME));
});

test('symbol is properly initialized', () => {
expect(ft1_symbol([])).toStrictEqual(stringToBytes(TOKEN_SYMBOL));
expect(symbol([])).toStrictEqual(stringToBytes(TOKEN_SYMBOL));
});

test('decimals is properly initialized', () => {
expect(ft1_decimals([])).toStrictEqual(u8toByte(DECIMALS));
expect(decimals([])).toStrictEqual(u8toByte(DECIMALS));
});

test('version is properly initialized', () => {
expect(ft1_version([])).toStrictEqual(stringToBytes('0.0.0'));
expect(version([])).toStrictEqual(stringToBytes('0.0.0'));
});

test('owner is properly initialized', () => {
Expand All @@ -82,14 +82,14 @@ const mintAmount = new u256(5000, 33);

describe('Mint ERC20 to U2', () => {
test('Should mint ERC20', () => {
ft1_mint(new Args().add(user2Address).add(mintAmount).serialize());
mint(new Args().add(user2Address).add(mintAmount).serialize());
// check balance of U2
expect(
ft1_balanceOf(new Args().add(user2Address).serialize()),
).toStrictEqual(u256ToBytes(mintAmount));
expect(balanceOf(new Args().add(user2Address).serialize())).toStrictEqual(
u256ToBytes(mintAmount),
);

// check totalSupply update
expect(ft1_totalSupply([])).toStrictEqual(
expect(totalSupply([])).toStrictEqual(
// @ts-ignore
u256ToBytes(mintAmount + TOTAL_SUPPLY),
);
Expand All @@ -98,17 +98,17 @@ describe('Mint ERC20 to U2', () => {

describe('Fails mint ERC20', () => {
throws('Should overflow ERC20', () =>
ft1_mint(new Args().add(user2Address).add(U64.MAX_VALUE).serialize()),
mint(new Args().add(user2Address).add(U64.MAX_VALUE).serialize()),
);

switchUser(user2Address);

throws('Should fail because the owner is not the tx emitter', () =>
ft1_mint(new Args().add(user1Address).add(u64(5000)).serialize()),
mint(new Args().add(user1Address).add(u64(5000)).serialize()),
);

test("Should check totalSupply didn't change", () => {
expect(ft1_totalSupply([])).toStrictEqual(
expect(totalSupply([])).toStrictEqual(
// @ts-ignore
u256ToBytes(mintAmount + TOTAL_SUPPLY),
);
Expand Down
Loading

0 comments on commit 6eadc45

Please sign in to comment.