@firmachain/firma-js 0.2.64 → 0.3.0-beta1

package/dist/test/13.staking_query.test.js

@@ -36,7 +36,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var chai_1 = require("chai");
 var FirmaSDK_1 = require("../sdk/FirmaSDK");
+var FirmaUtil_1 = require("../sdk/FirmaUtil");
 var config_test_1 = require("./config_test");
 describe('[13. Staking Query Test]', function () {
     var firma;
@@ -50,6 +52,7 @@ describe('[13. Staking Query Test]', function () {
                 case 0: return [4 /*yield*/, firma.Staking.getValidatorList()];
                 case 1:
                     result = _a.sent();
+                    chai_1.expect(result.dataList.length > 0).to.be.equal(true);
                     return [2 /*return*/];
             }
         });
@@ -64,6 +67,7 @@ describe('[13. Staking Query Test]', function () {
                     return [4 /*yield*/, firma.Staking.getValidator(validatorList[0].operator_address)];
                 case 2:
                     result = _a.sent();
+                    chai_1.expect(FirmaUtil_1.FirmaUtil.isValidAddress(result.operator_address)).to.be.equal(true);
                     return [2 /*return*/];
             }
         });
@@ -78,6 +82,12 @@ describe('[13. Staking Query Test]', function () {
                     return [4 /*yield*/, firma.Staking.getDelegationListFromValidator(validatorList[0].operator_address)];
                 case 2:
                     result = _a.sent();
+                    if (result.dataList.length > 0) {
+                        chai_1.expect(result.dataList[0].balance).to.not.equal("");
+                    }
+                    else {
+                        chai_1.expect(true).to.be.equal(true);
+                    }
                     return [2 /*return*/];
             }
         });
@@ -92,6 +102,12 @@ describe('[13. Staking Query Test]', function () {
                     return [4 /*yield*/, firma.Staking.getUndelegationListFromValidator(validatorList[0].operator_address)];
                 case 2:
                     result = _a.sent();
+                    if (result.dataList.length > 0) {
+                        chai_1.expect(FirmaUtil_1.FirmaUtil.isValidAddress(result.dataList[0].delegator_address)).to.be.equal(true);
+                    }
+                    else {
+                        chai_1.expect(true).to.be.equal(true);
+                    }
                     return [2 /*return*/];
             }
         });
@@ -104,6 +120,7 @@ describe('[13. Staking Query Test]', function () {
                 case 0: return [4 /*yield*/, firma.Staking.getPool()];
                 case 1:
                     result = _a.sent();
+                    chai_1.expect(result.bonded_tokens).to.not.equal("");
                     return [2 /*return*/];
             }
         });
@@ -115,6 +132,7 @@ describe('[13. Staking Query Test]', function () {
                 case 0: return [4 /*yield*/, firma.Staking.getParams()];
                 case 1:
                     result = _a.sent();
+                    chai_1.expect(result.max_validators).to.not.equal(0);
                     return [2 /*return*/];
             }
         });
@@ -132,6 +150,12 @@ describe('[13. Staking Query Test]', function () {
                 case 2: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
                 case 3:
                     result = _c.sent();
+                    if (result.dataList.length > 0) {
+                        chai_1.expect(result.dataList[0].balance).to.not.equal("");
+                    }
+                    else {
+                        chai_1.expect(true).to.be.equal(true);
+                    }
                     return [2 /*return*/];
             }
         });
@@ -148,6 +172,12 @@ describe('[13. Staking Query Test]', function () {
                 case 2: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
                 case 3:
                     result = _c.sent();
+                    if (result.length > 0) {
+                        chai_1.expect(FirmaUtil_1.FirmaUtil.isValidAddress(result[0].redelegation.delegator_address)).to.be.equal(true);
+                    }
+                    else {
+                        chai_1.expect(true).to.be.equal(true);
+                    }
                     return [2 /*return*/];
             }
         });
