wip: fixup split

anoma · Nov 4, 2022 · 1d3af9c · 1d3af9c
1 parent 08a162e
commit 1d3af9c
Show file tree

Hide file tree

Showing 29 changed files with 867 additions and 844 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/src/lib/node/ledger/storage/rocksdb.rs b/apps/src/lib/node/ledger/storage/rocksdb.rs
@@ -37,8 +37,9 @@ use namada::ledger::storage::{
     types, BlockStateRead, BlockStateWrite, DBIter, DBWriteBatch, Error,
     MerkleTreeStoresRead, Result, StoreType, DB,
 };
+use namada::types::internal::TxQueue;
 use namada::types::storage::{
-    BlockHeight, Header, Key, KeySeg, TxQueue, KEY_SEGMENT_SEPARATOR,
+    BlockHeight, Header, Key, KeySeg, KEY_SEGMENT_SEPARATOR,
 };
 use namada::types::time::DateTimeUtc;
 use rocksdb::{

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -12,7 +12,9 @@ default = []
 testing = [
   "rand",
   "rand_core",
+  "proptest",
 ]
+tendermint = ["dep:tendermint", "tendermint-proto"]
 
 [dependencies]
 # We switch off "blake2b" because it cannot be compiled to wasm
@@ -26,12 +28,17 @@ derivative = "2.2.0"
 ed25519-consensus = "1.2.0"
 itertools = "0.10.0"
 libsecp256k1 = {git = "https://github.com/heliaxdev/libsecp256k1", rev = "bbb3bd44a49db361f21d9db80f9a087c194c0ae9", default-features = false, features = ["std", "static-context"]}
+proptest = {git = "https://github.com/heliaxdev/proptest", branch = "tomas/sm", optional = true}
+prost = "0.9.0"
+prost-types = "0.9.0"
 rand = {version = "0.8", optional = true}
 rand_core = {version = "0.6", optional = true}
 rust_decimal = "1.26.1"
 serde = {version = "1.0.125", features = ["derive"]}
 serde_json = "1.0.62"
 sha2 = "0.9.3"
+tendermint = {version = "0.23.6", optional = true}
+tendermint-proto = {version = "0.23.6", optional = true}
 thiserror = "1.0.30"
 tracing = "0.1.30"
 zeroize = {version = "1.5.5", features = ["zeroize_derive"]}

diff --git a/core/src/ledger/tx_env.rs b/core/src/ledger/tx_env.rs
@@ -5,12 +5,14 @@ use borsh::BorshSerialize;
 
 use crate::ledger::storage_api::{self, StorageRead, StorageWrite};
 use crate::types::address::Address;
-use crate::types::ibc::IbcEvent;
 use crate::types::storage;
 use crate::types::time::Rfc3339String;
 
 /// Transaction host functions
 pub trait TxEnv<'iter>: StorageRead<'iter> + StorageWrite {
+    /// IBC event type
+    type IbcEvent;
+
     /// Write a temporary value to be encoded with Borsh at the given key to
     /// storage.
     fn write_temp<T: BorshSerialize>(
@@ -55,7 +57,7 @@ pub trait TxEnv<'iter>: StorageRead<'iter> + StorageWrite {
     /// multiple calls, only the last emitted event will be used.
     fn emit_ibc_event(
         &mut self,
-        event: &IbcEvent,
+        event: &Self::IbcEvent,
     ) -> Result<(), storage_api::Error>;
 
     /// Get time of the current block header as rfc 3339 string