Skip to content

Commit

Permalink
chore: update runtime and toolchain version
Browse files Browse the repository at this point in the history
  • Loading branch information
beqaabu committed Aug 2, 2024
1 parent 5557c9d commit a674d41
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 27 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ members = [
resolver = "2"

[workspace.package]
version = '2.239.0'
version = '2.240.0'
authors = ['Gluwa Inc.', 'Nathan Whitaker <nathan.whitaker@gluwa.com>']
edition = '2021'
license = 'Unlicense'
Expand All @@ -42,7 +42,7 @@ log = { version = "0.4.21" }
parity-scale-codec = { version = "3.2.1", default-features = false, features = [
"derive",
] }
serde = { version = "1.0.203", default-features = false, features = ["derive"] }
serde = { version = "1.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.11", default-features = false, features = [
"derive",
] }
Expand Down
8 changes: 1 addition & 7 deletions pallets/creditcoin/src/types.rs
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
mod cleanup;
//mod collect_coins;
pub mod loan_terms;
mod transfer;

pub use cleanup::{StorageCleanupState, StorageItemCleanupState};
// pub use collect_coins::{
// CollectedCoins as CollectedCoinsStruct, CollectedCoinsId, UnverifiedCollectedCoins,
// };

pub use loan_terms::*;
pub use transfer::*;

//pub use collect_coins::{BurnDetails, ContractType};

//use crate::ocw::tasks::collect_coins::DeployedContract;
use crate::ocw::VerificationFailureCause;
use crate::ocw::VerificationResult;
use extend::ext;
Expand Down
2 changes: 1 addition & 1 deletion pallets/offchain-task-scheduler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
serde = { version = "1.0.203", features = ["derive"], default-features = false }
serde = { workspace = true }
serde_json = { version = "1.0.119", features = [
"alloc",
], default-features = false }
Expand Down
5 changes: 3 additions & 2 deletions pallets/offchain-task-scheduler/src/authorship.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@ pub trait Authorship {
type Public: From<Self::RuntimePublic> + IdentifyAccount<AccountId = Self::AccountId>;
type AccountId;
fn find_authorized<'a>(
keys: impl Iterator<Item = &'a Self::RuntimePublic>,
mut keys: impl Iterator<Item = &'a Self::RuntimePublic>,
) -> Option<Self::RuntimePublic>
where
Self::RuntimePublic: 'a,
{
keys.cloned().find(|pkey| {
keys.find(|&pkey| {
let auth = Self::Public::from(pkey.clone()).into_account();
Self::is_authorized(&auth)
})
.cloned()
}

fn is_authorized(who: &Self::AccountId) -> bool;
Expand Down
13 changes: 0 additions & 13 deletions runtime/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,3 @@ fn must_be_root_to_schedule() {
assert_noop!(Scheduler::schedule(RawOrigin::None.into(), 4, None, 0, boxed), BadOrigin);
});
}

// #[test]
// fn authority_migration_parity_checks() {
// use pallet_creditcoin::migrations::v7::{Authorities as AC, SCHEDULER_PREFIX};
// use pallet_offchain_task_scheduler::Authorities as AT;
//
// //Pallet prefix
// let scheduler_prefix = TaskScheduler::name();
// assert_eq!(SCHEDULER_PREFIX, scheduler_prefix);
//
// //Storage Prefix
// assert_eq!(AT::<Runtime>::storage_prefix(), AC::<Runtime>::storage_prefix());
// }
2 changes: 1 addition & 1 deletion runtime/src/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
// `spec_version`, and `authoring_version` are the same between Wasm and native.
// This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
// the compatible custom types.
spec_version: 239,
spec_version: 240,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 11,
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "nightly-2023-06-06"
channel = "nightly-2023-10-06"
components = ["cargo", "clippy", "rustc", "rustfmt", "rust-src"]
profile = "minimal"
targets = ["wasm32-unknown-unknown"]

0 comments on commit a674d41

Please sign in to comment.