Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove executed_surplus_fee #3226

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove executed_surplus_fee #3226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions crates/model/src/order.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,8 +676,6 @@ pub struct OrderMetadata {
#[serde_as(as = "HexOrDecimalU256")]
pub executed_fee_amount: U256,
#[serde_as(as = "HexOrDecimalU256")]
pub executed_surplus_fee: U256,
#[serde_as(as = "HexOrDecimalU256")]
pub executed_fee: U256,
pub executed_fee_token: H160,
pub invalidated: bool,
Expand Down Expand Up @@ -1025,7 +1023,6 @@ mod tests {
"validTo": 4294967295u32,
"appData": "0x6000000000000000000000000000000000000000000000000000000000000007",
"feeAmount": "115792089237316195423570985008687907853269984665640564039457584007913129639935",
"executedSurplusFee": "1",
"executedFee": "1",
"executedFeeToken": "0x000000000000000000000000000000000000000a",
"fullFeeAmount": "115792089237316195423570985008687907853269984665640564039457584007913129639935",
Expand Down Expand Up @@ -1058,7 +1055,6 @@ mod tests {
executed_sell_amount: BigUint::from_bytes_be(&[5]),
executed_sell_amount_before_fees: 4.into(),
executed_fee_amount: 1.into(),
executed_surplus_fee: 1.into(),
executed_fee: 1.into(),
executed_fee_token: H160::from_low_u64_be(10),
invalidated: true,
Expand Down
5 changes: 0 additions & 5 deletions crates/orderbook/openapi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,11 +947,6 @@ components:
on-chain. This data can be found in this object.
allOf:
- $ref: "#/components/schemas/OnchainOrderData"
executedSurplusFee:
description: Surplus fee that the limit order was executed with.
allOf:
- $ref: "#/components/schemas/BigUint"
nullable: false
executedFee:
description: Total fee charged for execution of the order. Contains network fee and protocol fees.
allOf:
Expand Down
2 changes: 0 additions & 2 deletions crates/orderbook/src/database/orders.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,8 +622,6 @@ fn full_order_into_model_order(order: FullOrder) -> Result<Order> {
)?,
executed_fee_amount: big_decimal_to_u256(&order.sum_fee)
.context("executed fee amount is not a valid u256")?,
executed_surplus_fee: big_decimal_to_u256(&order.executed_fee)
.context("executed fee is not a valid u256")?,
executed_fee: big_decimal_to_u256(&order.executed_fee)
.context("executed fee is not a valid u256")?,
executed_fee_token: H160(order.executed_fee_token.0),
Expand Down
2 changes: 0 additions & 2 deletions crates/shared/src/db_order_conversions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ pub fn full_order_into_model_order(order: database::orders::FullOrder) -> Result
)?,
executed_fee_amount: big_decimal_to_u256(&order.sum_fee)
.context("executed fee amount is not a valid u256")?,
executed_surplus_fee: big_decimal_to_u256(&order.executed_fee)
.context("executed fee is not a valid u256")?,
executed_fee: big_decimal_to_u256(&order.executed_fee)
.context("executed fee is not a valid u256")?,
executed_fee_token: H160(order.executed_fee_token.0),
Expand Down
Loading