From b955d745ab2cbf8c8edf2fe67b15df0a205cca8e Mon Sep 17 00:00:00 2001 From: Benjamin DENEUX Date: Thu, 9 Feb 2023 11:16:32 +0100 Subject: [PATCH] fix(lint): format all rust code --- contracts/cw-logic-sample/src/contract.rs | 15 ++++++--- contracts/cw-logic-sample/src/lib.rs | 16 ++++----- contracts/cw-template/src/contract.rs | 6 +++- contracts/cw-template/src/lib.rs | 16 ++++----- packages/logic-bindings/src/lib.rs | 16 ++++----- packages/logic-bindings/src/testing/mock.rs | 37 +++++++++++---------- 6 files changed, 59 insertions(+), 47 deletions(-) diff --git a/contracts/cw-logic-sample/src/contract.rs b/contracts/cw-logic-sample/src/contract.rs index 21693dc3..8cf4da49 100644 --- a/contracts/cw-logic-sample/src/contract.rs +++ b/contracts/cw-logic-sample/src/contract.rs @@ -57,13 +57,13 @@ pub mod query { mod tests { use super::*; use cosmwasm_std::testing::{mock_env, mock_info}; - use cosmwasm_std::{Coin, coins, from_binary}; + use cosmwasm_std::{coins, from_binary, Coin}; use logic_bindings::testing::mock::mock_dependencies_with_logic_and_balance; - #[test] fn proper_initialization() { - let mut deps = mock_dependencies_with_logic_and_balance(&[Coin::new(10000, "uknow".to_string())]); + let mut deps = + mock_dependencies_with_logic_and_balance(&[Coin::new(10000, "uknow".to_string())]); let msg = InstantiateMsg { program: "bank_balances_has_coin(A, D, V, S) :- bank_balances(A, R), member(D-V, R), compare(>, V, S).".to_string(), @@ -75,7 +75,14 @@ mod tests { assert_eq!(0, res.messages.len()); // it worked, let's check if logic querier is called to answer to the `Ask` query. - let res = query(deps.as_ref(), mock_env(), QueryMsg::Ask { query: "".to_string() }).unwrap(); + let res = query( + deps.as_ref(), + mock_env(), + QueryMsg::Ask { + query: "".to_string(), + }, + ) + .unwrap(); let value: AskResponse = from_binary(&res).unwrap(); assert_eq!(true, value.answer.unwrap().success); } diff --git a/contracts/cw-logic-sample/src/lib.rs b/contracts/cw-logic-sample/src/lib.rs index 8145a6d8..14159c9a 100644 --- a/contracts/cw-logic-sample/src/lib.rs +++ b/contracts/cw-logic-sample/src/lib.rs @@ -1,13 +1,13 @@ #![forbid(unsafe_code)] #![deny( -warnings, -rust_2018_idioms, -trivial_casts, -trivial_numeric_casts, -unused_lifetimes, -unused_import_braces, -unused_qualifications, -unused_qualifications + warnings, + rust_2018_idioms, + trivial_casts, + trivial_numeric_casts, + unused_lifetimes, + unused_import_braces, + unused_qualifications, + unused_qualifications )] pub mod contract; diff --git a/contracts/cw-template/src/contract.rs b/contracts/cw-template/src/contract.rs index 75a15a3f..b7ab9e46 100644 --- a/contracts/cw-template/src/contract.rs +++ b/contracts/cw-template/src/contract.rs @@ -56,7 +56,11 @@ pub mod execute { Ok(Response::new().add_attribute("action", "increment")) } - pub fn reset(deps: DepsMut<'_>, info: MessageInfo, count: i32) -> Result { + pub fn reset( + deps: DepsMut<'_>, + info: MessageInfo, + count: i32, + ) -> Result { STATE.update(deps.storage, |mut state| -> Result<_, ContractError> { if info.sender != state.owner { return Err(ContractError::Unauthorized {}); diff --git a/contracts/cw-template/src/lib.rs b/contracts/cw-template/src/lib.rs index 343e5602..faa6cebc 100644 --- a/contracts/cw-template/src/lib.rs +++ b/contracts/cw-template/src/lib.rs @@ -1,13 +1,13 @@ #![forbid(unsafe_code)] #![deny( -warnings, -rust_2018_idioms, -trivial_casts, -trivial_numeric_casts, -unused_lifetimes, -unused_import_braces, -unused_qualifications, -unused_qualifications + warnings, + rust_2018_idioms, + trivial_casts, + trivial_numeric_casts, + unused_lifetimes, + unused_import_braces, + unused_qualifications, + unused_qualifications )] pub mod contract; diff --git a/packages/logic-bindings/src/lib.rs b/packages/logic-bindings/src/lib.rs index 0134310c..0f4263c6 100644 --- a/packages/logic-bindings/src/lib.rs +++ b/packages/logic-bindings/src/lib.rs @@ -1,13 +1,13 @@ #![forbid(unsafe_code)] #![deny( -warnings, -rust_2018_idioms, -trivial_casts, -trivial_numeric_casts, -unused_lifetimes, -unused_import_braces, -unused_qualifications, -unused_qualifications + warnings, + rust_2018_idioms, + trivial_casts, + trivial_numeric_casts, + unused_lifetimes, + unused_import_braces, + unused_qualifications, + unused_qualifications )] mod query; diff --git a/packages/logic-bindings/src/testing/mock.rs b/packages/logic-bindings/src/testing/mock.rs index d38b4022..d38ca6d5 100644 --- a/packages/logic-bindings/src/testing/mock.rs +++ b/packages/logic-bindings/src/testing/mock.rs @@ -1,13 +1,14 @@ -use std::marker::PhantomData; -use cosmwasm_std::{Coin, OwnedDeps, QuerierResult, SystemResult, to_binary}; -use cosmwasm_std::testing::{MOCK_CONTRACT_ADDR, MockApi, MockQuerier, MockStorage}; use crate::{Answer, AskResponse, LogicCustomQuery, Substitution, Term}; +use cosmwasm_std::testing::{MockApi, MockQuerier, MockStorage, MOCK_CONTRACT_ADDR}; +use cosmwasm_std::{to_binary, Coin, OwnedDeps, QuerierResult, SystemResult}; +use std::marker::PhantomData; /// Creates all external requirements that can be injected for unit tests. /// /// It sets the given balance for the contract itself, nothing else and set the custom default logic /// querier handler. -pub fn mock_dependencies_with_logic_and_balance( contract_balance: &[Coin], +pub fn mock_dependencies_with_logic_and_balance( + contract_balance: &[Coin], ) -> OwnedDeps, LogicCustomQuery> { mock_dependencies_with_logic_and_balances(&[(MOCK_CONTRACT_ADDR, contract_balance)]) } @@ -16,14 +17,15 @@ pub fn mock_dependencies_with_logic_and_balance( contract_balance: &[Coin], /// /// Set the logic querier mock handler. /// Sets all balances provided (you must explicitly set contract balance if desired). -pub fn mock_dependencies_with_logic_and_balances(balances: &[(&str, &[Coin])]) -> OwnedDeps, LogicCustomQuery> { +pub fn mock_dependencies_with_logic_and_balances( + balances: &[(&str, &[Coin])], +) -> OwnedDeps, LogicCustomQuery> { OwnedDeps { storage: MockStorage::default(), api: MockApi::default(), querier: MockLogicQuerier::new(LogicQuerier::default(), balances), custom_query_type: PhantomData, } - } trait MockLogicQuerier { @@ -51,8 +53,8 @@ impl LogicQuerier { #[allow(dead_code)] fn update_handler(&mut self, handler: LH) - where - LH: Fn(&LogicCustomQuery) -> QuerierResult, + where + LH: Fn(&LogicCustomQuery) -> QuerierResult, { self.handler = Box::from(handler) } @@ -69,16 +71,15 @@ impl Default for LogicQuerier { success: true, has_more: false, variables: vec!["foo".to_string()], - results: vec![ - crate::Result { - substitutions: vec![Substitution { - variable: "foo".to_string(), - term: Term { - name: "bar".to_string(), - arguments: vec![] - } - }] } - ], + results: vec![crate::Result { + substitutions: vec![Substitution { + variable: "foo".to_string(), + term: Term { + name: "bar".to_string(), + arguments: vec![], + }, + }], + }], }), }), };