@@ -164,31 +194,46 @@ describe('[13. Staking Query Test]', function () {
                 case 2: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
                 case 3:
                     result = _c.sent();
+                    if (result.length > 0) {
+                        chai_1.expect(FirmaUtil_1.FirmaUtil.isValidAddress(result[0].delegator_address)).to.be.equal(true);
+                    }
+                    else {
+                        chai_1.expect(true).to.be.equal(true);
+                    }
                     return [2 /*return*/];
             }
         });
     }); });
     it('10.get userside getDelegationInfoFromValidator', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var validatorList, wallet, result, _a, _b;
+        var wallet, validatorList, result, _a, _b, error_1;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, firma.Staking.getValidatorList()];
+                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
                 case 1:
-                    validatorList = (_c.sent()).dataList;
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
-                case 2:
                     wallet = _c.sent();
+                    return [4 /*yield*/, firma.Staking.getValidatorList()];
+                case 2:
+                    validatorList = (_c.sent()).dataList;
+                    _c.label = 3;
+                case 3:
+                    _c.trys.push([3, 6, , 7]);
                     _b = (_a = firma.Staking).getDelegationInfoFromValidator;
                     return [4 /*yield*/, wallet.getAddress()];
-                case 3: return [4 /*yield*/, _b.apply(_a, [_c.sent(), validatorList[0].operator_address])];
-                case 4:
+                case 4: return [4 /*yield*/, _b.apply(_a, [_c.sent(), validatorList[0].operator_address])];
+                case 5:
                     result = _c.sent();
-                    return [2 /*return*/];
+                    chai_1.expect(result.balance).to.not.equal("");
+                    return [3 /*break*/, 7];
+                case 6:
+                    error_1 = _c.sent();
+                    chai_1.expect(false).to.not.equal(true);
+                    return [3 /*break*/, 7];
+                case 7: return [2 /*return*/];
             }
         });
     }); });
     it('11.get userside getUndelegationInfoFromValidator', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var validatorList, wallet, result, _a, _b;
+        var validatorList, wallet, result, _a, _b, error_2;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0: return [4 /*yield*/, firma.Staking.getValidatorList()];
@@ -197,12 +242,21 @@ describe('[13. Staking Query Test]', function () {
                     return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
                 case 2:
                     wallet = _c.sent();
+                    _c.label = 3;
+                case 3:
+                    _c.trys.push([3, 6, , 7]);
                     _b = (_a = firma.Staking).getUndelegationInfoFromValidator;
                     return [4 /*yield*/, wallet.getAddress()];
-                case 3: return [4 /*yield*/, _b.apply(_a, [_c.sent(), validatorList[0].operator_address])];
-                case 4:
+                case 4: return [4 /*yield*/, _b.apply(_a, [_c.sent(), validatorList[0].operator_address])];
+                case 5:
                     result = _c.sent();
-                    return [2 /*return*/];
+                    chai_1.expect(FirmaUtil_1.FirmaUtil.isValidAddress(result.delegator_address)).to.be.equal(true);
+                    return [3 /*break*/, 7];
+                case 6:
+                    error_2 = _c.sent();
+                    chai_1.expect(false).to.not.equal(true);
+                    return [3 /*break*/, 7];
+                case 7: return [2 /*return*/];
             }
         });
     }); });

package/dist/test/14.distribution_tx.test.js

