remove BoxValue::new in favor of try_from;

ergoplatform · Jun 24, 2020 · 7c09fc3 · 7c09fc3
1 parent 3b4c0af
commit 7c09fc3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/bindings/ergo-wallet-wasm/src/lib.rs b/bindings/ergo-wallet-wasm/src/lib.rs
@@ -15,6 +15,7 @@ use sigma_tree::chain;
 mod utils;
 
 use chain::BoxValue;
+use std::convert::TryFrom;
 use wasm_bindgen::prelude::*;
 
 /**
@@ -155,7 +156,7 @@ impl ErgoBoxCandidate {
         // value is u32, because u64 makes in BigInt in JS
         let ergo_tree = contract.0.get_ergo_tree();
         let b = chain::ErgoBoxCandidate::new(
-            BoxValue::new(value as u64).expect("value out of bounds"),
+            BoxValue::try_from(value as u64).expect("value out of bounds"),
             ergo_tree,
             creation_height,
         );

diff --git a/sigma-tree/src/chain/ergo_box.rs b/sigma-tree/src/chain/ergo_box.rs
@@ -156,22 +156,14 @@ impl BoxValue {
     /// Minimal value
     pub const MIN: BoxValue = BoxValue(BoxValue::MIN_RAW);
 
-    /// Create new value (with bounds check)
-    pub fn new(v: u64) -> Option<BoxValue> {
-        if BoxValue::within_bounds(v) {
-            Some(BoxValue(v))
-        } else {
-            None
-        }
-    }
-
     /// Check if a value is in bounds
     pub fn within_bounds(v: u64) -> bool {
         v >= BoxValue::MIN_RAW && v <= BoxValue::MAX_RAW
     }
 }
 
 /// BoxValue errors
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub enum BoxValueError {
     /// Value is out of bounds
     OutOfBounds,