refactor: util feat & testcase update

FirmaChain · Oct 13, 2021 · 4da39a2 · 4da39a2
1 parent 446a042
commit 4da39a2
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 3 deletions.
diff --git a/sdk/FirmaUtil.ts b/sdk/FirmaUtil.ts
@@ -8,13 +8,33 @@ const sha256 = require('crypto-js/sha256');
 const encHex = require('crypto-js/enc-hex');
 
 import { Bech32 } from "@cosmjs/encoding";
+import Long from "long";
 
 export class FirmaUtil {
 
 	public static Config: FirmaConfig;
 
+	public static getUFCTStringFromFCTStr(fctAmount: string): string {
+		let fct = Number.parseFloat(fctAmount);
+		let big = fct * 1000000;
+
+		return big.toString();
+	}
+
+	public static getFCTStringFromUFCTStr(uFctAmount: string): string {
+		let ufct = Number.parseInt(uFctAmount);
+		return (ufct / 1000000).toString();
+	}
+
 	public static getUFCTStringFromFCT(fctAmount: number): string {
-		return fctAmount + "000000";
+		let big = fctAmount * 1000000;
+
+		return big.toString();
+	}
+
+	public static getFCTStringFromUFCT(uFctAmount: number): string {
+		let number = uFctAmount;
+		return (number / 1000000).toString();
 	}
 
 	public static async getFileHash(filePath: string): Promise<string> {

diff --git a/test/18.util.test.ts b/test/18.util.test.ts
@@ -3,7 +3,7 @@ import { FirmaUtil } from '..';
 
 describe('[18. util Test]', () => {
 
-	it.only('getValOperAddressFromAccAddress test', async () => {
+	it('getValOperAddressFromAccAddress test', async () => {
 
 		const accAddress = "firma134pp6s2nv7pl4mxu58aeufdd6fv5s2zujrrmsa";
 		const valoperAddress = "firmavaloper134pp6s2nv7pl4mxu58aeufdd6fv5s2zuvsgqsn";
@@ -12,12 +12,64 @@ describe('[18. util Test]', () => {
 		expect(result).to.be.equal(valoperAddress);
 	})
 
-	it.only('getAccAddressFromValOperAddress test', async () => {
+	it('getAccAddressFromValOperAddress test', async () => {
 
 		const accAddress = "firma134pp6s2nv7pl4mxu58aeufdd6fv5s2zujrrmsa";
 		const valoperAddress = "firmavaloper134pp6s2nv7pl4mxu58aeufdd6fv5s2zuvsgqsn";
 
 		let result = FirmaUtil.getAccAddressFromValOperAddress(valoperAddress);
 		expect(result).to.be.equal(accAddress);
 	})
+
+	it('getFCTFromUFCTString test', async () => {
+
+		let amountUFCT = 1000000;
+		let fct = FirmaUtil.getFCTStringFromUFCT(amountUFCT);
+
+		expect(fct).to.be.equal("1");
+
+		amountUFCT = 1234000;
+		fct = FirmaUtil.getFCTStringFromUFCT(amountUFCT);
+
+		expect(fct).to.be.equal("1.234");
+	})
+
+	it('getUFCTStringFromFCT test', async () => {
+
+		let amountUFCT = 1;
+		let fct = FirmaUtil.getUFCTStringFromFCT(amountUFCT);
+
+		expect(fct).to.be.equal("1000000");
+
+		amountUFCT = 1.23;
+		fct = FirmaUtil.getUFCTStringFromFCT(amountUFCT);
+
+		expect(fct).to.be.equal("1230000");
+	})
+
+	it('getFCTFromUFCTString test', async () => {
+
+		let amountUFCT = "1000000";
+		let fct = FirmaUtil.getFCTStringFromUFCTStr(amountUFCT);
+
+		expect(fct).to.be.equal("1");
+
+		amountUFCT = "1234000";
+		fct = FirmaUtil.getFCTStringFromUFCTStr(amountUFCT);
+
+		expect(fct).to.be.equal("1.234");
+	})
+
+	it('getUFCTStringFromFCT test', async () => {
+
+		let amountUFCT = "1";
+		let fct = FirmaUtil.getUFCTStringFromFCTStr(amountUFCT);
+
+		expect(fct).to.be.equal("1000000");
+
+		amountUFCT = "1.23";
+		fct = FirmaUtil.getUFCTStringFromFCTStr(amountUFCT);
+
+		expect(fct).to.be.equal("1230000");
+	})
 });