Rename con:aut to be in line with :code.

This commit is contained in:
Gav
2018-02-04 16:01:14 +01:00
parent 337027b179
commit b125f72774
6 changed files with 14 additions and 14 deletions
@@ -23,7 +23,7 @@ use primitives::SessionKey;
struct AuthorityStorageVec {}
impl StorageVec for AuthorityStorageVec {
type Item = SessionKey;
const PREFIX: &'static[u8] = b"con:aut:";
const PREFIX: &'static[u8] = b":auth:";
}
/// Get the current set of authorities. These are the session keys.
@@ -66,18 +66,18 @@ impl GenesisConfig {
.map(|(i, account)| ((i as u32).to_keyed_vec(b"ses:val:"), vec![].join(account)))
).chain(self.authorities.iter()
.enumerate()
.map(|(i, account)| ((i as u32).to_keyed_vec(b"con:aut:"), vec![].join(account)))
.map(|(i, account)| ((i as u32).to_keyed_vec(b":auth:"), vec![].join(account)))
).chain(self.balances.iter()
.map(|&(account, balance)| (account.to_keyed_vec(b"sta:bal:"), vec![].join(&balance)))
)
.map(|(k, v)| (twox_128(&k[..])[..].to_vec(), v.to_vec()))
.chain(vec![
(b":code"[..].into(), wasm_runtime),
(b"con:aut:len"[..].into(), vec![].join(&(self.authorities.len() as u32))),
(b":auth:len"[..].into(), vec![].join(&(self.authorities.len() as u32))),
].into_iter())
.chain(self.authorities.iter()
.enumerate()
.map(|(i, account)| ((i as u32).to_keyed_vec(b"con:aut:"), vec![].join(account)))
.map(|(i, account)| ((i as u32).to_keyed_vec(b":auth:"), vec![].join(account)))
)
.collect()
}
@@ -151,9 +151,9 @@ mod tests {
twox_128(&0u32.to_keyed_vec(ValidatorStorageVec::PREFIX)).to_vec() => vec![10; 32],
twox_128(&1u32.to_keyed_vec(ValidatorStorageVec::PREFIX)).to_vec() => vec![20; 32],
// initial session keys (11, 21, ...)
b"con:aut:len".to_vec() => vec![].join(&2u32),
0u32.to_keyed_vec(b"con:aut:") => vec![11; 32],
1u32.to_keyed_vec(b"con:aut:") => vec![21; 32]
b":auth:len".to_vec() => vec![].join(&2u32),
0u32.to_keyed_vec(b":auth:") => vec![11; 32],
1u32.to_keyed_vec(b":auth:") => vec![21; 32]
], }
}