Minor cleanup

Author: ImplOfAnImpl

chainstate/src/interface/chainstate_interface_impl.rs

@@ -860,7 +860,7 @@ where
             .map_err(ChainstateError::from)
     }
 
-    #[tracing::instrument(skip_all, fields(ask_currency, give_currency))]
+    #[tracing::instrument(skip(self))]
     fn get_orders_info_for_rpc_by_currencies(
         &self,
         ask_currency: Option<&Currency>,

chainstate/test-suite/src/tests/orders_tests.rs

@@ -15,14 +15,13 @@
 
 use std::{borrow::Cow, collections::BTreeMap};
 
-use chainstate_storage::Transactional as _;
-use orders_accounting::OrdersAccountingStorageRead as _;
 use rstest::rstest;
 
 use chainstate::{
     BlockError, ChainstateError, CheckBlockError, CheckBlockTransactionsError,
     ConnectTransactionError,
 };
+use chainstate_storage::Transactional as _;
 use chainstate_test_framework::{
     helpers::{
         calculate_fill_order, issue_and_mint_random_token_from_best_block,
@@ -49,6 +48,7 @@ use common::{
 };
 use crypto::key::{KeyKind, PrivateKey};
 use logging::log;
+use orders_accounting::OrdersAccountingStorageRead as _;
 use randomness::{CryptoRng, Rng, SliceRandom};
 use test_utils::random::{gen_random_bytes, make_seedable_rng, Seed};
 use tx_verifier::{

common/src/chain/currency.rs

@@ -27,7 +27,7 @@ use crate::{
 // The reason for having RPC types in the first place is that in RPC we'd like for certain things to have a more
 // human-readable representation, namely:
 // 1) Destinations, VRF public keys and ids of pools/delegations/tokens/orders should be bech32-encoded instead
-// of hex-encoded or "hexified" via `HexifiedAddress`. For this purpose we have the `RpcAddress` wrapper
+// of being hex-encoded or "hexified" via `HexifiedAddress`. For this purpose we have the `RpcAddress` wrapper
 // (which holds a bech-32 encoded string), so e.g. `RpcAddress<PoolId>` should be used instead of the plain
 // PoolId in RPC types.
 // 2) Amounts are more readable when they are in the decimal form instead of the plain number of atoms. But we also
@@ -49,7 +49,7 @@ use crate::{
 // `RpcTokenTotalSupplyIn` and moved out of the wallet).
 //
 // What should we do:
-// 1) The "RPC" prefix should be replace with "Rpc" to honor Rust's naming conventions.
+// 1) The "RPC" prefix should be replaced with "Rpc" to honor Rust's naming conventions.
 // 2) `RpcOutputValue` should be renamed to `OutputValueV1` and it should *not* implement `HasValueHint`.
 // Also, all functions that take `RpcOutputValue` and are named as such (e.g. `from_rpc_output_value` below)
 // should be renamed as well.
@@ -60,7 +60,7 @@ use crate::{
 // "Rpc...In" or "...Out" type. Which in turn means that RPC types that contain an amount or an output value must
 // themselves be designated as "In" or "Out" and have the corresponding suffix.
 // 5) We also need to reconsider where the RPC types live. Currently many of them live in `common`, even though they're
-// only used in the chainstate rpc, but lots of others live in `chainstate`, see the contents of the `chainstate/src/rpc/types/`
+// only used in the chainstate RPC, but lots of others live in `chainstate`, see the contents of the `chainstate/src/rpc/types/`
 // folder. One approach would be to put an RPC type into the same crate as its non-RPC counterpart. Another approach
 // is to put them all to chainstate (note that blockprod and mempool depend on chainstate, so we'll be able to use
 // chainstate types in their RPC interfaces if needed).

common/src/chain/tokens/rpc.rs

@@ -151,7 +151,6 @@ impl RPCFungibleTokenInfo {
 
 #[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize, HasValueHint)]
 pub struct RPCNonFungibleTokenInfo {
-    // TODO: same as in RPCFungibleTokenInfo, use RpcAddress<TokenId> here.
     pub token_id: TokenId,
     pub creation_tx_id: Id<Transaction>,
     pub creation_block_id: Id<Block>,

common/src/chain/transaction/output/output_values_holder.rs

@@ -71,12 +71,6 @@ pub fn collect_token_v1_ids_from_rpc_output_values_holder_into(
     }
 }
 
-pub fn collect_token_v1_ids_from_rpc_output_values_holder(
-    holder: &impl RpcOutputValuesHolder,
-) -> BTreeSet<TokenId> {
-    collect_token_v1_ids_from_rpc_output_values_holders(std::iter::once(holder))
-}
-
 pub fn collect_token_v1_ids_from_rpc_output_values_holders<'a, H: RpcOutputValuesHolder + 'a>(
     holders: impl IntoIterator<Item = &'a H>,
 ) -> BTreeSet<TokenId> {

common/src/lib.rs

@@ -31,8 +31,9 @@ pub use uint::{Uint128, Uint256, Uint512, UintConversionError};
 mod tests {
     use std::str::FromStr as _;
 
-    use crypto::vrf::VRFPublicKey;
     use hex::FromHex;
+
+    use crypto::vrf::VRFPublicKey;
     use rpc_description::HasValueHint;
     use serialization::DecodeAll as _;
 

test/functional/wallet_order_list_all_active.py

@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-"""Wallet all actrive orders listing test, both RPC and CLI
+"""Test listing all actrive orders, both RPC and CLI
 """
 
 from test_framework.util import assert_in, assert_equal

test/functional/wallet_order_list_own_cli.py

@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-"""Wallet own orders listing test, CLI
+"""Test listing own orders via CLI
 """
 
 from test_framework.util import assert_in, assert_equal

test/functional/wallet_order_list_own_rpc.py

@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-"""Wallet own orders listing test, RPC
+"""Test listing own orders via RPC
 """
 
 from test_framework.util import assert_in, assert_equal

utxo/src/cache.rs

@@ -521,15 +521,18 @@ fn should_include_in_utxo_set(output: &TxOutput) -> bool {
 
 #[cfg(test)]
 mod unit_test {
-    use super::*;
-    use crate::tests::test_helper::{empty_test_utxos_view, insert_single_entry, Presence};
-    use common::primitives::H256;
     use rstest::rstest;
+
+    use common::primitives::H256;
     use test_utils::{
         random::{make_seedable_rng, Seed},
         UnwrapInfallible as _,
     };
 
+    use super::*;
+
+    use crate::tests::test_helper::{empty_test_utxos_view, insert_single_entry, Presence};
+
     #[rstest]
     #[trace]
     #[case(Seed::from_entropy())]