add ErgoBoxCandidate::R4-R9 in WASM;

remove ErgoBox*::register_value();
ergoplatform · Oct 12, 2020 · 8053fa1 · 8053fa1
1 parent d96a2e3
commit 8053fa1
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 15 deletions.
diff --git a/bindings/ergo-lib-wasm/src/ergo_box.rs b/bindings/ergo-lib-wasm/src/ergo_box.rs
@@ -34,7 +34,51 @@ pub mod box_builder;
 pub struct ErgoBoxCandidate(chain::ergo_box::ErgoBoxCandidate);
 
 #[wasm_bindgen]
-impl ErgoBoxCandidate {}
+impl ErgoBoxCandidate {
+    /// Returns value (ErgoTree constant) stored in the register or None if the register is empty
+    pub fn r4(&self) -> Option<Constant> {
+        self.0
+            .additional_registers
+            .get(NonMandatoryRegisterId::R4)
+            .cloned()
+            .map(Constant::from)
+    }
+    /// Returns value (ErgoTree constant) stored in the register or None if the register is empty
+    pub fn r5(&self) -> Option<Constant> {
+        self.0
+            .additional_registers
+            .get(NonMandatoryRegisterId::R5)
+            .cloned()
+            .map(Constant::from)
+    }
+
+    /// Returns value (ErgoTree constant) stored in the register or None if the register is empty
+    pub fn r6(&self) -> Option<Constant> {
+        self.0
+            .additional_registers
+            .get(NonMandatoryRegisterId::R6)
+            .cloned()
+            .map(Constant::from)
+    }
+
+    /// Returns value (ErgoTree constant) stored in the register or None if the register is empty
+    pub fn r7(&self) -> Option<Constant> {
+        self.0
+            .additional_registers
+            .get(NonMandatoryRegisterId::R7)
+            .cloned()
+            .map(Constant::from)
+    }
+
+    /// Returns value (ErgoTree constant) stored in the register or None if the register is empty
+    pub fn r9(&self) -> Option<Constant> {
+        self.0
+            .additional_registers
+            .get(NonMandatoryRegisterId::R9)
+            .cloned()
+            .map(Constant::from)
+    }
+}
 
 impl Into<chain::ergo_box::ErgoBoxCandidate> for ErgoBoxCandidate {
     fn into(self) -> chain::ergo_box::ErgoBoxCandidate {
@@ -81,47 +125,53 @@ impl ErgoBox {
     /// Returns value (ErgoTree constant) stored in the register or None if the register is empty
     pub fn r4(&self) -> Option<Constant> {
         self.0
-            .register_value(NonMandatoryRegisterId::R4)
+            .additional_registers
+            .get(NonMandatoryRegisterId::R4)
             .cloned()
             .map(Constant::from)
     }
 
     /// Returns value (ErgoTree constant) stored in the register or None if the register is empty
     pub fn r5(&self) -> Option<Constant> {
         self.0
-            .register_value(NonMandatoryRegisterId::R5)
+            .additional_registers
+            .get(NonMandatoryRegisterId::R5)
             .cloned()
             .map(Constant::from)
     }
 
     /// Returns value (ErgoTree constant) stored in the register or None if the register is empty
     pub fn r6(&self) -> Option<Constant> {
         self.0
-            .register_value(NonMandatoryRegisterId::R6)
+            .additional_registers
+            .get(NonMandatoryRegisterId::R6)
             .cloned()
             .map(Constant::from)
     }
 
     /// Returns value (ErgoTree constant) stored in the register or None if the register is empty
     pub fn r7(&self) -> Option<Constant> {
         self.0
-            .register_value(NonMandatoryRegisterId::R7)
+            .additional_registers
+            .get(NonMandatoryRegisterId::R7)
             .cloned()
             .map(Constant::from)
     }
 
     /// Returns value (ErgoTree constant) stored in the register or None if the register is empty
     pub fn r8(&self) -> Option<Constant> {
         self.0
-            .register_value(NonMandatoryRegisterId::R8)
+            .additional_registers
+            .get(NonMandatoryRegisterId::R8)
             .cloned()
             .map(Constant::from)
     }
 
     /// Returns value (ErgoTree constant) stored in the register or None if the register is empty
     pub fn r9(&self) -> Option<Constant> {
         self.0
-            .register_value(NonMandatoryRegisterId::R9)
+            .additional_registers
+            .get(NonMandatoryRegisterId::R9)
             .cloned()
             .map(Constant::from)
     }

diff --git a/ergo-lib/src/chain/ergo_box.rs b/ergo-lib/src/chain/ergo_box.rs
@@ -5,16 +5,14 @@ pub mod box_id;
 pub mod box_value;
 pub mod register;
 
-use self::register::NonMandatoryRegisterId;
-
 #[cfg(feature = "json")]
 use super::json;
 use super::{
     digest32::blake2b256_hash,
     token::{TokenAmount, TokenId},
     transaction::TxId,
 };
-use crate::ast::Constant;
+
 use crate::{
     ergo_tree::ErgoTree,
     serialization::{
@@ -141,11 +139,6 @@ impl ErgoBox {
         }
     }
 
-    /// Return value (ErgoTree constant) stored in a register with a given register index (R4..R9)
-    pub fn register_value(&self, reg_id: NonMandatoryRegisterId) -> Option<&Constant> {
-        self.additional_registers.get(reg_id)
-    }
-
     fn calc_box_id(&self) -> BoxId {
         let bytes = self.sigma_serialise_bytes();
         BoxId(blake2b256_hash(&bytes))