@@ -42,66 +42,83 @@ var FirmaSDK_1 = require("../sdk/FirmaSDK");
 var config_test_1 = require("./config_test");
 describe('[14. Distribution Tx Test]', function () {
     var firma;
+    var aliceWallet;
+    var aliceAddress;
+    var bobWallet;
+    var bobAddress;
+    var validatorWallet;
+    var validatorAddress;
+    var valOperAddress;
     beforeEach(function () {
-        firma = new FirmaSDK_1.FirmaSDK(config_test_1.TestChainConfig);
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        firma = new FirmaSDK_1.FirmaSDK(config_test_1.TestChainConfig);
+                        return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+                    case 1:
+                        aliceWallet = _a.sent();
+                        return [4 /*yield*/, aliceWallet.getAddress()];
+                    case 2:
+                        aliceAddress = _a.sent();
+                        return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
+                    case 3:
+                        bobWallet = _a.sent();
+                        return [4 /*yield*/, bobWallet.getAddress()];
+                    case 4:
+                        bobAddress = _a.sent();
+                        return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.validatorMnemonic)];
+                    case 5:
+                        validatorWallet = _a.sent();
+                        return [4 /*yield*/, validatorWallet.getAddress()];
+                    case 6:
+                        validatorAddress = _a.sent();
+                        valOperAddress = __1.FirmaUtil.getValOperAddressFromAccAddress(validatorAddress);
+                        return [2 /*return*/];
+                }
+            });
+        });
     });
     it('withdrawAllRewards for delegator side', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var wallet, delegationList, _a, _b, validatorAddress, result;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+        var delegationList, validatorAddress, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, firma.Staking.getTotalDelegationInfo(aliceAddress)];
                 case 1:
-                    wallet = _c.sent();
-                    _b = (_a = firma.Staking).getTotalDelegationInfo;
-                    return [4 /*yield*/, wallet.getAddress()];
-                case 2: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
-                case 3:
-                    delegationList = (_c.sent()).dataList;
+                    delegationList = (_a.sent()).dataList;
                     validatorAddress = delegationList[0].delegation.validator_address;
-                    return [4 /*yield*/, firma.Distribution.withdrawAllRewards(wallet, validatorAddress)];
-                case 4:
-                    result = _c.sent();
+                    return [4 /*yield*/, firma.Distribution.withdrawAllRewards(aliceWallet, validatorAddress)];
+                case 2:
+                    result = _a.sent();
                     chai_1.expect(result.code).to.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
     it('withdrawAllRewards for All Validators', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var wallet, delegationList, _a, _b, gasEstimation, result;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+        var delegationList, gasEstimation, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, firma.Staking.getTotalDelegationInfo(aliceAddress)];
                 case 1:
-                    wallet = _c.sent();
-                    _b = (_a = firma.Staking).getTotalDelegationInfo;
-                    return [4 /*yield*/, wallet.getAddress()];
-                case 2: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
+                    delegationList = (_a.sent()).dataList;
+                    return [4 /*yield*/, firma.Distribution.getGasEstimationWithdrawAllRewardsFromAllValidator(aliceWallet, delegationList)];
+                case 2:
+                    gasEstimation = _a.sent();
+                    return [4 /*yield*/, firma.Distribution.withdrawAllRewardsFromAllValidator(aliceWallet, delegationList, { gas: gasEstimation, fee: gasEstimation })];
                 case 3:
-                    delegationList = (_c.sent()).dataList;
-                    return [4 /*yield*/, firma.Distribution.getGasEstimationWithdrawAllRewardsFromAllValidator(wallet, delegationList)];
-                case 4:
-                    gasEstimation = _c.sent();
-                    return [4 /*yield*/, firma.Distribution.withdrawAllRewardsFromAllValidator(wallet, delegationList, { gas: gasEstimation, fee: gasEstimation })];
-                case 5:
-                    result = _c.sent();
+                    result = _a.sent();
                     chai_1.expect(result.code).to.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
     it('withdrawAllRewards for validator side', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var wallet, address, validatorAddress, result;
+        var result;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.validatorMnemonic)];
+                case 0: return [4 /*yield*/, firma.Distribution.withdrawAllRewards(validatorWallet, valOperAddress)];
                 case 1:
