Merge branch 'master' into staking

src/frame/balances.rs

@@ -133,7 +133,7 @@ mod tests {
     use sp_keyring::AccountKeyring;
 
     #[async_std::test]
-    async fn test_transfer() {
+    async fn test_basic_transfer() {
         env_logger::try_init().ok();
         let alice = PairSigner::<TestRuntime, _>::new(AccountKeyring::Alice.pair());
         let bob = PairSigner::<TestRuntime, _>::new(AccountKeyring::Bob.pair());

src/frame/mod.rs

@@ -44,6 +44,8 @@ pub trait Store<T>: Encode {
     const FIELD: &'static str;
     /// Return type.
     type Returns: Decode;
+    /// Returns the key prefix for storage maps
+    fn prefix(metadata: &Metadata) -> Result<StorageKey, MetadataError>;
     /// Returns the `StorageKey`.
     fn key(&self, metadata: &Metadata) -> Result<StorageKey, MetadataError>;
     /// Returns the default value.