From d2662c63f87e03493970aeaa94b878a8f68a4200 Mon Sep 17 00:00:00 2001 From: Gianfranco Date: Thu, 6 Jun 2024 11:58:37 -0300 Subject: [PATCH] replace account_id on tests --- clients/runtime/src/lib.rs | 2 +- clients/vault/src/main.rs | 5 ++--- clients/vault/src/process.rs | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clients/runtime/src/lib.rs b/clients/runtime/src/lib.rs index c6cf8395c..548b2b39e 100644 --- a/clients/runtime/src/lib.rs +++ b/clients/runtime/src/lib.rs @@ -69,7 +69,7 @@ compile_error!("You need to select at least one of the metadata features"); // well. #[cfg_attr( - feature = "parachain-metadata-foucoco", + feature = "standalone-metadata", subxt( runtime_metadata_path = "metadata-standalone.scale", derive_for_all_types = "Clone, PartialEq, Eq", diff --git a/clients/vault/src/main.rs b/clients/vault/src/main.rs index dc8840179..2f0387aaf 100644 --- a/clients/vault/src/main.rs +++ b/clients/vault/src/main.rs @@ -8,6 +8,7 @@ use futures::Future; use sysinfo::{System, SystemExt}; use tokio::sync::RwLock; use tokio_stream::StreamExt; +use sp_runtime::AccountId32 as AccountId; use runtime::{SpacewalkSigner, DEFAULT_SPEC_NAME}; use service::{ @@ -131,7 +132,7 @@ async fn start() -> Result<(), ServiceError> { // This file is auto-removed when `drop`ped. let _pidfile = PidFile::create( &String::from(DEFAULT_SPEC_NAME), - signer.read().await.account_id(), + &AccountId::new(signer.read().await.account_id().0), &mut sys, )?; @@ -163,8 +164,6 @@ async fn main() { mod tests { use std::{thread, time::Duration}; - use runtime::AccountId; - use super::*; #[tokio::test] diff --git a/clients/vault/src/process.rs b/clients/vault/src/process.rs index d80526350..524450967 100644 --- a/clients/vault/src/process.rs +++ b/clients/vault/src/process.rs @@ -6,7 +6,8 @@ use std::{ str::FromStr, }; -use runtime::AccountId; +//use runtime::AccountId; +use sp_runtime::AccountId32 as AccountId; use service::Error as ServiceError; use sysinfo::{Pid, PidExt, ProcessExt, System, SystemExt};