From 059b28560f0d86c4ebe419159806e11fd849e25c Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Wed, 9 Feb 2022 07:48:47 +0100 Subject: [PATCH] Rename weight tie breaking to points tie breaking --- contracts/tg4-engagement/src/contract.rs | 18 +++++++++--------- contracts/tg4-engagement/src/msg.rs | 2 +- contracts/tg4-mixer/src/contract.rs | 6 +++--- contracts/tg4-mixer/src/msg.rs | 2 +- contracts/tg4-stake/src/contract.rs | 6 +++--- contracts/tg4-stake/src/msg.rs | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contracts/tg4-engagement/src/contract.rs b/contracts/tg4-engagement/src/contract.rs index e829ac9c..a153e616 100644 --- a/contracts/tg4-engagement/src/contract.rs +++ b/contracts/tg4-engagement/src/contract.rs @@ -712,8 +712,8 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult { ListMembersByPoints { start_after, limit } => { to_binary(&list_members_by_points(deps, start_after, limit)?) } - ListMembersByWeightTieBreaking { start_after, limit } => to_binary( - &list_members_by_weight_tie_breaking(deps, start_after, limit)?, + ListMembersByPointsTieBreaking { start_after, limit } => to_binary( + &list_members_by_points_tie_breaking(deps, start_after, limit)?, ), TotalPoints {} => to_binary(&query_total_points(deps)?), Admin {} => to_binary(&ADMIN.query_admin(deps)?), @@ -878,7 +878,7 @@ fn list_members_by_points( Ok(MemberListResponse { members: members? }) } -fn list_members_by_weight_tie_breaking( +fn list_members_by_points_tie_breaking( deps: Deps, start_after: Option<(Member, u64)>, limit: Option, @@ -1155,7 +1155,7 @@ mod tests { let info = mock_info(INIT_ADMIN, &[]); execute_update_members(deps.as_mut(), env.clone(), info.clone(), add, remove).unwrap(); - let members = list_members_by_weight_tie_breaking(deps.as_ref(), None, None) + let members = list_members_by_points_tie_breaking(deps.as_ref(), None, None) .unwrap() .members; assert_eq!(members.len(), 3); @@ -1201,7 +1201,7 @@ mod tests { let env = mock_env_height(20); execute_update_members(deps.as_mut(), env, info, add, remove).unwrap(); - let members = list_members_by_weight_tie_breaking(deps.as_ref(), None, None) + let members = list_members_by_points_tie_breaking(deps.as_ref(), None, None) .unwrap() .members; assert_eq!(members.len(), 3); @@ -1234,7 +1234,7 @@ mod tests { ); // Test pagination / limits work - let members = list_members_by_weight_tie_breaking(deps.as_ref(), None, Some(1)) + let members = list_members_by_points_tie_breaking(deps.as_ref(), None, Some(1)) .unwrap() .members; assert_eq!(members.len(), 1); @@ -1252,7 +1252,7 @@ mod tests { // Next page let start_after = Some(members[0].clone()); - let members = list_members_by_weight_tie_breaking(deps.as_ref(), start_after, Some(1)) + let members = list_members_by_points_tie_breaking(deps.as_ref(), start_after, Some(1)) .unwrap() .members; assert_eq!(members.len(), 1); @@ -1270,7 +1270,7 @@ mod tests { // Next page let start_after = Some(members[0].clone()); - let members = list_members_by_weight_tie_breaking(deps.as_ref(), start_after, Some(1)) + let members = list_members_by_points_tie_breaking(deps.as_ref(), start_after, Some(1)) .unwrap() .members; assert_eq!(members.len(), 1); @@ -1288,7 +1288,7 @@ mod tests { // Assert there's no more let start_after = Some(members[0].clone()); - let members = list_members_by_weight_tie_breaking(deps.as_ref(), start_after, Some(1)) + let members = list_members_by_points_tie_breaking(deps.as_ref(), start_after, Some(1)) .unwrap() .members; assert_eq!(members.len(), 0); diff --git a/contracts/tg4-engagement/src/msg.rs b/contracts/tg4-engagement/src/msg.rs index 9c497cbd..a57b67b6 100644 --- a/contracts/tg4-engagement/src/msg.rs +++ b/contracts/tg4-engagement/src/msg.rs @@ -91,7 +91,7 @@ pub enum QueryMsg { }, /// Returns MemberListResponse2, sorted by weight descending, /// breaking ties by start height - ListMembersByWeightTieBreaking { + ListMembersByPointsTieBreaking { start_after: Option<(Member, u64)>, limit: Option, }, diff --git a/contracts/tg4-mixer/src/contract.rs b/contracts/tg4-mixer/src/contract.rs index 52ac9cf0..05b8a5a5 100644 --- a/contracts/tg4-mixer/src/contract.rs +++ b/contracts/tg4-mixer/src/contract.rs @@ -360,8 +360,8 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult { ListMembersByPoints { start_after, limit } => { to_binary(&list_members_by_points(deps, start_after, limit)?) } - ListMembersByWeightTieBreaking { start_after, limit } => to_binary( - &list_members_by_weight_tie_breaking(deps, start_after, limit)?, + ListMembersByPointsTieBreaking { start_after, limit } => to_binary( + &list_members_by_points_tie_breaking(deps, start_after, limit)?, ), TotalPoints {} => to_binary(&query_total_points(deps)?), Groups {} => to_binary(&query_groups(deps)?), @@ -465,7 +465,7 @@ fn list_members_by_points( Ok(MemberListResponse { members: members? }) } -fn list_members_by_weight_tie_breaking( +fn list_members_by_points_tie_breaking( deps: Deps, start_after: Option<(Member, u64)>, limit: Option, diff --git a/contracts/tg4-mixer/src/msg.rs b/contracts/tg4-mixer/src/msg.rs index 276a044b..0f3a9e10 100644 --- a/contracts/tg4-mixer/src/msg.rs +++ b/contracts/tg4-mixer/src/msg.rs @@ -104,7 +104,7 @@ pub enum QueryMsg { }, /// Returns MemberListResponse2, sorted by weight descending, /// breaking ties by start height - ListMembersByWeightTieBreaking { + ListMembersByPointsTieBreaking { start_after: Option<(Member, u64)>, limit: Option, }, diff --git a/contracts/tg4-stake/src/contract.rs b/contracts/tg4-stake/src/contract.rs index 124e5bda..d46a2e01 100644 --- a/contracts/tg4-stake/src/contract.rs +++ b/contracts/tg4-stake/src/contract.rs @@ -457,8 +457,8 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult { ListMembersByPoints { start_after, limit } => { to_binary(&list_members_by_points(deps, start_after, limit)?) } - ListMembersByWeightTieBreaking { start_after, limit } => to_binary( - &list_members_by_weight_tie_breaking(deps, start_after, limit)?, + ListMembersByPointsTieBreaking { start_after, limit } => to_binary( + &list_members_by_points_tie_breaking(deps, start_after, limit)?, ), TotalPoints {} => to_binary(&query_total_points(deps)?), Claims { @@ -576,7 +576,7 @@ fn list_members_by_points( Ok(MemberListResponse { members: members? }) } -fn list_members_by_weight_tie_breaking( +fn list_members_by_points_tie_breaking( deps: Deps, start_after: Option<(Member, u64)>, limit: Option, diff --git a/contracts/tg4-stake/src/msg.rs b/contracts/tg4-stake/src/msg.rs index 06f909cf..e05e6f1c 100644 --- a/contracts/tg4-stake/src/msg.rs +++ b/contracts/tg4-stake/src/msg.rs @@ -98,7 +98,7 @@ pub enum QueryMsg { }, /// Returns MemberListResponse2, sorted by weight descending, /// breaking ties by start height - ListMembersByWeightTieBreaking { + ListMembersByPointsTieBreaking { start_after: Option<(Member, u64)>, limit: Option, },