fix merge errors

opentensor · Aug 23, 2024 · 4ce3b8e · 4ce3b8e
1 parent 8c17cfd
commit 4ce3b8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/pallets/subtensor/src/benchmarks.rs b/pallets/subtensor/src/benchmarks.rs
@@ -312,7 +312,7 @@ benchmarks! {
     let amount_to_be_staked = 100_000_000_000_000u64;
     Subtensor::<T>::add_balance_to_coldkey_account(&coldkey.clone(), amount_to_be_staked);
     assert_ok!(Subtensor::<T>::register_network(RawOrigin::Signed(coldkey.clone()).into(), None));
-  }: dissolve_network(RawOrigin::Signed(coldkey), 1)
+  }: dissolve_network(RawOrigin::Signed(coldkey), coldkey.clone(), 1)
 
 
   // swap_hotkey {
@@ -519,6 +519,6 @@ reveal_weights {
     Identities::<T>::insert(&old_coldkey, identity);
 
     // Benchmark setup complete, now execute the extrinsic
-}: swap_coldkey(RawOrigin::Signed(old_coldkey.clone()), old_coldkey.clone(), new_coldkey.clone())
+}: swap_coldkey(RawOrigin::Root, old_coldkey.clone(), new_coldkey.clone())
 
 }
diff --git a/pallets/subtensor/tests/root.rs b/pallets/subtensor/tests/root.rs
@@ -1052,10 +1052,7 @@ fn test_user_add_network_with_identity_fields_ok() {
         assert_eq!(stored_identity_2.subnet_contact, subnet_contact_2);
 
         // Now remove the first network.
-        assert_ok!(SubtensorModule::user_remove_network(
-            RuntimeOrigin::signed(coldkey_1),
-            1
-        ));
+        assert_ok!(SubtensorModule::user_remove_network(coldkey_1, 1));
 
         // Verify that the first network and identity have been removed.
         assert!(SubnetIdentities::<Test>::get(1).is_none());