-                    wallet = _a.sent();
-                    return [4 /*yield*/, wallet.getAddress()];
-                case 2:
-                    address = _a.sent();
-                    validatorAddress = __1.FirmaUtil.getValOperAddressFromAccAddress(address);
-                    return [4 /*yield*/, firma.Distribution.withdrawAllRewards(wallet, validatorAddress)];
-                case 3:
                     result = _a.sent();
                     chai_1.expect(result.code).to.equal(0);
                     return [2 /*return*/];
@@ -109,18 +126,11 @@ describe('[14. Distribution Tx Test]', function () {
         });
     }); });
     it('WithdrawValidatorCommission OK', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var wallet, address, validatorAddress, result;
+        var result;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.validatorMnemonic)];
+                case 0: return [4 /*yield*/, firma.Distribution.withdrawValidatorCommission(validatorWallet, valOperAddress)];
                 case 1:
-                    wallet = _a.sent();
-                    return [4 /*yield*/, wallet.getAddress()];
-                case 2:
-                    address = _a.sent();
-                    validatorAddress = __1.FirmaUtil.getValOperAddressFromAccAddress(address);
-                    return [4 /*yield*/, firma.Distribution.withdrawValidatorCommission(wallet, validatorAddress)];
-                case 3:
                     result = _a.sent();
                     chai_1.expect(result.code).to.equal(0);
                     return [2 /*return*/];
@@ -128,15 +138,13 @@ describe('[14. Distribution Tx Test]', function () {
         });
     }); });
     it('FundCommunityPool OK', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var wallet, amount, result;
+        var amount, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.validatorMnemonic)];
-                case 1:
-                    wallet = _a.sent();
+                case 0:
                     amount = 1;
-                    return [4 /*yield*/, firma.Distribution.fundCommunityPool(wallet, amount)];
-                case 2:
+                    return [4 /*yield*/, firma.Distribution.fundCommunityPool(aliceWallet, amount)];
+                case 1:
                     result = _a.sent();
                     chai_1.expect(result.code).to.equal(0);
                     return [2 /*return*/];
@@ -144,33 +152,16 @@ describe('[14. Distribution Tx Test]', function () {
         });
     }); });
     it('SetWithdrawAddress OK', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobWallet, result, _a, _b, _c, validatorWallet, validatorAddress, _d, _e, result1;
-        return __generator(this, function (_f) {
-            switch (_f.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+        var result, result1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, firma.Distribution.setWithdrawAddress(aliceWallet, bobAddress)];
                 case 1:
-                    aliceWallet = _f.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
-                case 2:
-                    bobWallet = _f.sent();
-                    _b = (_a = firma.Distribution).setWithdrawAddress;
-                    _c = [aliceWallet];
-                    return [4 /*yield*/, bobWallet.getAddress()];
-                case 3: return [4 /*yield*/, _b.apply(_a, _c.concat([_f.sent()]))];
-                case 4:
-                    result = _f.sent();
+                    result = _a.sent();
                     chai_1.expect(result.code).to.equal(0);
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.validatorMnemonic)];
-                case 5:
-                    validatorWallet = _f.sent();
-                    _e = (_d = __1.FirmaUtil).getValOperAddressFromAccAddress;
-                    return [4 /*yield*/, validatorWallet.getAddress()];
-                case 6:
-                    validatorAddress = _e.apply(_d, [_f.sent()]);
-                    return [4 /*yield*/, firma.Distribution.withdrawAllRewards(aliceWallet, validatorAddress)];
-                case 7:
-                    result1 = _f.sent();
-                    //console.log(result1);
+                    return [4 /*yield*/, firma.Distribution.withdrawAllRewards(aliceWallet, valOperAddress)];
+                case 2:
+                    result1 = _a.sent();
                     chai_1.expect(result1.code).to.equal(0);
                     return [2 /*return*/];
             }

package/dist/test/15.distribution_query.test.js

