git.delta.rocks / unique-network / refs/commits / 25c961748e58

difftreelog

remove: getTotalStakingLocked from RPC.

Trubnikov Sergey2022-09-07parent: #d79c091.patch.diff
in: master

5 files changed

modifiedclient/rpc/src/lib.rsdiffbeforeafterboth
--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -270,14 +270,6 @@
 			at: Option<BlockHash>,
 		) -> Result<Vec<(BlockNumber, String)>>;
 
-		/// Returns the total amount locked by staking tokens.
-		#[method(name = "appPromotion_totalStakingLocked")]
-		fn total_staking_locked(
-			&self,
-			staker: CrossAccountId,
-			at: Option<BlockHash>,
-		) -> Result<String>;
-
 		/// Returns the total amount of tokens pending withdrawal from staking.
 		#[method(name = "appPromotion_pendingUnstake")]
 		fn pending_unstake(
@@ -594,7 +586,6 @@
 		.into_iter()
 		.map(|(b, a)| (b, a.to_string()))
 		.collect::<Vec<_>>(), app_promotion_api);
-	pass_method!(total_staking_locked(staker: CrossAccountId) -> String => |v| v.to_string(), app_promotion_api);
 	pass_method!(pending_unstake(staker: Option<CrossAccountId>) -> String => |v| v.to_string(), app_promotion_api);
 	pass_method!(pending_unstake_per_block(staker: CrossAccountId) -> Vec<(BlockNumber, String)> =>
 		|v| v
modifiedprimitives/app_promotion_rpc/src/lib.rsdiffbeforeafterboth
--- a/primitives/app_promotion_rpc/src/lib.rs
+++ b/primitives/app_promotion_rpc/src/lib.rs
@@ -35,7 +35,6 @@
 	{
 		fn total_staked(staker: Option<CrossAccountId>) -> Result<u128>;
 		fn total_staked_per_block(staker: CrossAccountId) -> Result<Vec<(BlockNumber, u128)>>;
-		fn total_staking_locked(staker: CrossAccountId) -> Result<u128>;
 		fn pending_unstake(staker: Option<CrossAccountId>) -> Result<u128>;
 		fn pending_unstake_per_block(staker: CrossAccountId) -> Result<Vec<(BlockNumber, u128)>>;
 	}
modifiedruntime/common/runtime_apis.rsdiffbeforeafterboth
--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -206,14 +206,6 @@
                     return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_total_staked_per_block(staker));
                 }
 
-                fn total_staking_locked(staker: CrossAccountId) -> Result<u128, DispatchError> {
-                    #[cfg(not(feature = "app-promotion"))]
-                    return unsupported!();
-
-                    #[cfg(feature = "app-promotion")]
-                    return Ok(<pallet_app_promotion::Pallet<Runtime>>::cross_id_locked_balance(staker));
-                }
-
                 fn pending_unstake(staker: Option<CrossAccountId>) -> Result<u128, DispatchError> {
                     #[cfg(not(feature = "app-promotion"))]
                     return unsupported!();
modifiedtests/src/interfaces/appPromotion/definitions.tsdiffbeforeafterboth
before · tests/src/interfaces/appPromotion/definitions.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617type RpcParam = {18  name: string;19  type: string;20  isOptional?: true;21};2223const CROSS_ACCOUNT_ID_TYPE = 'PalletEvmAccountBasicCrossAccountIdRepr';2425const collectionParam = {name: 'collection', type: 'u32'};26const tokenParam = {name: 'tokenId', type: 'u32'};27const propertyKeysParam = {name: 'propertyKeys', type: 'Vec<String>', isOptional: true};28const crossAccountParam = (name = 'account') => ({name, type: CROSS_ACCOUNT_ID_TYPE});29const atParam = {name: 'at', type: 'Hash', isOptional: true};3031const fun = (description: string, params: RpcParam[], type: string) => ({32  description,33  params: [...params, atParam],34  type,35});3637export default {38  types: {},39  rpc: {40    totalStaked: fun(41      'Returns the total amount of staked tokens',42      [{name: 'staker', type: CROSS_ACCOUNT_ID_TYPE, isOptional: true}],43      'u128',44    ),45    totalStakedPerBlock: fun(46      'Returns the total amount of staked tokens per block when staked',47      [crossAccountParam('staker')],48      'Vec<(u32, u128)>',49    ),50    totalStakingLocked: fun(51      'Return the total amount locked by staking tokens',52      [crossAccountParam('staker')],53      'u128',54    ),55    pendingUnstake: fun(56      'Returns the total amount of unstaked tokens',57      [{name: 'staker', type: CROSS_ACCOUNT_ID_TYPE, isOptional: true}],58      'u128',59    ),60    pendingUnstakePerBlock: fun(61      'Returns the total amount of unstaked tokens per block',62      [crossAccountParam('staker')],63      'Vec<(u32, u128)>',64    ),65  },66};
after · tests/src/interfaces/appPromotion/definitions.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617type RpcParam = {18  name: string;19  type: string;20  isOptional?: true;21};2223const CROSS_ACCOUNT_ID_TYPE = 'PalletEvmAccountBasicCrossAccountIdRepr';2425const crossAccountParam = (name = 'account') => ({name, type: CROSS_ACCOUNT_ID_TYPE});26const atParam = {name: 'at', type: 'Hash', isOptional: true};2728const fun = (description: string, params: RpcParam[], type: string) => ({29  description,30  params: [...params, atParam],31  type,32});3334export default {35  types: {},36  rpc: {37    totalStaked: fun(38      'Returns the total amount of staked tokens',39      [{name: 'staker', type: CROSS_ACCOUNT_ID_TYPE, isOptional: true}],40      'u128',41    ),42    totalStakedPerBlock: fun(43      'Returns the total amount of staked tokens per block when staked',44      [crossAccountParam('staker')],45      'Vec<(u32, u128)>',46    ),47    pendingUnstake: fun(48      'Returns the total amount of unstaked tokens',49      [{name: 'staker', type: CROSS_ACCOUNT_ID_TYPE, isOptional: true}],50      'u128',51    ),52    pendingUnstakePerBlock: fun(53      'Returns the total amount of unstaked tokens per block',54      [crossAccountParam('staker')],55      'Vec<(u32, u128)>',56    ),57  },58};
modifiedtests/src/interfaces/augment-api-rpc.tsdiffbeforeafterboth
--- a/tests/src/interfaces/augment-api-rpc.ts
+++ b/tests/src/interfaces/augment-api-rpc.ts
@@ -52,10 +52,6 @@
        * Returns the total amount of staked tokens per block when staked
        **/
       totalStakedPerBlock: AugmentedRpc<(staker: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<Vec<ITuple<[u32, u128]>>>>;
-      /**
-       * Return the total amount locked by staking tokens
-       **/
-      totalStakingLocked: AugmentedRpc<(staker: PalletEvmAccountBasicCrossAccountIdRepr | { Substrate: any } | { Ethereum: any } | string | Uint8Array, at?: Hash | string | Uint8Array) => Observable<u128>>;
     };
     author: {
       /**