Fix up for namada v0.10.1

anoma · Nov 28, 2022 · 04b313a · 04b313a
1 parent 09d316e
commit 04b313a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -42,7 +42,12 @@ check:
 	$(foreach wasm,$(wasm_templates),$(check-wasm) && ) true
 
 check-abcipp:
-	$(cargo) check --all-targets --no-default-features --features "abcipp namada/ibc-mocks-abcipp"
+	$(cargo) check \
+		--workspace \
+		--exclude namada_tests \
+		--all-targets \
+		--no-default-features \
+		--features "abcipp ibc-mocks-abcipp testing"
 
 clippy-wasm = $(cargo) +$(nightly) clippy --manifest-path $(wasm)/Cargo.toml --all-targets -- -D warnings
 
@@ -63,7 +68,7 @@ clippy-abcipp:
 	$(cargo) +$(nightly) clippy --all-targets \
 		--manifest-path ./shared/Cargo.toml \
 		--no-default-features \
-		--features "testing wasm-runtime abcipp ibc-mocks-abcipp" && \
+		--features "testing wasm-runtime abcipp ibc-mocks-abcipp ferveo-tpke" && \
 	$(cargo) +$(nightly) clippy \
 		--all-targets \
 		--manifest-path ./vm_env/Cargo.toml \

diff --git a/apps/src/lib/client/types.rs b/apps/src/lib/client/types.rs
@@ -8,11 +8,11 @@ use namada::types::masp::{TransferSource, TransferTarget};
 use namada::types::storage::Epoch;
 use namada::types::transaction::GasLimit;
 use namada::types::{key, token};
-use tendermint_config::net::Address as TendermintAddress;
 
 use super::rpc;
 use crate::cli::{args, Context};
 use crate::client::tx::Conversions;
+use crate::facade::tendermint_config::net::Address as TendermintAddress;
 
 #[derive(Clone, Debug)]
 pub struct ParsedTxArgs {

diff --git a/shared/src/ledger/queries/shell.rs b/shared/src/ledger/queries/shell.rs
@@ -2,13 +2,12 @@ use borsh::{BorshDeserialize, BorshSerialize};
 use masp_primitives::asset_type::AssetType;
 use masp_primitives::merkle_tree::MerklePath;
 use masp_primitives::sapling::Node;
-use tendermint::merkle::proof::Proof;
-use tendermint_proto::crypto::{ProofOp, ProofOps};
 
 use crate::ledger::queries::types::{RequestCtx, RequestQuery};
 use crate::ledger::queries::{require_latest_height, EncodedResponseQuery};
 use crate::ledger::storage::{DBIter, StorageHasher, DB};
 use crate::ledger::storage_api::{self, ResultExt, StorageRead};
+use crate::tendermint::merkle::proof::Proof;
 use crate::types::address::Address;
 #[cfg(all(feature = "wasm-runtime", feature = "ferveo-tpke"))]
 use crate::types::storage::TxIndex;

diff --git a/shared/src/ledger/queries/types.rs b/shared/src/ledger/queries/types.rs
@@ -1,8 +1,6 @@
-use tendermint::merkle::proof::Proof;
-
 use crate::ledger::storage::{DBIter, Storage, StorageHasher, DB};
 use crate::ledger::storage_api;
-use crate::tendermint_proto::crypto::ProofOps;
+use crate::tendermint::merkle::proof::Proof;
 use crate::types::storage::BlockHeight;
 #[cfg(feature = "wasm-runtime")]
 use crate::vm::wasm::{TxCache, VpCache};

diff --git a/shared/src/proto/types.rs b/shared/src/proto/types.rs
@@ -4,25 +4,14 @@ use std::hash::{Hash, Hasher};
 use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
 use prost::Message;
 use serde::{Deserialize, Serialize};
-#[cfg(not(feature = "ABCI"))]
-#[cfg(feature = "ferveo-tpke")]
-use tendermint_proto::abci::Event;
-#[cfg(not(feature = "ABCI"))]
-#[cfg(feature = "ferveo-tpke")]
-use tendermint_proto::abci::EventAttribute;
-#[cfg(not(feature = "ABCI"))]
-use tendermint_proto::abci::ResponseDeliverTx;
-#[cfg(feature = "ABCI")]
-#[cfg(feature = "ferveo-tpke")]
-use tendermint_proto_abci::abci::Event;
-#[cfg(feature = "ABCI")]
-#[cfg(feature = "ferveo-tpke")]
-use tendermint_proto_abci::abci::EventAttribute;
-#[cfg(feature = "ABCI")]
-use tendermint_proto_abci::abci::ResponseDeliverTx;
 use thiserror::Error;
 
 use super::generated::types;
+#[cfg(feature = "ferveo-tpke")]
+use crate::tendermint_proto::abci::Event;
+#[cfg(feature = "ferveo-tpke")]
+use crate::tendermint_proto::abci::EventAttribute;
+use crate::tendermint_proto::abci::ResponseDeliverTx;
 use crate::types::key::*;
 use crate::types::time::DateTimeUtc;
 #[cfg(feature = "ferveo-tpke")]