Remove StorageIterator and MockIterator

Author: webmaster128

packages/vm/src/lib.rs

@@ -33,6 +33,3 @@ pub use crate::instance::{GasReport, Instance};
 pub use crate::modules::FileSystemCache;
 pub use crate::serde::{from_slice, to_vec};
 pub use crate::traits::{Api, Extern, Querier, Storage};
-
-#[cfg(feature = "iterator")]
-pub use crate::traits::StorageIterator;

packages/vm/src/testing/mod.rs

@@ -16,6 +16,4 @@ pub use mock::{
     MOCK_CONTRACT_ADDR,
 };
 pub use querier::MockQuerier;
-#[cfg(feature = "iterator")]
-pub use storage::MockIterator;
 pub use storage::MockStorage;

packages/vm/src/testing/storage.rs

@@ -9,8 +9,6 @@ use std::ops::{Bound, RangeBounds};
 #[cfg(feature = "iterator")]
 use cosmwasm_std::{Order, KV};
 
-#[cfg(feature = "iterator")]
-use crate::traits::StorageIterator;
 #[cfg(feature = "iterator")]
 use crate::FfiError;
 use crate::{FfiResult, GasInfo, Storage};
@@ -21,35 +19,6 @@ const GAS_COST_LAST_ITERATION: u64 = 37;
 #[cfg(feature = "iterator")]
 const GAS_COST_RANGE: u64 = 11;
 
-/// A storage iterator for testing only. This type uses a Rust iterator
-/// as a data source, which does not provide a gas value for the last iteration.
-#[cfg(feature = "iterator")]
-pub struct MockIterator<'a> {
-    source: Box<dyn Iterator<Item = (KV, u64)> + 'a>,
-}
-
-#[cfg(feature = "iterator")]
-impl MockIterator<'_> {
-    pub fn empty() -> Self {
-        MockIterator {
-            source: Box::new(std::iter::empty()),
-        }
-    }
-}
-
-#[cfg(feature = "iterator")]
-impl StorageIterator for MockIterator<'_> {
-    fn next(&mut self) -> FfiResult<Option<KV>> {
-        match self.source.next() {
-            Some((kv, gas_used)) => (Ok(Some(kv)), GasInfo::with_externally_used(gas_used)),
-            None => (
-                Ok(None),
-                GasInfo::with_externally_used(GAS_COST_LAST_ITERATION),
-            ),
-        }
-    }
-}
-
 #[cfg(feature = "iterator")]
 #[derive(Default, Debug)]
 struct Iter {

packages/vm/src/traits.rs

@@ -2,8 +2,6 @@ use cosmwasm_std::{Binary, CanonicalAddr, ContractResult, HumanAddr, SystemResul
 #[cfg(feature = "iterator")]
 use cosmwasm_std::{Order, KV};
 
-#[cfg(feature = "iterator")]
-use crate::ffi::FfiError;
 use crate::ffi::FfiResult;
 
 /// Holds all external dependencies of the contract.
@@ -29,35 +27,6 @@ impl<S: Storage, A: Api, Q: Querier> Extern<S, A, Q> {
     }
 }
 
-#[cfg(feature = "iterator")]
-pub trait StorageIterator {
-    fn next(&mut self) -> FfiResult<Option<KV>>;
-
-    /// Collects all elements, ignoring gas costs
-    fn elements(mut self) -> Result<Vec<KV>, FfiError>
-    where
-        Self: Sized,
-    {
-        let mut out: Vec<KV> = Vec::new();
-        loop {
-            let (result, _gas_info) = self.next();
-            match result {
-                Ok(Some(kv)) => out.push(kv),
-                Ok(None) => break,
-                Err(err) => return Err(err),
-            }
-        }
-        Ok(out)
-    }
-}
-
-#[cfg(feature = "iterator")]
-impl<I: StorageIterator + ?Sized> StorageIterator for Box<I> {
-    fn next(&mut self) -> FfiResult<Option<KV>> {
-        (**self).next()
-    }
-}
-
 /// Access to the VM's backend storage, i.e. the chain
 pub trait Storage {
     /// Returns Err on error.