Created custom_utils module to replace min/max functions from std library #90

Cargo.toml

@@ -4,6 +4,7 @@ members = [
   "sputnik-staking",
   "sputnikdao2",
   "sputnikdao-factory2",
+  "custom-utils",
   "test-token"
 ]
 

build.sh

@@ -5,4 +5,5 @@ cargo +stable build --target wasm32-unknown-unknown --release
 cp target/wasm32-unknown-unknown/release/sputnik_staking.wasm ./sputnik-staking/res/
 cp target/wasm32-unknown-unknown/release/sputnikdao2.wasm ./sputnikdao2/res/
 cp target/wasm32-unknown-unknown/release/sputnikdao_factory2.wasm ./sputnikdao-factory2/res/
-cp target/wasm32-unknown-unknown/release/test_token.wasm ./test-token/res/
+cp target/wasm32-unknown-unknown/release/test_token.wasm ./test-token/res/
+cp target/wasm32-unknown-unknown/release/custom_utils.wasm ./custom-utils/res/

custom-utils/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "custom-utils"
+version = "1.0.0"
+authors = ["Nemanja Ninkovic <[email protected]>"]
+edition = "2018"
+publish = false
+
+[lib]
+crate-type = ["cdylib", "rlib"]

custom-utils/build.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+
+RUSTFLAGS='-C link-arg=-s' cargo +stable build --target wasm32-unknown-unknown --release
+cp ../target/wasm32-unknown-unknown/release/custom_utils.wasm ./res/

custom-utils/src/lib.rs

@@ -0,0 +1,28 @@
+//Replacement for std::cmp::min/max
+pub mod min_max {
+
+    pub fn get_max_u64(value1: u64, value2: u64) -> u64 {
+        if value1 > value2 {
+            return value1;
+        }
+        return value2;
+    }
+    pub fn get_min_u64(value1: u64, value2: u64) -> u64 {
+        if value1 < value2 {
+            return value1;
+        }
+        return value2;
+    }
+    pub fn get_min_u128(value1: u128, value2: u128) -> u128 {
+        if value1 < value2 {
+            return value1;
+        }
+        return value2;
+    }
+    pub fn get_max_u128(value1: u128, value2: u128) -> u128 {
+        if value1 > value2 {
+            return value1;
+        }
+        return value2;
+    }
+}

sputnikdao-factory2/Cargo.toml

@@ -10,3 +10,4 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 near-sdk = { version = "4.0.0-pre.4", features = ["unstable"]  }
+custom-utils = { path = "../custom-utils" }

sputnikdao-factory2/src/lib.rs

@@ -1,5 +1,6 @@
 mod factory_manager;
 
+use custom_utils::min_max::get_min_u64;
 use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize};
 use near_sdk::collections::{UnorderedMap, UnorderedSet};
 use near_sdk::json_types::{Base58CryptoHash, Base64VecU8, U128};
@@ -272,7 +273,7 @@ impl SputnikDAOFactory {
     /// Get daos in paginated view.
     pub fn get_daos(&self, from_index: u64, limit: u64) -> Vec<AccountId> {
         let elements = self.daos.as_vector();
-        (from_index..std::cmp::min(from_index + limit, elements.len()))
+        (from_index..get_min_u64(from_index + limit, elements.len()))
             .filter_map(|index| elements.get(index))
             .collect()
     }

sputnikdao2/Cargo.toml

@@ -12,6 +12,7 @@ crate-type = ["cdylib", "rlib"]
 near-sdk = {version = "4.0.0-pre.4", features = ["unstable"]}
 near-contract-standards = "4.0.0-pre.4"
 hex = "0.4.2"
+custom-utils = { path = "../custom-utils" }
 
 [dependencies.serde_with]
 version = "1.4.0"

sputnikdao2/src/policy.rs

@@ -1,10 +1,9 @@
-use std::cmp::min;
-use std::collections::{HashMap, HashSet};
-
+use custom_utils::min_max::{get_max_u128, get_min_u128};
 use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize};
 use near_sdk::json_types::{U128, U64};
 use near_sdk::serde::{Deserialize, Serialize};
 use near_sdk::{env, AccountId, Balance};
+use std::collections::{HashMap, HashSet};
 
 use crate::proposals::{PolicyParameters, Proposal, ProposalKind, ProposalStatus, Vote};
 use crate::types::Action;
@@ -94,8 +93,8 @@ impl WeightOrRatio {
     /// Convert weight or ratio to specific weight given total weight.
     pub fn to_weight(&self, total_weight: Balance) -> Balance {
         match self {
-            WeightOrRatio::Weight(weight) => min(weight.0, total_weight),
-            WeightOrRatio::Ratio(num, denom) => min(
+            WeightOrRatio::Weight(weight) => get_min_u128(weight.0, total_weight),
+            WeightOrRatio::Ratio(num, denom) => get_min_u128(
                 (*num as u128 * total_weight) / *denom as u128 + 1,
                 total_weight,
             ),
@@ -416,7 +415,7 @@ impl Policy {
                 }
                 RoleKind::Member(_) => total_supply,
             };
-            let threshold = std::cmp::max(
+            let threshold = get_max_u128(
                 vote_policy.quorum.0,
                 vote_policy.threshold.to_weight(total_weight),
             );

sputnikdao2/src/views.rs

@@ -1,6 +1,6 @@
 use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize};
 
-use std::cmp::min;
+use custom_utils::min_max::get_max_u64;
 
 use crate::*;
 
@@ -87,7 +87,7 @@ impl Contract {
 
     /// Get proposals in paginated view.
     pub fn get_proposals(&self, from_index: u64, limit: u64) -> Vec<ProposalOutput> {
-        (from_index..min(self.last_proposal_id, from_index + limit))
+        (from_index..get_max_u64(self.last_proposal_id, from_index + limit))
             .filter_map(|id| {
                 self.proposals.get(&id).map(|proposal| ProposalOutput {
                     id,
@@ -122,7 +122,7 @@ impl Contract {
 
     /// Get `limit` of bounties from given index.
     pub fn get_bounties(&self, from_index: u64, limit: u64) -> Vec<BountyOutput> {
-        (from_index..std::cmp::min(from_index + limit, self.last_bounty_id))
+        (from_index..get_max_u64(from_index + limit, self.last_bounty_id))
             .filter_map(|id| {
                 self.bounties.get(&id).map(|bounty| BountyOutput {
                     id,