Skip to content

Commit

Permalink
update esplanade
Browse files Browse the repository at this point in the history
  • Loading branch information
@yizhoucao
yizhoucao committed Jan 29, 2019
1 parent 1808dd2 commit f91c58f
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 68 deletions.
46 changes: 23 additions & 23 deletions src/EsplanadeWrapper.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,34 +251,34 @@ test('getCandidate', async () => {
expect(await esplanadeWrapper.getCandidate()).toMatchSnapshot();
});

test('getPoolAddr', async () => {
expect(await esplanadeWrapper.getPoolAddr(true, 0)).toMatchSnapshot();
expect(await esplanadeWrapper.getPoolAddr(true, 1)).toMatchSnapshot();
expect(await esplanadeWrapper.getPoolAddr(true, 2)).toMatchSnapshot();
expect(await esplanadeWrapper.getPoolAddr(false, 0)).toMatchSnapshot();
expect(await esplanadeWrapper.getPoolAddr(false, 1)).toMatchSnapshot();
expect(await esplanadeWrapper.getPoolAddr(false, 2)).toMatchSnapshot();
test('getAddressPoolAddress', async () => {
expect(await esplanadeWrapper.getAddressPoolAddress(true, 0)).toMatchSnapshot();
expect(await esplanadeWrapper.getAddressPoolAddress(true, 1)).toMatchSnapshot();
expect(await esplanadeWrapper.getAddressPoolAddress(true, 2)).toMatchSnapshot();
expect(await esplanadeWrapper.getAddressPoolAddress(false, 0)).toMatchSnapshot();
expect(await esplanadeWrapper.getAddressPoolAddress(false, 1)).toMatchSnapshot();
expect(await esplanadeWrapper.getAddressPoolAddress(false, 2)).toMatchSnapshot();
});

test('getContractAddr', async () => {
expect(await esplanadeWrapper.getContractAddr(true, 0)).toMatchSnapshot();
expect(await esplanadeWrapper.getContractAddr(true, 1)).toMatchSnapshot();
expect(await esplanadeWrapper.getContractAddr(true, 2)).toMatchSnapshot();
expect(await esplanadeWrapper.getContractAddr(false, 0)).toMatchSnapshot();
expect(await esplanadeWrapper.getContractAddr(false, 1)).toMatchSnapshot();
expect(await esplanadeWrapper.getContractAddr(false, 2)).toMatchSnapshot();
test('getContractPoolAddress', async () => {
expect(await esplanadeWrapper.getContractPoolAddress(true, 0)).toMatchSnapshot();
expect(await esplanadeWrapper.getContractPoolAddress(true, 1)).toMatchSnapshot();
expect(await esplanadeWrapper.getContractPoolAddress(true, 2)).toMatchSnapshot();
expect(await esplanadeWrapper.getContractPoolAddress(false, 0)).toMatchSnapshot();
expect(await esplanadeWrapper.getContractPoolAddress(false, 1)).toMatchSnapshot();
expect(await esplanadeWrapper.getContractPoolAddress(false, 2)).toMatchSnapshot();
});

test('getPoolSize', async () => {
expect(await esplanadeWrapper.getPoolSize(true)).toMatchSnapshot();
expect(await esplanadeWrapper.getPoolSize(false)).toMatchSnapshot();
})
test('getAddressPoolSize', async () => {
expect(await esplanadeWrapper.getAddressPoolSize(true)).toMatchSnapshot();
expect(await esplanadeWrapper.getAddressPoolSize(false)).toMatchSnapshot();
});

test('getContractSize', async () => {
expect(await esplanadeWrapper.getContractSize(true)).toMatchSnapshot();
expect(await esplanadeWrapper.getContractSize(false)).toMatchSnapshot();
})
test('getContractPoolSize', async () => {
expect(await esplanadeWrapper.getContractPoolSize(true)).toMatchSnapshot();
expect(await esplanadeWrapper.getContractPoolSize(false)).toMatchSnapshot();
});

test('voteStartTimestamp', async () => {
expect(await esplanadeWrapper.getVotingData()).toMatchSnapshot();
})
});
10 changes: 5 additions & 5 deletions src/EsplanadeWrapper.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,22 @@ export default class EsplanadeWrapper extends BaseContractWrapper {
return (await this.contract.methods.candidate().call()).valueOf();
}

public async getPoolSize(isHot: boolean): Promise<number> {
public async getAddressPoolSize(isHot: boolean): Promise<number> {
const poolSize = await this.contract.methods.getAddressPoolSizes().call();
return Number(poolSize[isHot ? 1 : 0].valueOf());
}

public async getContractSize(isContract: boolean) {
public async getContractPoolSize(isCustodian: boolean) {
const contractSizes = await this.contract.methods.getContractPoolSizes().call();
return Number(contractSizes[isContract ? 0 : 1].valueOf());
return Number(contractSizes[isCustodian ? 0 : 1].valueOf());
}

public async getPoolAddr(isHot: boolean, index: number): Promise<string> {
public async getAddressPoolAddress(isHot: boolean, index: number): Promise<string> {
const poolIndex = this.getAddressPoolIndex(isHot);
return (await this.contract.methods.addrPool(poolIndex, index).call()).valueOf();
}

public async getContractAddr(isCustodian: boolean, index: number): Promise<string> {
public async getContractPoolAddress(isCustodian: boolean, index: number): Promise<string> {
const addr = isCustodian
? await this.contract.methods.custodianPool(index).call()
: await this.contract.methods.otherContractPool(index).call();
Expand Down
36 changes: 18 additions & 18 deletions src/__snapshots__/EsplanadeWrapper.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,41 +32,41 @@ Array [
]
`;

exports[`getCandidate 1`] = `"candidatre"`;
exports[`getAddressPoolAddress 1`] = `"hotAddr1"`;

exports[`getContractAddr 1`] = `"custodianAddr1"`;
exports[`getAddressPoolAddress 2`] = `"hotAddr2"`;

exports[`getContractAddr 2`] = `"custodianAddr2"`;
exports[`getAddressPoolAddress 3`] = `"hotAddr3"`;

exports[`getContractAddr 3`] = `"custodianAddr3"`;
exports[`getAddressPoolAddress 4`] = `"coldAddr1"`;

exports[`getContractAddr 4`] = `"otherAddr1"`;
exports[`getAddressPoolAddress 5`] = `"coldAddr2"`;

exports[`getContractAddr 5`] = `"otherAddr2"`;
exports[`getAddressPoolAddress 6`] = `"coldAddr3"`;

exports[`getContractAddr 6`] = `"otherAddr3"`;
exports[`getAddressPoolSize 1`] = `3`;

exports[`getContractSize 1`] = `3`;
exports[`getAddressPoolSize 2`] = `3`;

exports[`getContractSize 2`] = `3`;
exports[`getCandidate 1`] = `"candidatre"`;

exports[`getModerator 1`] = `"moderator"`;
exports[`getContractPoolAddress 1`] = `"custodianAddr1"`;

exports[`getPoolAddr 1`] = `"hotAddr1"`;
exports[`getContractPoolAddress 2`] = `"custodianAddr2"`;

exports[`getPoolAddr 2`] = `"hotAddr2"`;
exports[`getContractPoolAddress 3`] = `"custodianAddr3"`;

exports[`getPoolAddr 3`] = `"hotAddr3"`;
exports[`getContractPoolAddress 4`] = `"otherAddr1"`;

exports[`getPoolAddr 4`] = `"coldAddr1"`;
exports[`getContractPoolAddress 5`] = `"otherAddr2"`;

exports[`getPoolAddr 5`] = `"coldAddr2"`;
exports[`getContractPoolAddress 6`] = `"otherAddr3"`;

exports[`getPoolAddr 6`] = `"coldAddr3"`;
exports[`getContractPoolSize 1`] = `3`;

exports[`getPoolSize 1`] = `3`;
exports[`getContractPoolSize 2`] = `3`;

exports[`getPoolSize 2`] = `3`;
exports[`getModerator 1`] = `"moderator"`;

exports[`getStates 1`] = `
Object {
Expand Down
22 changes: 0 additions & 22 deletions src/types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,6 @@ export interface IEsplanadeStates {
lastOperationTime: number;
}

export interface IEsplanadeAddresses {
moderator: {
address: string;
balance: number;
};
candidate: {
address: string;
balance: number;
};
poolAddrs: {
cold: Array<{address: string; balance: number}>;
hot: Array<{address: string; balance: number}>;
custodian: Array<{address: string; balance: number}>;
otherContract: Array<{address: string; balance: number}>;
}
}

export interface IAddress {
address: string;
balance: number;
}

export interface ICustodianStates extends IManagedStates {
state: string;
minBalance: number;
Expand Down

0 comments on commit f91c58f

Please sign in to comment.