@@ -42,8 +42,24 @@ var FirmaSDK_1 = require("../sdk/FirmaSDK");
 var config_test_1 = require("./config_test");
 describe('[15. Distribution Query Test]', function () {
     var firma;
+    var aliceWallet;
+    var aliceAddress;
     beforeEach(function () {
-        firma = new FirmaSDK_1.FirmaSDK(config_test_1.TestChainConfig);
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        firma = new FirmaSDK_1.FirmaSDK(config_test_1.TestChainConfig);
+                        return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+                    case 1:
+                        aliceWallet = _a.sent();
+                        return [4 /*yield*/, aliceWallet.getAddress()];
+                    case 2:
+                        aliceAddress = _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
     });
     it('get communityPool', function () { return __awaiter(void 0, void 0, void 0, function () {
         var poolAmount;
@@ -52,6 +68,7 @@ describe('[15. Distribution Query Test]', function () {
                 case 0: return [4 /*yield*/, firma.Distribution.getCommunityPool()];
                 case 1:
                     poolAmount = _a.sent();
+                    chai_1.expect(poolAmount).to.not.equal("");
                     return [2 /*return*/];
             }
         });
@@ -67,6 +84,12 @@ describe('[15. Distribution Query Test]', function () {
                     return [4 /*yield*/, firma.Distribution.getValidatorCommission(validatorAddress)];
                 case 2:
                     result = _a.sent();
+                    if (result.length > 0) {
+                        chai_1.expect(result[0].amount).to.not.equal("");
+                    }
+                    else {
+                        chai_1.expect(true).to.be.equal(true);
+                    }
                     return [2 /*return*/];
             }
         });
@@ -82,6 +105,12 @@ describe('[15. Distribution Query Test]', function () {
                     return [4 /*yield*/, firma.Distribution.getValidatorOutStandingReward(validatorAddress)];
                 case 2:
                     result = _a.sent();
+                    if (result.length > 0) {
+                        chai_1.expect(result[0].amount).to.not.equal("");
+                    }
+                    else {
+                        chai_1.expect(true).to.be.equal(true);
+                    }
                     return [2 /*return*/];
             }
         });
@@ -98,6 +127,7 @@ describe('[15. Distribution Query Test]', function () {
                     return [4 /*yield*/, firma.Distribution.getTotalRewardInfo(address)];
                 case 2:
                     result = _a.sent();
+                    chai_1.expect(result.rewards).to.not.equal("");
                     return [2 /*return*/];
             }
         });
@@ -115,6 +145,7 @@ describe('[15. Distribution Query Test]', function () {
                     return [4 /*yield*/, firma.Distribution.getValidatorCommission(newValidatorAddress)];
                 case 2:
                     commission = _a.sent();
+                    chai_1.expect(commission.length).to.not.equal(0);
                     return [2 /*return*/];
             }
         });
@@ -122,77 +153,69 @@ describe('[15. Distribution Query Test]', function () {
     // Total Reward based user side
     // Additionally, rewards for each validator data are included. On the list.
     it('get getTotalRewardInfo', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var wallet, result, _a, _b, i, totalReward;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+        var result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, firma.Distribution.getTotalRewardInfo(aliceAddress)];
                 case 1:
-                    wallet = _c.sent();
-                    _b = (_a = firma.Distribution).getTotalRewardInfo;
-                    return [4 /*yield*/, wallet.getAddress()];
-                case 2: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
-                case 3:
-                    result = _c.sent();
-                    for (i = 0; i < result.rewards.length; i++) {
-                        //console.log("validator_address: " + result.rewards[i].validator_address);
-                        //console.log("reward: " + result.rewards[i].amount);
+                    result = _a.sent();
+                    if (result.rewards.length === 0) {
+                        chai_1.expect(result.total).to.be.equal('');
+                    }
+                    else {
+                        chai_1.expect(result.total).to.not.equal('');
                     }
-                    totalReward = result.total;
                     return [2 /*return*/];
             }
         });
     }); });
     // reward per validator
     it('get getRewardInfo', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var wallet, totalReward, _a, _b, validatorAddress, amount, _c, _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+        var totalReward, validatorAddress, amount;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, firma.Distribution.getTotalRewardInfo(aliceAddress)];
                 case 1:
