rpc: take over tendermint::abci

The existing contents of the `tendermint::abci` module note that they're
only for the purpose of implementing the RPC endpoints, not a general
ABCI implementation.

Moving that code from the `tendermint` crate to the `tendermint-rpc`
crate decouples the RPC interface from improvements to the ABCI domain
modeling. Eventually, it would be good to eliminate this code and align
it with the new ABCI domain types.

Author: hdevalence

light-client/src/evidence.rs

@@ -2,7 +2,7 @@
 
 use crate::{components::io::IoError, types::PeerId};
 
-use tendermint::abci::transaction::Hash;
+use tendermint_rpc::abci::transaction::Hash;
 
 use contracts::contract_trait;
 

light-client/src/tests.rs

@@ -3,8 +3,8 @@
 use crate::types::{Height, LightBlock, PeerId, SignedHeader, Time, TrustThreshold, ValidatorSet};
 
 use serde::{Deserialize, Serialize};
-use tendermint::abci::transaction::Hash;
 use tendermint_rpc as rpc;
+use tendermint_rpc::abci::transaction::Hash;
 
 use crate::components::clock::Clock;
 use crate::components::io::{AtHeight, Io, IoError};

rpc/Cargo.toml

@@ -78,6 +78,7 @@ subtle-encoding = { version = "0.5", default-features = false, features = ["bech
 url = { version = "2.2", default-features = false }
 walkdir = { version = "2.3", default-features = false }
 flex-error = { version = "0.4.4", default-features = false }
+subtle = { version = "2", default-features = false }
 
 # Optional dependencies
 async-trait = { version = "0.1", optional = true, default-features = false }

rpc/src/abci.rs

@@ -0,0 +1,34 @@
+//! Old ABCI structures, formerly defined in `tendermint::abci`.
+//!
+//! The original contents of `tendermint::abci` were created only to model RPC
+//! responses, not to model ABCI itself:
+//!
+//! > NOTE: This module contains types for ABCI responses as consumed from RPC
+//! endpoints. It does not contain an ABCI protocol implementation.
+//!
+//! The old types should be eliminated and
+//! merged with the new ABCI domain types.  Moving them here in the meantime
+//! disentangles improving the ABCI domain modeling from changes to the RPC
+//! interface.
+
+mod code;
+mod data;
+mod gas;
+mod info;
+mod log;
+mod path;
+
+pub mod responses;
+pub mod tag;
+pub mod transaction;
+
+pub use self::{
+    code::Code,
+    data::Data,
+    gas::Gas,
+    info::Info,
+    log::Log,
+    path::Path,
+    responses::{DeliverTx, Event, Responses},
+    transaction::Transaction,
+};

tendermint/src/abci/code.rs renamed to rpc/src/abci/code.rs

@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 /// application-specific rules.
 #[derive(Clone, Debug, Eq, PartialEq, Default, Serialize, Deserialize)]
 #[serde(transparent)]
-pub struct Data(#[serde(with = "crate::serializers::bytes::base64string")] Vec<u8>);
+pub struct Data(#[serde(with = "tendermint::serializers::bytes::base64string")] Vec<u8>);
 
 impl From<Vec<u8>> for Data {
     fn from(value: Vec<u8>) -> Self {

tendermint/src/abci/data.rs renamed to rpc/src/abci/data.rs

@@ -5,13 +5,13 @@
 //!
 //! <https://tendermint.com/docs/spec/abci/apps.html#gas>
 
-use crate::error::Error;
 use crate::prelude::*;
 use core::{
     fmt::{self, Display},
     str::FromStr,
 };
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
+use tendermint::error::Error;
 
 /// Gas: representation of transaction processing resource costs
 #[derive(Copy, Clone, Debug, Default, Eq, PartialEq, PartialOrd, Ord)]

tendermint/src/abci/gas.rs renamed to rpc/src/abci/gas.rs

@@ -1,12 +1,12 @@
 //! Paths to ABCI data
 
-use crate::error::Error;
 use crate::prelude::*;
 use core::{
     fmt::{self, Display},
     str::FromStr,
 };
 use serde::{Deserialize, Serialize};
+use tendermint::error::Error;
 
 /// Path to ABCI data
 #[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]