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.

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

Get cards of a year #138

Merged
merged 3 commits into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions onchain/src/contracts/lyricsflip.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,20 @@ pub mod LyricsFlip {
};
cards.span()
}
// //TODO
// fn get_cards_of_a_year(self: @ContractState, year: u64, amount: u64) -> Span<Card> {}

fn get_cards_of_a_year(self: @ContractState, year: u64, seed: u64) -> Span<Card> {
let year_cards = self.year_cards.entry(year).len();
assert(year_cards > 0, Errors::EMPTY_YEAR_CARDS);
let amount = self.cards_per_round.read();
let mut cards = ArrayTrait::new();
let random_indices = self._get_random_numbers(seed, amount.into(), year_cards, true);
for i in random_indices {
let card_id = self.year_cards.entry(year).at(*i).read();
let card = self.cards.entry(card_id).read();
cards.append(card);
};
cards.span()
}
}

#[generate_trait]
Expand Down
2 changes: 1 addition & 1 deletion onchain/src/interfaces/lyricsflip.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ pub trait ILyricsFlip<TContractState> {
// TODO
fn get_cards_of_artist(self: @TContractState, artist: felt252, seed: u64) -> Span<Card>;
// //TODO
// fn get_cards_of_a_year(self: @TContractState, year: u64) -> Span<Card>;
fn get_cards_of_a_year(self: @TContractState, year: u64, seed: u64) -> Span<Card>;
}
90 changes: 89 additions & 1 deletion onchain/src/tests/test_lyricsflip.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ fn test_get_cards_of_genre() {
artist: 'Bob Marley',
title: "",
year: 2000,
lyrics: "Lorem Ipsum"
lyrics: "Lorem Ipsum",
};
lyricsflip.add_card(card);
};
Expand Down Expand Up @@ -592,3 +592,91 @@ fn test_get_cards_of_artist_should_panic_with_zero_cards() {
assert(*artist_cards.at(i).artist == 'Tupac', 'wrong artist');
}
}

#[test]
fn test_get_cards_of_a_year() {
// Deploy contract
let lyricsflip = deploy();

let target_year = 2000;
for i in 0
..5_u64 {
let card = Card {
card_id: i.into(),
genre: Genre::HipHop,
artist: 'Paris Paloma',
title: "Labour",
year: target_year,
lyrics: "For somebody",
};
lyricsflip.add_card(card);
};

start_cheat_caller_address(lyricsflip.contract_address, PLAYER_1());
let valid_cards_per_round = 5;
lyricsflip.set_cards_per_round(valid_cards_per_round);
let seed = 1;
stop_cheat_caller_address(lyricsflip.contract_address);

let year_cards = lyricsflip.get_cards_of_a_year(target_year, seed);

assert(year_cards.len() == valid_cards_per_round.into(), 'wrong cards count');

for i in 0..year_cards.len() {
assert(*year_cards.at(i).year == target_year, 'wrong year');
}
}

#[test]
#[should_panic(expected: 'Year cards is zero')]
fn test_get_cards_of_a_year_should_panic_with_empty_year() {
let lyricsflip = deploy();

start_cheat_caller_address(lyricsflip.contract_address, PLAYER_1());
let valid_cards_per_round = 5;
lyricsflip.set_cards_per_round(valid_cards_per_round);
let seed = 1;
stop_cheat_caller_address(lyricsflip.contract_address);

let non_existent_year = 1999;
let _year_cards = lyricsflip.get_cards_of_a_year(non_existent_year, seed);
}

#[test]
fn test_get_cards_of_a_year_random_distribution() {
let lyricsflip = deploy();

let target_year = 2000;
let total_cards = 10_u64;
for i in 0
..total_cards {
let card = Card {
card_id: i.into(),
genre: Genre::HipHop,
artist: 'Paris Paloma',
title: "Labour",
year: target_year,
lyrics: "For somebody",
};
lyricsflip.add_card(card);
};

start_cheat_caller_address(lyricsflip.contract_address, PLAYER_1());
let cards_per_round = 5;
lyricsflip.set_cards_per_round(cards_per_round);
stop_cheat_caller_address(lyricsflip.contract_address);

let cards_set1 = lyricsflip.get_cards_of_a_year(target_year, 1);
let cards_set2 = lyricsflip.get_cards_of_a_year(target_year, 2);

let mut all_same = true;
for i in 0
..cards_set1
.len() {
if *cards_set1.at(i).card_id != *cards_set2.at(i).card_id {
all_same = false;
break;
}
};
assert(!all_same, 'Different seeds give same cards');
}
1 change: 1 addition & 0 deletions onchain/src/utils/errors.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ pub mod Errors {
pub const ROUND_ALREADY_JOINED: felt252 = 'You are already a player';
pub const INVALID_CARDS_PER_ROUND: felt252 = 'Invalid cards per round';
pub const ARTIST_CARDS_IS_ZERO: felt252 = 'Artist cards is zero';
pub const EMPTY_YEAR_CARDS: felt252 = 'Year cards is zero';
}
2 changes: 1 addition & 1 deletion onchain/src/utils/types.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pub struct Entropy {
pub seed: u64,
pub block_number: u64,
pub timestamp: u64,
pub index: u64
pub index: u64,
}

impl GenreIntoFelt252 of Into<Genre, felt252> {
Expand Down