From d2b43c2b5c8f74906ebd269ab631c0b13cd64ae8 Mon Sep 17 00:00:00 2001
From: Joseph Zhao <zhaozihan542259545@gmail.com>
Date: Sat, 30 Nov 2024 00:24:31 +0800
Subject: [PATCH] resolve confict

---
 docs/sdk/packages/guides/first-runtime/src/lib.rs | 4 ++--
 substrate/client/rpc-spec-v2/src/archive/tests.rs | 4 ++--
 substrate/frame/src/lib.rs                        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/sdk/packages/guides/first-runtime/src/lib.rs b/docs/sdk/packages/guides/first-runtime/src/lib.rs
index 61ca550c8750..2ab060c8c43f 100644
--- a/docs/sdk/packages/guides/first-runtime/src/lib.rs
+++ b/docs/sdk/packages/guides/first-runtime/src/lib.rs
@@ -139,11 +139,11 @@ pub mod genesis_config_presets {
 		let endowment = <MinimumBalance as Get<Balance>>::get().max(1) * 1000;
 		build_struct_json_patch!(RuntimeGenesisConfig {
 			balances: BalancesConfig {
-				balances: AccountKeyring::iter()
+				balances: Sr25519Keyring::iter()
 					.map(|a| (a.to_account_id(), endowment))
 					.collect::<Vec<_>>(),
 			},
-			sudo: SudoConfig { key: Some(AccountKeyring::Alice.to_account_id()) },
+			sudo: SudoConfig { key: Some(Sr25519Keyring::Alice.to_account_id()) },
 		})
 	}
 
diff --git a/substrate/client/rpc-spec-v2/src/archive/tests.rs b/substrate/client/rpc-spec-v2/src/archive/tests.rs
index 42cf6b15a9c4..e819909c5c00 100644
--- a/substrate/client/rpc-spec-v2/src/archive/tests.rs
+++ b/substrate/client/rpc-spec-v2/src/archive/tests.rs
@@ -1035,8 +1035,8 @@ async fn archive_storage_diff_deleted_changes() {
 		.unwrap();
 	builder
 		.push_transfer(Transfer {
-			from: AccountKeyring::Alice.into(),
-			to: AccountKeyring::Ferdie.into(),
+			from: Sr25519Keyring::Alice.into(),
+			to: Sr25519Keyring::Ferdie.into(),
 			amount: 41,
 			nonce: 0,
 		})
diff --git a/substrate/frame/src/lib.rs b/substrate/frame/src/lib.rs
index 03d815e349df..8031ddf96e6a 100644
--- a/substrate/frame/src/lib.rs
+++ b/substrate/frame/src/lib.rs
@@ -391,7 +391,7 @@ pub mod runtime {
 			LOCAL_TESTNET_RUNTIME_PRESET,
 		};
 		pub use sp_inherents::{CheckInherentsResult, InherentData};
-		pub use sp_keyring::AccountKeyring;
+		pub use sp_keyring::Sr25519Keyring;
 		pub use sp_runtime::{ApplyExtrinsicResult, ExtrinsicInclusionMode};
 	}