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
16 changes: 8 additions & 8 deletions contracts/erc20/src/test/erc20.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CoinPublicKey } from '@midnight-ntwrk/compact-runtime';
import { ERC20Simulator } from './simulators';
import { MaybeString } from './types';
import { ERC20Simulator } from './simulators/ERC20Simulator';
import { MaybeString } from './types/string';
import * as utils from './utils';

const NO_STRING: MaybeString = {
Expand Down Expand Up @@ -96,7 +96,7 @@ describe('ERC20', () => {
caller = OWNER;
const txSuccess = token.transfer(Z_RECIPIENT, partialAmt, caller);

expect(txSuccess).toBeTruthy();
expect(txSuccess).toBe(true);
expect(token.balanceOf(Z_OWNER)).toEqual(1n);
expect(token.balanceOf(Z_RECIPIENT)).toEqual(partialAmt);
});
Expand All @@ -105,7 +105,7 @@ describe('ERC20', () => {
caller = OWNER;
const txSuccess = token.transfer(Z_RECIPIENT, AMOUNT, caller);

expect(txSuccess).toBeTruthy();
expect(txSuccess).toBe(true);
expect(token.balanceOf(Z_OWNER)).toEqual(0n);
expect(token.balanceOf(Z_RECIPIENT)).toEqual(AMOUNT);
});
Expand Down Expand Up @@ -137,7 +137,7 @@ describe('ERC20', () => {
it('should allow transfer of 0 tokens', () => {
const txSuccess = token.transfer(Z_RECIPIENT, 0n, caller);

expect(txSuccess).toBeTruthy();
expect(txSuccess).toBe(true);
expect(token.balanceOf(Z_OWNER)).toEqual(AMOUNT);
expect(token.balanceOf(Z_RECIPIENT)).toEqual(0n);
});
Expand Down Expand Up @@ -233,7 +233,7 @@ describe('ERC20', () => {
const partialAmt = AMOUNT - 1n;

const txSuccess = token.transferFrom(Z_OWNER, Z_RECIPIENT, partialAmt, caller);
expect(txSuccess).toBeTruthy();
expect(txSuccess).toBe(true);

// Check balances
expect(token.balanceOf(Z_OWNER)).toEqual(1n);
Expand All @@ -246,7 +246,7 @@ describe('ERC20', () => {
caller = SPENDER;

const txSuccess = token.transferFrom(Z_OWNER, Z_RECIPIENT, AMOUNT, caller);
expect(txSuccess).toBeTruthy();
expect(txSuccess).toBe(true);

// Check balances
expect(token.balanceOf(Z_OWNER)).toEqual(0n);
Expand All @@ -261,7 +261,7 @@ describe('ERC20', () => {

caller = SPENDER;
const txSuccess = token.transferFrom(Z_OWNER, Z_RECIPIENT, AMOUNT, caller);
expect(txSuccess).toBeTruthy();
expect(txSuccess).toBe(true);

// Check balances
expect(token.balanceOf(Z_OWNER)).toEqual(0n);
Expand Down
6 changes: 3 additions & 3 deletions contracts/erc20/src/test/simulators/ERC20Simulator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import {
ZswapCoinPublicKey,
ContractAddress,
} from '../../artifacts/MockERC20/contract/index.cjs'; // Combined imports
import { MaybeString } from '../types';
import type { IContractSimulator } from './../types';
import { ERC20PrivateState, ERC20Witnesses } from '../../witnesses';
import { MaybeString } from '../types/string';
import type { IContractSimulator } from './../types/test';
import { ERC20PrivateState, ERC20Witnesses } from '../../witnesses/ERC20Witnesses';

/**
* @description A simulator implementation of an erc20 contract for testing purposes.
Expand Down
1 change: 0 additions & 1 deletion contracts/erc20/src/test/simulators/index.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
export type { IContractSimulator } from './test';

export type MaybeString = {
is_some: boolean,
value: string
Expand Down
2 changes: 1 addition & 1 deletion contracts/erc20/src/test/utils/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
QueryContext,
emptyZswapLocalState,
} from '@midnight-ntwrk/compact-runtime';
import type { IContractSimulator } from '../types';
import type { IContractSimulator } from '../types/test';

/**
* Constructs a `CircuitContext` from the given state and sender information.
Expand Down
2 changes: 0 additions & 2 deletions contracts/erc20/src/witnesses/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion contracts/initializable/.eslintignore

This file was deleted.

30 changes: 0 additions & 30 deletions contracts/initializable/.eslintrc.cjs

This file was deleted.

28 changes: 0 additions & 28 deletions contracts/initializable/jest.config.ts

This file was deleted.

16 changes: 0 additions & 16 deletions contracts/initializable/js-resolver.cjs

This file was deleted.

29 changes: 0 additions & 29 deletions contracts/initializable/package.json

This file was deleted.

33 changes: 0 additions & 33 deletions contracts/initializable/src/Initializable.compact

This file was deleted.

14 changes: 0 additions & 14 deletions contracts/initializable/src/MockInitializable.compact

This file was deleted.

32 changes: 0 additions & 32 deletions contracts/initializable/src/test/initializable.test.ts

This file was deleted.

1 change: 0 additions & 1 deletion contracts/initializable/src/test/types/index.ts

This file was deleted.

23 changes: 0 additions & 23 deletions contracts/initializable/src/test/types/test.ts

This file was deleted.

1 change: 0 additions & 1 deletion contracts/initializable/src/test/utils/index.ts

This file was deleted.

67 changes: 0 additions & 67 deletions contracts/initializable/src/test/utils/test.ts

This file was deleted.

2 changes: 0 additions & 2 deletions contracts/initializable/src/witnesses/index.ts

This file was deleted.

5 changes: 0 additions & 5 deletions contracts/initializable/tsconfig.build.json

This file was deleted.

Loading