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

Bump update #213

Merged
merged 2 commits into from
Mar 26, 2024
Merged

Bump update #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9257a9d
chore: update bumping amounts with phase 2 limits
mootz12 Mar 22, 2024
4a39af0
test: match max_entry_ttl with phase 2 limits
mootz12 Mar 22, 2024
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
20 changes: 10 additions & 10 deletions backstop/src/backstop/user.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let to_queue = 500;
Expand Down Expand Up @@ -198,7 +198,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let to_queue = 500;
Expand Down Expand Up @@ -235,7 +235,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let to_queue = 801;
Expand All @@ -260,7 +260,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let to_wd = 1;
Expand Down Expand Up @@ -291,7 +291,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let to_wd = 200;
Expand Down Expand Up @@ -325,7 +325,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let to_wd = 150;
Expand Down Expand Up @@ -374,7 +374,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let to_wd = 300;
Expand Down Expand Up @@ -428,7 +428,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let to_wd = 300;
Expand Down Expand Up @@ -468,7 +468,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});
let to_dequeue = 300;
// verify exp is respected when specified
Expand Down Expand Up @@ -507,7 +507,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let to_dequeue = 376;
Expand Down
24 changes: 12 additions & 12 deletions backstop/src/backstop/withdrawal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

e.as_contract(&backstop_address, || {
Expand Down Expand Up @@ -175,7 +175,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

e.as_contract(&backstop_address, || {
Expand Down Expand Up @@ -212,7 +212,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

execute_queue_withdrawal(&e, &samwise, &pool_address, 40_0000000);
Expand All @@ -226,7 +226,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

e.as_contract(&backstop_address, || {
Expand Down Expand Up @@ -279,7 +279,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

execute_queue_withdrawal(&e, &samwise, &pool_address, 40_0000000);
Expand All @@ -293,7 +293,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

e.as_contract(&backstop_address, || {
Expand Down Expand Up @@ -325,7 +325,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

// setup pool with queue for withdrawal and allow the backstop to incur a profit
Expand All @@ -343,7 +343,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

e.as_contract(&backstop_address, || {
Expand Down Expand Up @@ -392,7 +392,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

// setup pool with queue for withdrawal and allow the backstop to incur a profit
Expand All @@ -410,7 +410,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

e.as_contract(&backstop_address, || {
Expand Down Expand Up @@ -445,7 +445,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

// setup pool with queue for withdrawal and allow the backstop to incur a profit
Expand All @@ -464,7 +464,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

e.as_contract(&backstop_address, || {
Expand Down
8 changes: 4 additions & 4 deletions backstop/src/emissions/claim.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});
e.budget().reset_unlimited();

Expand Down Expand Up @@ -267,7 +267,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let backstop_address = create_backstop(&e);
Expand Down Expand Up @@ -418,7 +418,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});
let backstop_lp_balance = backstop_lp_balance + 6_5244800;
let pre_frodo_balance_1 = storage::get_user_balance(&e, &pool_1_id, &frodo).shares;
Expand Down Expand Up @@ -490,7 +490,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let backstop_address = create_backstop(&e);
Expand Down
20 changes: 10 additions & 10 deletions backstop/src/emissions/distributor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let backstop_id = create_backstop(&e);
Expand Down Expand Up @@ -248,7 +248,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let backstop_id = create_backstop(&e);
Expand Down Expand Up @@ -289,7 +289,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let backstop_id = create_backstop(&e);
Expand Down Expand Up @@ -343,7 +343,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let backstop_id = create_backstop(&e);
Expand Down Expand Up @@ -397,7 +397,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let backstop_id = create_backstop(&e);
Expand Down Expand Up @@ -460,7 +460,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let backstop_id = create_backstop(&e);
Expand Down Expand Up @@ -520,7 +520,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let backstop_id = create_backstop(&e);
Expand Down Expand Up @@ -566,7 +566,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let backstop_id = create_backstop(&e);
Expand Down Expand Up @@ -622,7 +622,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let backstop_id = create_backstop(&e);
Expand Down Expand Up @@ -674,7 +674,7 @@ mod tests {
base_reserve: 10,
min_temp_entry_ttl: 10,
min_persistent_entry_ttl: 10,
max_entry_ttl: 2000000,
max_entry_ttl: 3110400,
});

let backstop_id = create_backstop(&e);
Expand Down
Loading