Refactor all (demo) runtime modules to use new storage #98

gavofyork · 2018-03-16T14:23:43Z

No description provided.

Not yet complete but 75% there.

rphmeier · 2018-03-19T03:12:16Z

demo/runtime/src/genesismap.rs

@@ -80,40 +80,37 @@ impl GenesisConfig {
 	pub fn genesis_map(&self) -> HashMap<Vec<u8>, Vec<u8>> {
 		let wasm_runtime = include_bytes!("../wasm/genesis.wasm").to_vec();
 		vec![
-			(&session::SESSION_LENGTH[..], vec![].and(&self.session_length)),
-			(&session::VALIDATOR_COUNT[..], vec![].and(&(self.validators.len() as u32))),
+			(session::SessionLength::key(), vec![].and(&self.session_length)),


rphmeier · 2018-03-19T03:13:39Z

substrate/runtime-support/src/storage/mod.rs

@@ -122,58 +122,77 @@ pub fn put_raw(key: &[u8], value: &[u8]) {
 	runtime_io::set_storage(&twox_128(key)[..], value)
 }

-struct RuntimeStorage;
+pub struct RuntimeStorage;


doe it need to be pub? should have docs if so

yup it's needed for the macro

rphmeier · 2018-03-19T03:14:08Z

substrate/runtime-support/src/storage/generator.rs

@@ -48,46 +48,78 @@

 use codec;
 use rstd::vec::Vec;
+pub use rstd::borrow::Borrow;


#[doc(hidden)]

rphmeier · 2018-03-19T03:14:41Z

substrate/runtime-support/src/storage/generator.rs

 	/// Load the bytes of a key from storage. Can panic if the type is incorrect.
-	fn load<T: codec::Slicable>(&self, key: &[u8]) -> Option<T>;
+	fn require<T: codec::Slicable>(&self, key: &[u8]) -> T { self.get(key).expect("Required values must be in storage") }


doc string should specify that it panics if it's not there

rphmeier · 2018-03-19T03:15:08Z

substrate/runtime-support/src/storage/generator.rs

 		self.kill(key);
 		value
 	}
+
+	/// Take a value from storage, deleting it after reading.
+	fn seize<T: codec::Slicable>(&self, key: &[u8]) -> T { self.take(key).expect("Required values must be in storage") }


take/seize is confusing. take_required?

rphmeier · 2018-03-19T03:17:49Z

substrate/runtime-support/src/storage/generator.rs

-	(($($vis:tt)*) $name: ident: $key: expr => $ty:ty) => {
+	(($($vis:tt)*) ($get_fn:ident) ($gettype:ty) ($getter:ident) ($taker:ident) $name:ident : $key:expr => $ty:ty) => {
+		__storage_items_internal!{ ($($vis)*) () ($gettype) ($getter) ($taker) $name : $key => $ty }
+		pub fn $get_fn() -> $gettype { <$name as $crate::storage::generator::StorageValue<$ty>> :: get(&$crate::storage::RuntimeStorage) }


tightly coupling the macro to RuntimeStorage (which is useless outside of runtime context) isn't helpful.

We have a $name::get() function anyway via the parent storage module.

yeah but it's crappy to have half of the getters use the idiomatic lower_case_function() and half using PascalCaseName::get(). you need to guess which is which.

if there's a better way of doing this, then happy to go with it, but i don't see it.

fine for now, although I dislike the coupling. maybe could have a separate macro for generating the getter

* bump substrate version * fix polkadot-collator

* Rebuild runtime * Remove invalid value from chainspec (paritytech#68) * service: use grandpa block import for locally sealed aura blocks (paritytech#85) * bump version to v0.3.1 * Update lock file. * limit number of transactions when building blocks (paritytech#91) * Update to latest Substrate * Bump to 0.3.2 * Actually bump. * v0.3.2 (paritytech#98) * bump substrate version * fix polkadot-collator * point to alexander-backports of substrate * bump version * cli: fix node shutdown (paritytech#100) * update to latest substrate, change to v0.3.4 * update to latest substrate, bump version to 0.3.5 * v0.3.6 * try to build on every v0.3 commit and update alexander-backports * bump to v0.3.7 * bump to 0.3.8 * Bump to 0.3.9: network and pruning improvements * Bump to 0.3.10: reduce network bandwidth usage * Use libp2p-kad 0.3.2 (paritytech#122) * Bump libp2p-identify to 0.3.1 (paritytech#123) * Bump to 0.3.12 (paritytech#127) * Update Substrate again (paritytech#128) * update substrate and bump version to v0.3.13 * bump version to v0.3.14: fix --reserved-nodes * add a manually curated grandpa module (paritytech#136) * updating v0.3 to use substrate v0.10 (paritytech#146) * updating to latest substrate v0.10 * better handling of outer poll * nit * fix tests * remove comment * reduce indentation * use self.poll * bring oneshot into scope * spaces * wrap * remove match * wrap * Update primitives/Cargo.toml Co-Authored-By: gterzian <2792687+gterzian@users.noreply.github.com> * Update runtime/wasm/Cargo.toml Co-Authored-By: gterzian <2792687+gterzian@users.noreply.github.com> * Update runtime/wasm/Cargo.toml Co-Authored-By: gterzian <2792687+gterzian@users.noreply.github.com> * Update test-parachains/adder/collator/src/main.rs Co-Authored-By: gterzian <2792687+gterzian@users.noreply.github.com> * indent * add paranthese * config: fix wrong ip for alexander bootnode (paritytech#161) * fix curated-grandpa and rebuild wasm (paritytech#162) * [v0.3] Integrates new gossip system into Polkadot (paritytech#166) * new gossip validation in network * integrate new gossip into service * network: guard validation network future under exit signal (paritytech#168) * bump version to v0.3.15: substrate v0.10 * [v0.3] update to substrate master (paritytech#175) * update to substrate master * fix test * service: fix telemetry endpoints on alexander chainspec (paritytech#169) (paritytech#178) * Update v0.3 to latest Substrate master (paritytech#177) * update substrate v0.3 to latest master * bump spec version * update to latest master: remove fees module * update runtime blobs * bump version to 0.3.16 * replace sr25519 accountid with anysigner * bump version to v0.3.17 * Some PoC-3 GRANDPA tweaks (paritytech#181) * call on_finalise after triggering curated_grandpa change * make grandpa rounds shorter for faster finalization * use authorities when calculating duty roster (paritytech#185) * [v0.3] Update to substrate master (paritytech#183) * update to latest substrate master * bump version to 0.3.18 * update to latest substrate master * bump spec version * update runtime wasm blobs * remove current_offline_slash from chain spec * update to substrate master: bump version to v0.3.19 (paritytech#188) * update to substrate master: bump version to v0.3.19 libp2p network improvements * network: replace NodeIndex with PeerId * network: fix tests * polkadot v0.3.20 (paritytech#190) * update to substrate master: bump version to 0.3.20 * runtime: add offchain worker trait * runtime: rebuild wasm blobs * bump spec version (paritytech#191) * Fix compilation * Update version to 0.4.0 * Switch to use `polkadot-master` branch from substrate * Remove unused struct * Remove `grandpa::SyncedAuthorities` from `OnSessionChange`

* withdrawal module init and rename some dir module * withdrawal module finish * withdrawal finish

…Info Remove WeightInfo in pallet-offences-subspace

* Add missing license headers and add CI check * Remove log line * Remove stale todos

gavofyork added 20 commits March 13, 2018 12:34

Completely rework dispatch mechanism into something modular.

a83059a

Not yet complete but 75% there.

Council vote tests.

82a178d

Fix tests.

1d28d9a

whitespace.

69c88c3

Fix demo runtime tests.

b12a708

Merge branch 'gav-demo' into gav-dispatch

e48e86d

Fix up tests.

8e3cc51

Merge branch 'gav-demo' into gav-dispatch

53e2fdf

Merge branch 'master' into gav-dispatch

27ecd6f

Remove dead code.

5eca74a

Merge branch 'master' into gav-dispatch

7cece3b

Timestamp uses new storage API.

8c2396d

Move over system module to new API.

6b6c240

Much nicer storage API, moved over staking module.

a79dab2

More refactoring.

1fd6b3e

Democracy uses new storage API.

51b4a8c

Council uses new RPC.

8ada9f7

Fix more tests.

c4f5f42

Use match for Id

d11f5ca

Use match for Id

faa0a44

gavofyork added the A0-please_review Pull request needs code review. label Mar 16, 2018

gavofyork mentioned this pull request Mar 16, 2018

A random beacon #96

Merged

gavofyork added 8 commits March 19, 2018 10:02

Make PrivPass better protected.

7912de1

Address other grumbles.

aac3899

Give PrivPass a private member.

26519c6

Testing PrivPass.

9f32ea7

Add docs.

8966951

Merge branch 'gav-dispatch' into gav-storage-revamp

91d5e75

Recompile binaries after merge.

7ee81e6

Merge branch 'master' into gav-storage-revamp

33215e4

gavofyork added 2 commits March 19, 2018 11:03

Remove duplicated code.

cf9659e

New binaries.

b8c0832

rphmeier reviewed Mar 19, 2018

View reviewed changes

gavofyork added 3 commits March 19, 2018 11:19

Docs

57a9a79

Docs

59c7a1a

avoid use of (arguably) confusing terminology.

6f8f456

rphmeier approved these changes Mar 19, 2018

View reviewed changes

rphmeier added A8-looksgood and removed A0-please_review Pull request needs code review. labels Mar 19, 2018

gavofyork merged commit 688720b into master Mar 19, 2018

gavofyork deleted the gav-storage-revamp branch March 19, 2018 05:38

tomaka pushed a commit to tomaka/polkadot that referenced this pull request Feb 6, 2019

v0.3.2 (paritytech#98)

b28ff9e

* bump substrate version * fix polkadot-collator

liuchengxu pushed a commit to chainx-org/substrate that referenced this pull request Aug 23, 2021

Feature/withdrawal (paritytech#98)

c808b6f

* withdrawal module init and rename some dir module * withdrawal module finish * withdrawal finish

liuchengxu added a commit to autonomys/substrate that referenced this pull request Jun 3, 2022

Merge pull request paritytech#98 from subspace/remove-offences-Weight…

f79b63d

…Info Remove WeightInfo in pallet-offences-subspace

helin6 pushed a commit to boolnetwork/substrate that referenced this pull request Jul 25, 2023

Add missing license headers and CI check (paritytech#98)

194c7bc

* Add missing license headers and add CI check * Remove log line * Remove stale todos

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor all (demo) runtime modules to use new storage #98

Refactor all (demo) runtime modules to use new storage #98

gavofyork commented Mar 16, 2018

rphmeier Mar 19, 2018

rphmeier Mar 19, 2018

gavofyork Mar 19, 2018

rphmeier Mar 19, 2018

rphmeier Mar 19, 2018

rphmeier Mar 19, 2018 •

edited

Loading

rphmeier Mar 19, 2018

gavofyork Mar 19, 2018

gavofyork Mar 19, 2018

rphmeier Mar 19, 2018 •

edited

Loading

Refactor all (demo) runtime modules to use new storage #98

Refactor all (demo) runtime modules to use new storage #98

Conversation

gavofyork commented Mar 16, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rphmeier Mar 19, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rphmeier Mar 19, 2018 • edited Loading

Choose a reason for hiding this comment

rphmeier Mar 19, 2018 •

edited

Loading

rphmeier Mar 19, 2018 •

edited

Loading