Update kvdb-* and trie (#4483)

substrate/client/db/src/cache/list_storage.rs

@@ -84,13 +84,13 @@ pub trait StorageTransaction<Block: BlockT, T: CacheItemT> {
 #[derive(Debug)]
 pub struct DbColumns {
 	/// Column holding cache meta.
-	pub meta: Option<u32>,
+	pub meta: u32,
 	/// Column holding the mapping of { block number => block hash } for blocks of the best chain.
-	pub key_lookup: Option<u32>,
+	pub key_lookup: u32,
 	/// Column holding the mapping of { block hash => block header }.
-	pub header: Option<u32>,
+	pub header: u32,
 	/// Column holding cache entries.
-	pub cache: Option<u32>,
+	pub cache: u32,
 }
 
 /// Database-backed list cache storage.

substrate/client/db/src/cache/mod.rs

@@ -77,9 +77,9 @@ impl<T> CacheItemT for T where T: Clone + Decode + Encode + PartialEq {}
 pub struct DbCache<Block: BlockT> {
 	cache_at: HashMap<CacheKeyId, ListCache<Block, Vec<u8>, self::list_storage::DbStorage>>,
 	db: Arc<dyn KeyValueDB>,
-	key_lookup_column: Option<u32>,
-	header_column: Option<u32>,
-	authorities_column: Option<u32>,
+	key_lookup_column: u32,
+	header_column: u32,
+	authorities_column: u32,
 	genesis_hash: Block::Hash,
 	best_finalized_block: ComplexBlockId<Block>,
 }
@@ -88,9 +88,9 @@ impl<Block: BlockT> DbCache<Block> {
 	/// Create new cache.
 	pub fn new(
 		db: Arc<dyn KeyValueDB>,
-		key_lookup_column: Option<u32>,
-		header_column: Option<u32>,
-		authorities_column: Option<u32>,
+		key_lookup_column: u32,
+		header_column: u32,
+		authorities_column: u32,
 		genesis_hash: Block::Hash,
 		best_finalized_block: ComplexBlockId<Block>,
 	) -> Self {
@@ -150,9 +150,9 @@ fn get_cache_helper<'a, Block: BlockT>(
 	cache_at: &'a mut HashMap<CacheKeyId, ListCache<Block, Vec<u8>, self::list_storage::DbStorage>>,
 	name: CacheKeyId,
 	db: &Arc<dyn KeyValueDB>,
-	key_lookup: Option<u32>,
-	header: Option<u32>,
-	cache: Option<u32>,
+	key_lookup: u32,
+	header: u32,
+	cache: u32,
 	best_finalized_block: &ComplexBlockId<Block>,
 ) -> &'a mut ListCache<Block, Vec<u8>, self::list_storage::DbStorage> {
 	cache_at.entry(name).or_insert_with(|| {