Skip to content

fix: ensure compatibility with leaderboard interface and update test for welcome bonus tokens #194

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

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

fix: ensure compatibility with leaderboard interface and update test for welcome bonus tokens #194

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
21 changes: 19 additions & 2 deletions referral_registry/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use soroban_sdk::{
contract, contracterror, contractimpl, contracttype, symbol_short, token, vec, Address, Env,
IntoVal, String, Symbol, Vec,
IntoVal, String, Symbol, Val, Vec,
};

pub const INTERFACE_VERSION: u32 = 1;
Expand Down Expand Up @@ -173,6 +173,7 @@ impl ReferralRegistryContract {
.extend_ttl(&DataKey::DisplayName(user.clone()), TTL_BUMP, TTL_HIGH);

let lb = Self::leaderboard_contract(&env)?;
Self::require_compatible_leaderboard(&env, &lb)?;
let this = env.current_contract_address();
let _: Val = env.invoke_contract(
&lb,
Expand All @@ -182,7 +183,7 @@ impl ReferralRegistryContract {
this.into_val(&env),
user.into_val(&env),
WELCOME_BONUS_PTS.into_val(&env),
0_i128.into_val(&env),
WELCOME_BONUS_TOKENS.into_val(&env),
],
);

Expand Down Expand Up @@ -223,6 +224,7 @@ impl ReferralRegistryContract {
xlm.transfer(&this, &ref_addr, &amount);

let lb = Self::leaderboard_contract(&env)?;
Self::require_compatible_leaderboard(&env, &lb)?;
let _: Val = env.invoke_contract(
&lb,
&Symbol::new(&env, "reward_bonus"),
Expand Down Expand Up @@ -322,6 +324,21 @@ impl ReferralRegistryContract {
.ok_or(ReferralError::NotInitialized)
}

fn require_compatible_leaderboard(
env: &Env,
leaderboard: &Address,
) -> Result<(), ReferralError> {
let version: u32 = env.invoke_contract(
leaderboard,
&Symbol::new(env, "interface_version"),
vec![env],
);
if version != INTERFACE_VERSION {
return Err(ReferralError::IncompatibleInterface);
}
Ok(())
}

fn referral_depth(env: &Env, user: &Address) -> u32 {
let mut depth = 0;
let mut current = user.clone();
Expand Down
7 changes: 4 additions & 3 deletions referral_registry/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ fn test_register_referral_without_referrer() {

assert_eq!(t.client.get_referrer(&user), None);
assert_eq!(t.client.get_display_name(&user), Some(String::from_str(&t.env, "User")));
assert_eq!(t.token_client.balance(&user), WELCOME_BONUS_TOKENS);
}

#[test]
Expand Down Expand Up @@ -259,10 +260,10 @@ fn test_referral_depth_limit() {
&Option::<Address>::None,
);

for i in 1..=max_depth {
for i in 1..=(max_depth + 1) {
let referrer = users.get((i - 1) as u32).unwrap();
let user = users.get(i as u32).unwrap();
let result = if i == max_depth {
let result = if i == max_depth + 1 {
t.client.try_register_referral(
user,
&String::from_str(&t.env, "U"),
Expand All @@ -276,7 +277,7 @@ fn test_referral_depth_limit() {
);
Ok(())
};
if i == max_depth {
if i == max_depth + 1 {
assert!(result.is_err(), "should fail at depth limit");
}
}
Expand Down