minor fallout

client/db/src/lib.rs

@@ -544,8 +544,12 @@ pub struct BlockImportOperation<Block: BlockT> {
 
 impl<Block: BlockT> BlockImportOperation<Block> {
 	fn apply_offchain(&mut self, transaction: &mut Transaction<DbHash>) {
-		for (prefix, key, value_operation) in self.offchain_storage_updates.drain() {
-			let key: Vec<u8> = prefix.chain(b"/".into_iter()).chain(key).collect();
+		for ((prefix, key), value_operation) in self.offchain_storage_updates.drain() {
+			let key: Vec<u8> = prefix
+				.into_iter()
+				.chain(b"/".into_iter().copied())
+				.chain(key.into_iter())
+				.collect();
 			match value_operation {
 				OffchainOverlayedChange::SetValue(val) => transaction.set_from_vec(columns::OFFCHAIN, &key, val),
 				OffchainOverlayedChange::Remove => transaction.remove(columns::OFFCHAIN, &key),

primitives/core/src/offchain/storage.rs

@@ -285,8 +285,11 @@ mod test {
 		ooc.set(STORAGE_PREFIX, b"ppp", b"rrr");
 		let mut iter = ooc.into_iter();
 		assert_eq!(
-			iter.next(), Some((STORAGE_PREFIX.to_vec(), b"ppp".to_vec()),
-			OffchainOverlayedChange::SetValue(b"rrr".to_vec()))
+			iter.next(),
+			Some(
+				((STORAGE_PREFIX.to_vec(), b"ppp".to_vec()),
+				OffchainOverlayedChange::SetValue(b"rrr".to_vec()))
+			)
 		);
 		assert_eq!(iter.next(), None);
 	}