Skip to content

fix: replace rust native iter with loops for soroban compiling #6

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

Merged
0xdevcollins merged 1 commit into from
May 2, 2025
Merged

fix: replace rust native iter with loops for soroban compiling #6

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
48 changes: 40 additions & 8 deletions contracts/boundless/src/logic/voting.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,17 @@ impl VotingOperations for BoundlessContract {
return Err(BoundlessError::InvalidOperation);
}

if project.votes.iter().any(|vote| vote.0 == voter) {
let mut already_voted = false;
let mut i = 0;
while i < project.votes.len() {
if project.votes.get_unchecked(i).0 == voter {
already_voted = true;
break;
}
i += 1;
}

if already_voted {
return Err(BoundlessError::AlreadyVoted);
}

Expand Down Expand Up @@ -78,12 +88,19 @@ impl VotingOperations for BoundlessContract {
return Err(BoundlessError::InvalidOperation);
}

if !project.votes.iter().any(|vote| vote.0 == voter) {
return Err(BoundlessError::NotVoted);
let mut already_voted = false;
let mut i = 0;
while i < project.votes.len() {
if project.votes.get_unchecked(i).0 == voter {
already_voted = true;
project.votes.remove(i);
break;
}
i += 1;
}

if let Some(index) = project.votes.iter().position(|vote| vote.0 == voter) {
project.votes.remove(index as u32);
if !already_voted {
return Err(BoundlessError::NotVoted);
}

env.storage()
Expand All @@ -107,19 +124,34 @@ impl VotingOperations for BoundlessContract {
.get(&DataKey::Project(project_id.clone()))
.ok_or(BoundlessError::NotFound)?;

Ok(project.votes.iter().any(|vote| vote.0 == voter))
let mut already_voted = false;
let mut i = 0;
while i < project.votes.len() {
if project.votes.get_unchecked(i).0 == voter {
already_voted = true;
break;
}
i += 1;
}

Ok(already_voted)
}
fn get_vote(env: Env, project_id: String, voter: Address) -> Result<i32, BoundlessError> {
let project: Project = env
.storage()
.persistent()
.get(&DataKey::Project(project_id.clone()))
.ok_or(BoundlessError::NotFound)?;
for vote in project.votes {

let mut i = 0;
while i < project.votes.len() {
let vote = project.votes.get_unchecked(i);
if vote.0 == voter {
return Ok(vote.1);
}
i += 1;
}
return Err(BoundlessError::NotVoted);

Err(BoundlessError::AlreadyVoted)
}
}
Loading