Skip to content

Commit b378a51

Browse files
cargo clippy --fix
1 parent 1876621 commit b378a51

File tree

4 files changed

+30
-32
lines changed

4 files changed

+30
-32
lines changed

server/blockchain/src/contracts/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ impl Eip712 for Permit {
5959
Token::Address(self.owner.to_owned().into()),
6060
Token::Address(self.spender.to_owned().into()),
6161
Token::Address(self.token.to_owned().into()),
62-
Token::Uint(self.value.into()),
63-
Token::Uint(self.nonce.into()),
64-
Token::Uint(self.deadline.into()),
62+
Token::Uint(self.value),
63+
Token::Uint(self.nonce),
64+
Token::Uint(self.deadline),
6565
];
6666
Ok(keccak256(abi::encode(tokens.as_slice())))
6767
}

server/blockchain/src/contracts/treasury.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ pub mod treasury {
596596
> {
597597
let factory = ::ethers::contract::ContractFactory::new(
598598
TREASURY_ABI.clone(),
599-
TREASURY_BYTECODE.clone().into(),
599+
TREASURY_BYTECODE.clone(),
600600
client,
601601
);
602602
let deployer = factory.deploy(constructor_args)?;

server/types/value/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ mod tests {
507507
assert!(a > b);
508508
assert!(a >= b);
509509

510-
assert!(!(a < b));
511-
assert!(!(a <= b));
510+
assert!(a >= b);
511+
assert!(a > b);
512512
}
513513
}

server/worker/src/api/private/mod.rs

+24-26
Original file line numberDiff line numberDiff line change
@@ -169,33 +169,31 @@ impl ResponseTrade {
169169
direction: Direction::Sell,
170170
}
171171
}
172+
} else if !value.maker_presentation {
173+
Self {
174+
id: value.id,
175+
created_at: value.created_at,
176+
quote_asset_id: value.base_asset_id,
177+
base_asset_id: value.quote_asset_id,
178+
price: value.price.inv(),
179+
taker_quote_volume: value.taker_base_volume,
180+
taker_base_volume: value.taker_quote_volume,
181+
maker_quote_volume: value.maker_base_volume,
182+
maker_base_volume: value.maker_quote_volume,
183+
direction: Direction::Buy,
184+
}
172185
} else {
173-
if !value.maker_presentation {
174-
Self {
175-
id: value.id,
176-
created_at: value.created_at,
177-
quote_asset_id: value.base_asset_id,
178-
base_asset_id: value.quote_asset_id,
179-
price: value.price.inv(),
180-
taker_quote_volume: value.taker_base_volume,
181-
taker_base_volume: value.taker_quote_volume,
182-
maker_quote_volume: value.maker_base_volume,
183-
maker_base_volume: value.maker_quote_volume,
184-
direction: Direction::Buy,
185-
}
186-
} else {
187-
Self {
188-
id: value.id,
189-
created_at: value.created_at,
190-
quote_asset_id: value.quote_asset_id,
191-
base_asset_id: value.base_asset_id,
192-
price: value.price,
193-
taker_quote_volume: value.taker_quote_volume,
194-
taker_base_volume: value.taker_base_volume,
195-
maker_quote_volume: value.maker_quote_volume,
196-
maker_base_volume: value.maker_base_volume,
197-
direction: Direction::Sell,
198-
}
186+
Self {
187+
id: value.id,
188+
created_at: value.created_at,
189+
quote_asset_id: value.quote_asset_id,
190+
base_asset_id: value.base_asset_id,
191+
price: value.price,
192+
taker_quote_volume: value.taker_quote_volume,
193+
taker_base_volume: value.taker_base_volume,
194+
maker_quote_volume: value.maker_quote_volume,
195+
maker_base_volume: value.maker_base_volume,
196+
direction: Direction::Sell,
199197
}
200198
}
201199
}

0 commit comments

Comments
 (0)