mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-26 14:37:57 +00:00
* `ModuleId` to `PalletId` - part of #8372 * fix doc * move `PalletId` to `frame-support` * fix compile * fix tests * `ModuleId` to `PalletId` * subcommand `moduleid` to `palletid`
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
|
||||
//! frame-system CLI utilities
|
||||
|
||||
mod module_id;
|
||||
mod pallet_id;
|
||||
|
||||
pub use module_id::ModuleIdCmd;
|
||||
pub use pallet_id::PalletIdCmd;
|
||||
|
||||
|
||||
+8
-8
@@ -15,25 +15,25 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
//! Implementation of the `moduleid` subcommand
|
||||
//! Implementation of the `palletid` subcommand
|
||||
|
||||
use sc_cli::{
|
||||
Error, utils::print_from_uri, CryptoSchemeFlag,
|
||||
OutputTypeFlag, KeystoreParams, with_crypto_scheme,
|
||||
};
|
||||
use sp_runtime::ModuleId;
|
||||
use sp_runtime::traits::AccountIdConversion;
|
||||
use sp_core::crypto::{Ss58Codec, Ss58AddressFormat};
|
||||
use std::convert::{TryInto, TryFrom};
|
||||
use structopt::StructOpt;
|
||||
use frame_support::PalletId;
|
||||
|
||||
/// The `moduleid` command
|
||||
/// The `palletid` command
|
||||
#[derive(Debug, StructOpt)]
|
||||
#[structopt(
|
||||
name = "moduleid",
|
||||
name = "palletid",
|
||||
about = "Inspect a module ID address"
|
||||
)]
|
||||
pub struct ModuleIdCmd {
|
||||
pub struct PalletIdCmd {
|
||||
/// The module ID used to derive the account
|
||||
id: String,
|
||||
|
||||
@@ -60,7 +60,7 @@ pub struct ModuleIdCmd {
|
||||
pub keystore_params: KeystoreParams,
|
||||
}
|
||||
|
||||
impl ModuleIdCmd {
|
||||
impl PalletIdCmd {
|
||||
/// runs the command
|
||||
pub fn run<R>(&self) -> Result<(), Error>
|
||||
where
|
||||
@@ -74,9 +74,9 @@ impl ModuleIdCmd {
|
||||
|
||||
let id_fixed_array: [u8; 8] = self.id.as_bytes()
|
||||
.try_into()
|
||||
.map_err(|_| "Cannot convert argument to moduleid: argument should be 8-character string")?;
|
||||
.map_err(|_| "Cannot convert argument to palletid: argument should be 8-character string")?;
|
||||
|
||||
let account_id: R::AccountId = ModuleId(id_fixed_array).into_account();
|
||||
let account_id: R::AccountId = PalletId(id_fixed_array).into_account();
|
||||
|
||||
with_crypto_scheme!(
|
||||
self.crypto_scheme.scheme,
|
||||
Reference in New Issue
Block a user