Skip to content

Commit 74179e9

Browse files
authored
Merge pull request #132 from hashed-io/develop
Develop
2 parents 864658e + 985cedf commit 74179e9

File tree

23 files changed

+4489
-312
lines changed

23 files changed

+4489
-312
lines changed

.devcontainer/devcontainer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
"lldb.executable": "/usr/bin/lldb"
77
},
88
"extensions": [
9-
"rust-lang.rust",
10-
"bungcip.better-toml",
11-
"vadimcn.vscode-lldb"
12-
],
9+
"rust-lang.rust",
10+
"bungcip.better-toml",
11+
"vadimcn.vscode-lldb",
12+
"rust-lang.rust-analyzer"
13+
],
1314
"forwardPorts": [
1415
3000,
1516
9944

.github/workflows/docs.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Publish Rust Docs
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
8+
jobs:
9+
deploy-docs:
10+
name: Deploy docs
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout repository
15+
uses: actions/checkout@v3
16+
17+
- name: Rust versions
18+
run: rustup show
19+
20+
- name: Rust cache
21+
uses: Swatinem/rust-cache@v1
22+
23+
- name: Build rustdocs
24+
run: SKIP_WASM_BUILD=1 cargo doc --all --no-deps
25+
26+
- name: Make index.html
27+
run: echo "<meta http-equiv=refresh content=0;url=hashed_substrate/index.html>" > ./target/doc/index.html
28+
29+
- name: Deploy documentation
30+
uses: peaceiris/actions-gh-pages@v3
31+
with:
32+
github_token: ${{ secrets.GITHUB_TOKEN }}
33+
publish_branch: gh-pages
34+
publish_dir: ./target/doc

Cargo.lock

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

node/src/chain_spec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use hashed_runtime::{
22
AccountId, AuraConfig, BalancesConfig, CouncilConfig, GenesisConfig, GrandpaConfig, Signature,
3-
SudoConfig, SystemConfig, NodeAuthorizationConfig, NBVStorageConfig ,WASM_BINARY,
3+
SudoConfig, SystemConfig, NodeAuthorizationConfig, NBVStorageConfig, WASM_BINARY,
44
};
55
use sc_chain_spec::Properties;
66
use sc_service::ChainType;
@@ -279,6 +279,6 @@ fn testnet_genesis(
279279
transaction_payment: Default::default(),
280280
nbv_storage : NBVStorageConfig{
281281
bdk_services_url : BDK_SERVICES_MAINNET_URL.as_bytes().to_vec(),
282-
}
282+
},
283283
}
284284
}

pallets/confidential-docs/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ pub mod pallet {
316316
<SharedDocs<T>>::remove_all(None);
317317
<SharedDocsByTo<T>>::remove_all(None);
318318
<SharedDocsByFrom<T>>::remove_all(None);
319+
<UserIds<T>>::remove_all(None);
319320
Ok(())
320321
}
321322
}

pallets/fruniques/src/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{mock::*, Error};
22

3-
use frame_support::{assert_err, assert_noop, assert_ok};
3+
use frame_support::{assert_noop, assert_ok};
44
use sp_runtime::Permill;
55

66
pub struct ExtBuilder;

pallets/gated-marketplace/Cargo.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ frame-benchmarking = { default-features = false, version = "4.0.0-dev", git = "h
2525
sp-runtime = { default-features = false, version = "6.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.23" }
2626

2727

28+
pallet-balances = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.23" }
29+
pallet-uniques = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.23" }
30+
pallet-timestamp = { default-features = false, version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.23" }
31+
pallet-fruniques = {path = "../fruniques", default-features = false, version = "0.1.0-dev"}
32+
pallet-rbac = { default-features = false, version = "4.0.0-dev", path="../rbac/"}
33+
2834
[dev-dependencies]
2935
sp-core = { default-features = false, version = "6.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.23" }
3036
sp-io = { default-features = false, version = "6.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.23" }
@@ -39,6 +45,11 @@ std = [
3945
"frame-support/std",
4046
"frame-system/std",
4147
"frame-benchmarking/std",
48+
"pallet-balances/std",
49+
"pallet-uniques/std",
50+
"pallet-fruniques/std",
51+
"pallet-timestamp/std",
52+
"pallet-rbac/std"
4253
]
4354

4455
runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]

0 commit comments

Comments
 (0)