-                    wallet = _e.sent();
-                    _b = (_a = firma.Distribution).getTotalRewardInfo;
-                    return [4 /*yield*/, wallet.getAddress()];
-                case 2: return [4 /*yield*/, _b.apply(_a, [_e.sent()])];
-                case 3:
-                    totalReward = _e.sent();
+                    totalReward = _a.sent();
+                    if (!(totalReward.rewards.length > 0)) return [3 /*break*/, 3];
                     validatorAddress = totalReward.rewards[0].validator_address;
-                    _d = (_c = firma.Distribution).getRewardInfo;
-                    return [4 /*yield*/, wallet.getAddress()];
-                case 4: return [4 /*yield*/, _d.apply(_c, [_e.sent(), validatorAddress])];
-                case 5:
-                    amount = _e.sent();
-                    return [2 /*return*/];
+                    return [4 /*yield*/, firma.Distribution.getRewardInfo(aliceAddress, validatorAddress)];
+                case 2:
+                    amount = _a.sent();
+                    chai_1.expect(amount).to.not.equal('');
+                    return [3 /*break*/, 4];
+                case 3:
+                    chai_1.expect(true).to.be.equal(false);
+                    _a.label = 4;
+                case 4: return [2 /*return*/];
             }
         });
     }); });
     it('get withdrawAddress', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var wallet, withdrawAddress, _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+        var withdrawAddress;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, firma.Distribution.getWithdrawAddress(aliceAddress)];
                 case 1:
-                    wallet = _c.sent();
-                    _b = (_a = firma.Distribution).getWithdrawAddress;
-                    return [4 /*yield*/, wallet.getAddress()];
-                case 2: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
-                case 3:
-                    withdrawAddress = _c.sent();
+                    withdrawAddress = _a.sent();
+                    chai_1.expect(__1.FirmaUtil.isValidAddress(withdrawAddress)).to.be.equal(true);
                     return [2 /*return*/];
             }
         });
     }); });
     it('get getTotalRewardInfo from no balance user', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var wallet, result, _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var newWallet, newAddress, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0: return [4 /*yield*/, firma.Wallet.newWallet()];
                 case 1:
-                    wallet = _c.sent();
-                    _b = (_a = firma.Distribution).getTotalRewardInfo;
-                    return [4 /*yield*/, wallet.getAddress()];
-                case 2: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
+                    newWallet = _a.sent();
+                    return [4 /*yield*/, newWallet.getAddress()];
+                case 2:
+                    newAddress = _a.sent();
+                    return [4 /*yield*/, firma.Distribution.getTotalRewardInfo(newAddress)];
                 case 3:
-                    result = _c.sent();
+                    result = _a.sent();
                     chai_1.expect(result.total).to.equal("");
                     return [2 /*return*/];
             }
@@ -200,17 +223,18 @@ describe('[15. Distribution Query Test]', function () {
     }); });
     // reward per validator
     it('get getRewardInfo from no balance user', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var wallet, totalReward, _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var newWallet, newAddress, totalReward;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0: return [4 /*yield*/, firma.Wallet.newWallet()];
                 case 1:
-                    wallet = _c.sent();
-                    _b = (_a = firma.Distribution).getTotalRewardInfo;
-                    return [4 /*yield*/, wallet.getAddress()];
-                case 2: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
+                    newWallet = _a.sent();
+                    return [4 /*yield*/, newWallet.getAddress()];
+                case 2:
+                    newAddress = _a.sent();
+                    return [4 /*yield*/, firma.Distribution.getTotalRewardInfo(newAddress)];
                 case 3:
-                    totalReward = _c.sent();
+                    totalReward = _a.sent();
                     chai_1.expect(totalReward.rewards.length).to.equal(0);
                     return [2 /*return*/];
             }