Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"Frunique",
"fruniques",
"Permill"
]
],
"task.allowAutomaticTasks": "on"
}
42 changes: 40 additions & 2 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "2.0.0",
"tasks": [
{
"label": "Run ",
"label": "Test",
"type": "shell",
"command": "cargo",
"args": [
Expand All @@ -16,7 +16,7 @@
"--dev"
],
"group": {
"kind": "build",
"kind": "test",
"isDefault": true
},
"presentation": {
Expand All @@ -43,6 +43,44 @@
}
]
},
{
"label": "Compile",
"type": "shell",
"command": "cargo",
"args": [
"build",
"--release",
"-p",
"hashed-runtime",
],
"group": {
"kind": "build",
"isDefault": false
},
"presentation": {
"reveal": "always",
"panel": "new"
},
"problemMatcher": [
{
"owner": "rust",
"fileLocation": [
"relative",
"${workspaceRoot}"
],
"pattern": {
"regexp": "^(.*):(\\d+):(\\d+):\\s+(\\d+):(\\d+)\\s+(warning|error):\\s+(.*)$",
"file": 1,
"line": 2,
"column": 3,
"endLine": 4,
"endColumn": 5,
"severity": 6,
"message": 7
}
}
]
},
{
"type": "cargo",
"command": "test",
Expand Down
1 change: 1 addition & 0 deletions pallets/fruniques/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ pub mod pallet {
let _ = <NextFrunique<T>>::clear(1000, None);
let _ = <FruniqueParent<T>>::clear(1000, None);
let _ = <FruniqueChild<T>>::clear(1000, None);

T::Rbac::remove_pallet_storage(Self::pallet_id())?;
Ok(())
}
Expand Down
3 changes: 2 additions & 1 deletion pallets/gated-marketplace/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,8 @@ pub mod pallet {
let _ = <ApplicationsByAccount<T>>::clear(1000, None);
let _ = <ApplicantsByMarketplace<T>>::clear(1000, None);
let _ = <Custodians<T>>::clear(1000, None);
// T::Rbac::remove_pallet_storage(Self::pallet_id())?;

<T as Config>::Rbac::remove_pallet_storage(Self::pallet_id())?;
Ok(())
}

Expand Down
2 changes: 1 addition & 1 deletion runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,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: 128,
spec_version: 129,
impl_version: 1,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
Expand Down