Removed amino folder

CHANGELOG.md

@@ -5,9 +5,6 @@
 - Add spec for the light client attack evidence handling ([#526])
 - Return RFC6962 hash for empty merkle tree ([#498])
 - The `tendermint`, `tendermint-rpc`, and `tendermint-light-client` crates now compile to WASM on the `wasm32-unknown-unknown` and `wasm32-wasi` targets ([#463])
-- Implement protobuf encoding/decoding of Tendermint Proto types ([#504])
-- Separate protobuf types from Rust domain types using the DomainType trait ([#535])
-- Changed validator sorting order to sort by voting power (descending) and address (ascending). ([#506])
 - Dependency update: sled 0.34 ([#490])
 
 ### BREAKING CHANGES:
@@ -18,6 +15,11 @@
   subscription. To access this struct, you now need to enable both the
   `client` and `transport_http` features when using the `tendermint-rpc`
   crate. ([#516])
+- `[tendermint]` Removed Amino types. All types are now `DomainType`s
+  implementing Protobuf-encoding using Prost. ([#504], [#535], [#536],
+  [#585])
+- `[tendermint]` Changed validator sorting order to sort by voting power
+  (descending) and address (ascending). ([#506])
 
 ### IMPROVEMENTS:
 
@@ -46,6 +48,8 @@
 [#535]: https://github.com/informalsystems/tendermint-rs/issues/535
 [#506]: https://github.com/informalsystems/tendermint-rs/issues/506
 [#516]: https://github.com/informalsystems/tendermint-rs/pull/516
+[#536]: https://github.com/informalsystems/tendermint-rs/issues/536
+[#585]: https://github.com/informalsystems/tendermint-rs/issues/585
 
 ## v0.16.0
 

light-client/Cargo.toml

@@ -35,7 +35,6 @@ contracts = "0.4.0"
 crossbeam-channel = "0.4.2"
 derive_more = "0.99.5"
 futures = "0.3.4"
-prost-amino = "0.6.0"
 serde = "1.0.106"
 serde_cbor = "0.11.1"
 serde_derive = "1.0.106"

light-client/src/components/io.rs

@@ -114,7 +114,8 @@ mod prod {
         /// A peer map which maps peer IDS to their network address must be supplied.
         pub fn new(
             peer_id: PeerId,
-            rpc_client: rpc::HttpClient, // TODO(thane): Generalize over client transport (instead of using HttpClient directly)
+            rpc_client: rpc::HttpClient, /* TODO(thane): Generalize over client transport
+                                          * (instead of using HttpClient directly) */
             timeout: Option<Duration>,
         ) -> Self {
             Self {

light-client/src/components/scheduler.rs

@@ -4,6 +4,7 @@ use contracts::*;
 
 use crate::store::LightStore;
 use crate::types::Height;
+use std::convert::TryInto;
 
 /// The scheduler decides what block to verify next given the current and target heights.
 ///
@@ -122,5 +123,7 @@ pub fn valid_schedule(
 #[pre(low <= high)]
 #[post(low <= ret && ret <= high)]
 fn midpoint(low: Height, high: Height) -> Height {
-    (low.value() + (high.value() + 1 - low.value()) / 2).into()
+    (low.value() + (high.value() + 1 - low.value()) / 2)
+        .try_into()
+        .unwrap() // Will panic if midpoint is higher than i64::MAX
 }

light-client/src/operations/voting_power.rs

@@ -10,9 +10,10 @@ use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
 use std::fmt;
 
+use std::convert::{TryFrom, TryInto};
 use tendermint::block::CommitSig;
 use tendermint::trust_threshold::TrustThreshold as _;
-use tendermint::vote::{SignedVote, Vote};
+use tendermint::vote::{SignedVote, ValidatorIndex, Vote};
 
 /// Tally for the voting power computed by the `VotingPowerCalculator`
 #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -115,7 +116,11 @@ impl VotingPowerCalculator for ProdVotingPowerCalculator {
 
         // Get non-absent votes from the signatures
         let non_absent_votes = signatures.iter().enumerate().flat_map(|(idx, signature)| {
-            if let Some(vote) = non_absent_vote(signature, idx as u16, &signed_header.commit) {
+            if let Some(vote) = non_absent_vote(
+                signature,
+                ValidatorIndex::try_from(idx).unwrap(),
+                &signed_header.commit,
+            ) {
                 Some((signature, vote))
             } else {
                 None
@@ -138,8 +143,8 @@ impl VotingPowerCalculator for ProdVotingPowerCalculator {
             };
 
             let signed_vote = SignedVote::new(
-                (&vote).into(),
-                signed_header.header.chain_id.as_str(),
+                vote.clone(),
+                signed_header.header.chain_id.clone(),
                 vote.validator_address,
                 vote.signature,
             );
@@ -179,7 +184,11 @@ impl VotingPowerCalculator for ProdVotingPowerCalculator {
     }
 }
 
-fn non_absent_vote(commit_sig: &CommitSig, validator_index: u16, commit: &Commit) -> Option<Vote> {
+fn non_absent_vote(
+    commit_sig: &CommitSig,
+    validator_index: ValidatorIndex,
+    commit: &Commit,
+) -> Option<Vote> {
     let (validator_address, timestamp, signature, block_id) = match commit_sig {
         CommitSig::BlockIDFlagAbsent { .. } => return None,
         CommitSig::BlockIDFlagCommit {
@@ -190,7 +199,7 @@ fn non_absent_vote(commit_sig: &CommitSig, validator_index: u16, commit: &Commit
             *validator_address,
             *timestamp,
             signature,
-            Some(commit.block_id.clone()),
+            Some(commit.block_id),
         ),
         CommitSig::BlockIDFlagNil {
             validator_address,
@@ -202,9 +211,9 @@ fn non_absent_vote(commit_sig: &CommitSig, validator_index: u16, commit: &Commit
     Some(Vote {
         vote_type: tendermint::vote::Type::Precommit,
         height: commit.height,
-        round: commit.round,
+        round: commit.round.try_into().unwrap(),
         block_id,
-        timestamp,
+        timestamp: Some(timestamp),
         validator_address,
         validator_index,
         signature: *signature,

light-client/tests/integration.rs

@@ -97,7 +97,7 @@ fn sync() {
     let handle = supervisor.handle();
     std::thread::spawn(|| supervisor.run());
 
-    let max_iterations: usize = 1; // FIXME: Fix no witness left error in subsequent iterations
+    let max_iterations: usize = 10;
 
     for i in 1..=max_iterations {
         println!("[info ] - iteration {}/{}", i, max_iterations);

light-client/tests/light_client.rs

@@ -15,6 +15,7 @@ use tendermint_light_client::{
     types::{LightBlock, Status, TrustThreshold},
 };
 
+use std::convert::TryInto;
 use tendermint_testgen::Tester;
 
 // Link to JSON test files repo:
@@ -169,7 +170,7 @@ fn bisection_lower_test(tc: TestBisection<AnonLightBlock>) {
         trusted_height = trusted_height.increment();
     }
 
-    tc.height_to_verify = (trusted_height.value() - 1).into();
+    tc.height_to_verify = (trusted_height.value() - 1).try_into().unwrap();
 
     let test_result = run_bisection_test(tc);
     match test_result.new_states {