@firmachain/firma-js 0.2.64 → 0.3.0-beta1

package/dist/test/23.authz_tx.test.js

@@ -46,51 +46,59 @@ var FirmaUtil_1 = require("../sdk/FirmaUtil");
 var config_test_1 = require("./config_test");
 describe('[23. Authz Tx Test]', function () {
     var firma;
+    var aliceWallet;
+    var aliceAddress;
+    var bobWallet;
+    var bobAddress;
     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 [2 /*return*/];
+                }
+            });
+        });
     });
     // grant type check
     // authorization_type="send"|"generic"|"delegate"|"unbond"|"redelegate"
     it('Authz Grant Send', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobAddress, expirationDate, maxFCT, result;
+        var expirationDate, maxFCT, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
-                case 1:
-                    aliceWallet = _a.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
-                case 2: return [4 /*yield*/, (_a.sent()).getAddress()];
-                case 3:
-                    bobAddress = _a.sent();
+                case 0:
                     expirationDate = new Date();
                     expirationDate.setFullYear(expirationDate.getFullYear() + 1);
                     maxFCT = 10;
                     return [4 /*yield*/, firma.Authz.grantSendAuthorization(aliceWallet, bobAddress, expirationDate, maxFCT)];
-                case 4:
+                case 1:
                     result = _a.sent();
-                    //console.log(result);
                     chai_1.expect(result.code).to.be.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
     it('Authz ExecuteAllowance-Send', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobWallet, amountFCT, address, toAddress, sendAmount, msgSend, anyData, result;
+        var amountFCT, address, toAddress, sendAmount, msgSend, anyData, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
-                case 1:
-                    aliceWallet = _a.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
-                case 2:
-                    bobWallet = _a.sent();
+                case 0:
                     amountFCT = 9;
-                    return [4 /*yield*/, aliceWallet.getAddress()];
-                case 3:
-                    address = _a.sent();
-                    return [4 /*yield*/, bobWallet.getAddress()];
-                case 4:
-                    toAddress = _a.sent();
+                    address = aliceAddress;
+                    toAddress = bobAddress;
                     sendAmount = { denom: firma.Config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amountFCT) };
                     msgSend = bank_1.BankTxClient.msgSend({
                         fromAddress: address,
@@ -99,85 +107,54 @@ describe('[23. Authz Tx Test]', function () {
                     });
                     anyData = FirmaUtil_1.FirmaUtil.getAnyData(bank_1.BankTxClient.getRegistry(), msgSend);
                     return [4 /*yield*/, firma.Authz.executeAllowance(bobWallet, [anyData])];
-                case 5:
+                case 1:
                     result = _a.sent();
-                    //console.log(result);
                     chai_1.expect(result.code).to.be.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
-    it.skip('Authz Revoke Send', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobAddress, result;
+    it('Authz Revoke Send', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var result;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+                case 0: return [4 /*yield*/, firma.Authz.revokeSendAuthorization(aliceWallet, bobAddress)];
                 case 1:
-                    aliceWallet = _a.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
-                case 2: return [4 /*yield*/, (_a.sent()).getAddress()];
-                case 3:
-                    bobAddress = _a.sent();
-                    return [4 /*yield*/, firma.Authz.revokeSendAuthorization(aliceWallet, bobAddress)];
-                case 4:
                     result = _a.sent();
-                    //console.log(result);
                     chai_1.expect(result.code).to.be.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
     it('Authz Grant Delegate', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobAddress, delegationInfo, _a, _b, validatorAddress, expirationDate, maxFCT, result;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+        var delegationInfo, validatorAddress, expirationDate, maxFCT, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, firma.Staking.getTotalDelegationInfo(aliceAddress)];
                 case 1:
-                    aliceWallet = _c.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
-                case 2: return [4 /*yield*/, (_c.sent()).getAddress()];
-                case 3:
-                    bobAddress = _c.sent();
-                    _b = (_a = firma.Staking).getTotalDelegationInfo;
-                    return [4 /*yield*/, aliceWallet.getAddress()];
-                case 4: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
-                case 5:
-                    delegationInfo = (_c.sent()).dataList;
+                    delegationInfo = (_a.sent()).dataList;
                     validatorAddress = delegationInfo[0].delegation.validator_address;
                     expirationDate = new Date();
                     expirationDate.setFullYear(expirationDate.getFullYear() + 1);
                     maxFCT = 100;
                     return [4 /*yield*/, firma.Authz.grantStakeAuthorization(aliceWallet, bobAddress, [validatorAddress], authz_1.AuthorizationType.AUTHORIZATION_TYPE_DELEGATE, expirationDate, maxFCT)];
-                case 6:
-                    result = _c.sent();
-                    // in case of undefine maxFCT
-                    //var result = await firma.Authz.grantStakeAuthorization(wallet, bobAddress, validatorAddress, AuthorizationType.AUTHORIZATION_TYPE_DELEGATE, expirationDate);
-                    //console.log(result);
+                case 2:
+                    result = _a.sent();
                     chai_1.expect(result.code).to.be.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
     it('Authz ExecuteAllowance-Delegate', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobWallet, delegationInfo, _a, _b, validatorAddress, amountFCT, address, sendAmount, msgDelegate, anyData, result;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+        var delegationInfo, validatorAddress, amountFCT, address, sendAmount, msgDelegate, anyData, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, firma.Staking.getTotalDelegationInfo(aliceAddress)];
                 case 1:
-                    aliceWallet = _c.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
-                case 2:
-                    bobWallet = _c.sent();
-                    _b = (_a = firma.Staking).getTotalDelegationInfo;
-                    return [4 /*yield*/, aliceWallet.getAddress()];
-                case 3: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
-                case 4:
-                    delegationInfo = (_c.sent()).dataList;
+                    delegationInfo = (_a.sent()).dataList;
                     validatorAddress = delegationInfo[0].delegation.validator_address;
                     amountFCT = 9;
-                    return [4 /*yield*/, aliceWallet.getAddress()];
-                case 5:
-                    address = _c.sent();
+                    address = aliceAddress;
                     sendAmount = { denom: firma.Config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amountFCT) };
                     msgDelegate = staking_1.StakingTxClient.msgDelegate({
                         delegatorAddress: address,
@@ -186,83 +163,54 @@ describe('[23. Authz Tx Test]', function () {
                     });
                     anyData = FirmaUtil_1.FirmaUtil.getAnyData(staking_1.StakingTxClient.getRegistry(), msgDelegate);
                     return [4 /*yield*/, firma.Authz.executeAllowance(bobWallet, [anyData])];
-                case 6:
-                    result = _c.sent();
-                    //console.log(result);
+                case 2:
+                    result = _a.sent();
                     chai_1.expect(result.code).to.be.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
-    it.skip('Authz Revoke Delegate', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobAddress, result;
+    it('Authz Revoke Delegate', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var result;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+                case 0: return [4 /*yield*/, firma.Authz.revokeStakeAuthorization(aliceWallet, bobAddress, authz_1.AuthorizationType.AUTHORIZATION_TYPE_DELEGATE)];
                 case 1:
-                    aliceWallet = _a.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
-                case 2: return [4 /*yield*/, (_a.sent()).getAddress()];
-                case 3:
-                    bobAddress = _a.sent();
-                    return [4 /*yield*/, firma.Authz.revokeStakeAuthorization(aliceWallet, bobAddress, authz_1.AuthorizationType.AUTHORIZATION_TYPE_DELEGATE)];
-                case 4:
                     result = _a.sent();
-                    //console.log(result);
                     chai_1.expect(result.code).to.be.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
     it('Authz Grant UnDelegate', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobAddress, delegationInfo, _a, _b, validatorAddress, expirationDate, maxFCT, result;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+        var delegationInfo, validatorAddress, expirationDate, maxFCT, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, firma.Staking.getTotalDelegationInfo(aliceAddress)];
                 case 1:
-                    aliceWallet = _c.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
-                case 2: return [4 /*yield*/, (_c.sent()).getAddress()];
-                case 3:
-                    bobAddress = _c.sent();
-                    _b = (_a = firma.Staking).getTotalDelegationInfo;
-                    return [4 /*yield*/, aliceWallet.getAddress()];
-                case 4: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
-                case 5:
-                    delegationInfo = (_c.sent()).dataList;
+                    delegationInfo = (_a.sent()).dataList;
                     validatorAddress = delegationInfo[0].delegation.validator_address;
                     expirationDate = new Date();
                     expirationDate.setFullYear(expirationDate.getFullYear() + 1);
                     maxFCT = 10;
                     return [4 /*yield*/, firma.Authz.grantStakeAuthorization(aliceWallet, bobAddress, [validatorAddress], authz_1.AuthorizationType.AUTHORIZATION_TYPE_UNDELEGATE, expirationDate, maxFCT)];
-                case 6:
-                    result = _c.sent();
-                    //console.log(result);
+                case 2:
+                    result = _a.sent();
                     chai_1.expect(result.code).to.be.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
     it('Authz ExecuteAllowance-Undelegate', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobWallet, delegationInfo, _a, _b, validatorAddress, amountFCT, address, sendAmount, msgUndelegate, anyData, result;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+        var delegationInfo, validatorAddress, amountFCT, address, sendAmount, msgUndelegate, anyData, gas, fee, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, firma.Staking.getTotalDelegationInfo(aliceAddress)];
                 case 1:
-                    aliceWallet = _c.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
-                case 2:
-                    bobWallet = _c.sent();
-                    _b = (_a = firma.Staking).getTotalDelegationInfo;
-                    return [4 /*yield*/, aliceWallet.getAddress()];
-                case 3: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
-                case 4:
-                    delegationInfo = (_c.sent()).dataList;
+                    delegationInfo = (_a.sent()).dataList;
                     validatorAddress = delegationInfo[0].delegation.validator_address;
                     amountFCT = 9;
-                    return [4 /*yield*/, aliceWallet.getAddress()];
-                case 5:
-                    address = _c.sent();
+                    address = aliceAddress;
                     sendAmount = { denom: firma.Config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amountFCT) };
                     msgUndelegate = staking_1.StakingTxClient.msgUndelegate({
                         delegatorAddress: address,
@@ -270,117 +218,77 @@ describe('[23. Authz Tx Test]', function () {
                         amount: sendAmount
                     });
                     anyData = FirmaUtil_1.FirmaUtil.getAnyData(staking_1.StakingTxClient.getRegistry(), msgUndelegate);
-                    return [4 /*yield*/, firma.Authz.executeAllowance(bobWallet, [anyData])];
-                case 6:
-                    result = _c.sent();
-                    //console.log(result);
+                    return [4 /*yield*/, firma.Authz.getGasEstimationExecuteAllowance(bobWallet, [anyData])];
+                case 2:
+                    gas = _a.sent();
+                    fee = Math.ceil(gas * 0.1);
+                    return [4 /*yield*/, firma.Authz.executeAllowance(bobWallet, [anyData], { gas: gas, fee: fee })];
+                case 3:
+                    result = _a.sent();
                     chai_1.expect(result.code).to.be.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
-    it.skip('Authz Revoke UnDelegate', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobAddress, result;
+    it('Authz Revoke UnDelegate', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var result;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+                case 0: return [4 /*yield*/, firma.Authz.revokeStakeAuthorization(aliceWallet, bobAddress, authz_1.AuthorizationType.AUTHORIZATION_TYPE_UNDELEGATE)];
                 case 1:
-                    aliceWallet = _a.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
-                case 2: return [4 /*yield*/, (_a.sent()).getAddress()];
-                case 3:
-                    bobAddress = _a.sent();
-                    return [4 /*yield*/, firma.Authz.revokeStakeAuthorization(aliceWallet, bobAddress, authz_1.AuthorizationType.AUTHORIZATION_TYPE_UNDELEGATE)];
-                case 4:
                     result = _a.sent();
-                    //console.log(result);
                     chai_1.expect(result.code).to.be.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
     it('Authz Grant ReDelegate', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobAddress, delegationInfo, _a, _b, validatorAddress, expirationDate, maxFCT, result;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+        var delegationInfo, validatorAddress1, validatorAddress2, expirationDate, maxFCT, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, firma.Staking.getTotalDelegationInfo(aliceAddress)];
                 case 1:
-                    aliceWallet = _c.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
-                case 2: return [4 /*yield*/, (_c.sent()).getAddress()];
-                case 3:
-                    bobAddress = _c.sent();
-                    _b = (_a = firma.Staking).getTotalDelegationInfo;
-                    return [4 /*yield*/, aliceWallet.getAddress()];
-                case 4: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
-                case 5:
-                    delegationInfo = (_c.sent()).dataList;
-                    validatorAddress = delegationInfo[0].delegation.validator_address;
+                    delegationInfo = (_a.sent()).dataList;
+                    validatorAddress1 = delegationInfo[0].delegation.validator_address;
+                    validatorAddress2 = delegationInfo[1].delegation.validator_address;
                     expirationDate = new Date();
                     expirationDate.setFullYear(expirationDate.getFullYear() + 1);
                     maxFCT = 10;
-                    return [4 /*yield*/, firma.Authz.grantStakeAuthorization(aliceWallet, bobAddress, [validatorAddress], authz_1.AuthorizationType.AUTHORIZATION_TYPE_REDELEGATE, expirationDate, maxFCT)];
-                case 6:
-                    result = _c.sent();
-                    //console.log(result);
+                    return [4 /*yield*/, firma.Authz.grantStakeAuthorization(aliceWallet, bobAddress, [validatorAddress1, validatorAddress2], authz_1.AuthorizationType.AUTHORIZATION_TYPE_REDELEGATE, expirationDate, maxFCT)];
+                case 2:
+                    result = _a.sent();
                     chai_1.expect(result.code).to.be.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
-    it.skip('Authz ExecuteAllowance-ReDelegate', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobWallet, delegationInfo, _a, _b, validatorSrcAddress, validatorDstAddress, amountFCT, address, sendAmount, msgRedelegate, anyData, result;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+    it('Authz ExecuteAllowance-ReDelegate', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var delegationInfo, validatorAddress1, validatorAddress2, expirationDate, maxFCT, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, firma.Staking.getTotalDelegationInfo(aliceAddress)];
                 case 1:
-                    aliceWallet = _c.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
+                    delegationInfo = (_a.sent()).dataList;
+                    validatorAddress1 = delegationInfo[0].delegation.validator_address;
+                    validatorAddress2 = delegationInfo[1].delegation.validator_address;
+                    expirationDate = new Date();
+                    expirationDate.setFullYear(expirationDate.getFullYear() + 1);
+                    maxFCT = 10;
+                    return [4 /*yield*/, firma.Authz.grantStakeAuthorization(aliceWallet, bobAddress, [validatorAddress1, validatorAddress2], authz_1.AuthorizationType.AUTHORIZATION_TYPE_REDELEGATE, expirationDate, maxFCT)];
                 case 2:
-                    bobWallet = _c.sent();
-                    _b = (_a = firma.Staking).getTotalDelegationInfo;
-                    return [4 /*yield*/, aliceWallet.getAddress()];
-                case 3: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
-                case 4:
-                    delegationInfo = (_c.sent()).dataList;
-                    validatorSrcAddress = delegationInfo[0].delegation.validator_address;
-                    validatorDstAddress = validatorSrcAddress;
-                    amountFCT = 9;
-                    return [4 /*yield*/, aliceWallet.getAddress()];
-                case 5:
-                    address = _c.sent();
-                    sendAmount = { denom: firma.Config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amountFCT) };
-                    msgRedelegate = staking_1.StakingTxClient.msgRedelegate({
-                        delegatorAddress: address,
-                        validatorSrcAddress: validatorSrcAddress,
-                        validatorDstAddress: validatorDstAddress,
-                        amount: sendAmount
-                    });
-                    anyData = FirmaUtil_1.FirmaUtil.getAnyData(staking_1.StakingTxClient.getRegistry(), msgRedelegate);
-                    return [4 /*yield*/, firma.Authz.executeAllowance(bobWallet, [anyData])];
-                case 6:
-                    result = _c.sent();
-                    //console.log(result);
+                    result = _a.sent();
                     chai_1.expect(result.code).to.be.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
-    it.skip('Authz Revoke ReDelegate', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobAddress, result;
+    it('Authz Revoke ReDelegate', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var result;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+                case 0: return [4 /*yield*/, firma.Authz.revokeStakeAuthorization(aliceWallet, bobAddress, authz_1.AuthorizationType.AUTHORIZATION_TYPE_REDELEGATE)];
                 case 1:
-                    aliceWallet = _a.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
-                case 2: return [4 /*yield*/, (_a.sent()).getAddress()];
-                case 3:
-                    bobAddress = _a.sent();
-                    return [4 /*yield*/, firma.Authz.revokeStakeAuthorization(aliceWallet, bobAddress, authz_1.AuthorizationType.AUTHORIZATION_TYPE_REDELEGATE)];
-                case 4:
                     result = _a.sent();
-                    //console.log(result);
                     chai_1.expect(result.code).to.be.equal(0);
                     return [2 /*return*/];
             }
@@ -388,81 +296,52 @@ describe('[23. Authz Tx Test]', function () {
     }); });
     // GenericAuthorization: MsgWithdrawDelegatorReward case
     it('Authz Grant-GenericAuthorization MsgWithdrawDelegatorReward', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobAddress, msg, expirationDate, result;
+        var msg, expirationDate, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
-                case 1:
-                    aliceWallet = _a.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
-                case 2: return [4 /*yield*/, (_a.sent()).getAddress()];
-                case 3:
-                    bobAddress = _a.sent();
+                case 0:
                     msg = "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward";
                     expirationDate = new Date();
                     expirationDate.setFullYear(expirationDate.getFullYear() + 1);
                     return [4 /*yield*/, firma.Authz.grantGenericAuthorization(aliceWallet, bobAddress, msg, expirationDate)];
-                case 4:
+                case 1:
                     result = _a.sent();
-                    //console.log(result);
                     chai_1.expect(result.code).to.be.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
     it('Authz GenericAuthorization ExecuteAllowance-MsgWithdrawDelegatorReward', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobWallet, delegationInfo, _a, _b, validatorAddress, amountFCT, address, sendAmount, msgWithdrawDelegatorReward, anyData, result;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
+        var delegationInfo, validatorAddress, address, msgWithdrawDelegatorReward, anyData, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, firma.Staking.getTotalDelegationInfo(aliceAddress)];
                 case 1:
-                    aliceWallet = _c.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
-                case 2:
-                    bobWallet = _c.sent();
-                    _b = (_a = firma.Staking).getTotalDelegationInfo;
-                    return [4 /*yield*/, aliceWallet.getAddress()];
-                case 3: return [4 /*yield*/, _b.apply(_a, [_c.sent()])];
-                case 4:
-                    delegationInfo = (_c.sent()).dataList;
+                    delegationInfo = (_a.sent()).dataList;
                     validatorAddress = delegationInfo[0].delegation.validator_address;
-                    amountFCT = 10;
-                    return [4 /*yield*/, aliceWallet.getAddress()];
-                case 5:
-                    address = _c.sent();
-                    sendAmount = { denom: firma.Config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amountFCT) };
+                    address = aliceAddress;
                     msgWithdrawDelegatorReward = distribution_1.DistributionTxClient.msgWithdrawDelegatorReward({
                         delegatorAddress: address,
                         validatorAddress: validatorAddress,
                     });
                     anyData = FirmaUtil_1.FirmaUtil.getAnyData(distribution_1.DistributionTxClient.getRegistry(), msgWithdrawDelegatorReward);
                     return [4 /*yield*/, firma.Authz.executeAllowance(bobWallet, [anyData])];
-                case 6:
-                    result = _c.sent();
-                    //console.log(result);
+                case 2:
+                    result = _a.sent();
                     chai_1.expect(result.code).to.be.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
-    it.skip('Authz Revoke-GenericAuthorization MsgWithdrawDelegatorReward', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var aliceWallet, bobAddress, msgType, result;
+    it('Authz Revoke-GenericAuthorization MsgWithdrawDelegatorReward', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var msgType, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.aliceMnemonic)];
-                case 1:
-                    aliceWallet = _a.sent();
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic(config_test_1.bobMnemonic)];
-                case 2: return [4 /*yield*/, (_a.sent()).getAddress()];
-                case 3:
-                    bobAddress = _a.sent();
+                case 0:
                     msgType = "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward";
-                    return [4 /*yield*/, firma.Authz.revokeGenericAuthorization(aliceWallet, bobAddress, msgType)
-                        //console.log(result);
-                    ];
-                case 4:
+                    return [4 /*yield*/, firma.Authz.revokeGenericAuthorization(aliceWallet, bobAddress, msgType)];
+                case 1:
                     result = _a.sent();
-                    //console.log(result);
                     chai_1.expect(result.code).to.be.equal(0);
                     return [2 /*return*/];
             }