Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change import in child-trie module #90

Merged
merged 26 commits into from
Nov 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
751a147
Braindump.
JoshOrndorff Oct 25, 2019
dd24461
attempt
JoshOrndorff Oct 25, 2019
fecda3b
x
JoshOrndorff Oct 25, 2019
52ff72c
correct file name 🤦
JoshOrndorff Oct 25, 2019
2067f17
syntax
JoshOrndorff Oct 25, 2019
83356d4
x
JoshOrndorff Oct 25, 2019
e7ab8cb
x
JoshOrndorff Oct 25, 2019
5156297
confirm build breaks
JoshOrndorff Oct 25, 2019
d039ffe
Check second module
JoshOrndorff Oct 25, 2019
7321887
indentation
JoshOrndorff Oct 25, 2019
0df726d
all `run` items start from repo directory?
JoshOrndorff Oct 25, 2019
abfb29a
Check lots more modules
JoshOrndorff Oct 25, 2019
486308e
Even more modules
JoshOrndorff Oct 25, 2019
6807511
Merge branch 'master' into joshy-ci-build
JoshOrndorff Oct 26, 2019
351f774
Refactor to use virtual workspace
JoshOrndorff Oct 26, 2019
95f4f47
x
JoshOrndorff Oct 26, 2019
9e10090
Also check runtimes and node.
JoshOrndorff Oct 26, 2019
634de57
Only check modules
JoshOrndorff Nov 12, 2019
6e4353d
Merge branch 'master' into joshy-ci-build
JoshOrndorff Nov 20, 2019
f451df8
Add genesis modules
JoshOrndorff Nov 20, 2019
0cc1a25
Add runtimes
JoshOrndorff Nov 20, 2019
f7f6b21
Add node (this is where it all went wrong last time)
JoshOrndorff Nov 20, 2019
916e7ec
Remove node, but add recently-revised child tree.
JoshOrndorff Nov 20, 2019
6028fa4
Fix spelling mistake
JoshOrndorff Nov 20, 2019
94f8878
Disable child-trie; It's not ready.
JoshOrndorff Nov 20, 2019
81b6c0b
Import CHILD_STORAGE_KEY_PREFIX from consistent upstream commit.
JoshOrndorff Nov 20, 2019
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
44 changes: 44 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
version: 2
jobs:
check-modules:
docker:
- image: parity/rust:nightly
working_directory: ~/repo
steps:
- checkout
# Download and cache dependencies
# - restore_cache:
# keys:
# - v1-dependencies-{{ checksum "package.json" }}
# # fallback to using the latest cache if no exact match is found
# - v1-dependencies-
# - save_cache:
# paths:
# - node_modules
# key: v1-dependencies-{{ checksum "package.json" }}
- run:
name: Check Modules
command: |
cd kitchen/
cargo check --all
# - persist_to_workspace:
# # relative to working_directory
# root: "./"
# paths:
# - "./"

#TODO Port the build from travis CI to here
#build-book:



workflows:
version: 2
check-modules:
jobs:
- check-modules
# filters: *filter-non-gh-pages
# - deploy:
# filters: *filter-only-master
# requires:
# - test
10 changes: 5 additions & 5 deletions kitchen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = [
"modules/adding-machine",
"modules/basic-token",
"modules/check-membership",
# "modules/child-tree",
"modules/child-trie",
"modules/currency-imbalances",
"modules/double-map",
# "modules/gen-random",
Expand All @@ -25,10 +25,10 @@ members = [
"modules/vec-set",
"modules/last-caller",
"modules/default-instance",
# "modules/weights",
"modules/weights",
"runtimes/super-runtime",
# "runtimes/super-genesis",
# "runtimes/weight-fee-runtime",
# "runtimes/weight-fee-genesis",
"runtimes/super-genesis",
"runtimes/weight-fee-runtime",
"runtimes/weight-fee-genesis",
# "node",
]
2 changes: 0 additions & 2 deletions kitchen/modules/child-trie/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ std = [
'runtime-primitives/std',
]

[dependencies]
substrate-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }

[dependencies.parity-scale-codec]
default-features = false
Expand Down
2 changes: 1 addition & 1 deletion kitchen/modules/child-trie/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//! - auxiliary runtime methods for using child storage
//! - see modules::{smpl-crowdfund,} for examples of using this API with objects in the module
use primitives::{Blake2Hasher, Hasher};
use substrate_primitives::storage::well_known_keys::CHILD_STORAGE_KEY_PREFIX;
use primitives::storage::well_known_keys::CHILD_STORAGE_KEY_PREFIX;
use support::{decl_module, decl_storage, storage::child};

use parity_scale_codec::{Decode, Encode};
Expand Down
2 changes: 1 addition & 1 deletion kitchen/modules/social-network/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/// TODO:rewrite `=>` create a profile struct for managing friend information
/// use constant getters and softmax?
use support::{
decl_event, decl_module, decl_storage, dispatch::Result, ensure, EnumerableStorageMap,
decl_event, decl_module, decl_storage, dispatch::Result, ensure,
StorageMap, StorageValue,
};
use system::ensure_signed;
Expand Down