update to match the refactored interfaces

RGB-WG · Mar 27, 2024 · d852d82 · d852d82
1 parent ee58df2
commit d852d82
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -96,4 +96,4 @@ serde = ["serde_crate", "serde_with", "serde_yaml", "bp-std/serde", "bp-wallet/s
 features = ["all"]
 
 [patch.crates-io]
-rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "dups" }
+rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "iface" }
diff --git a/cli/src/command.rs b/cli/src/command.rs
@@ -552,14 +552,6 @@ impl Exec for RgbArgs {
                         let name = name
                             .as_str()
                             .expect("invalid YAML: global name must be a string");
-                        let name = iface
-                            .genesis
-                            .global
-                            .iter()
-                            .find(|(n, _)| n.as_str() == name)
-                            .and_then(|(_, spec)| spec.name.as_ref())
-                            .map(FieldName::as_str)
-                            .unwrap_or(name);
                         let state_type = iface_impl
                             .global_state
                             .iter()
@@ -596,14 +588,6 @@ impl Exec for RgbArgs {
                         let name = name
                             .as_str()
                             .expect("invalid YAML: assignments name must be a string");
-                        let name = iface
-                            .genesis
-                            .assignments
-                            .iter()
-                            .find(|(n, _)| n.as_str() == name)
-                            .and_then(|(_, spec)| spec.name.as_ref())
-                            .map(FieldName::as_str)
-                            .unwrap_or(name);
                         let state_type = iface_impl
                             .assignments
                             .iter()

diff --git a/src/pay.rs b/src/pay.rs
@@ -192,11 +192,10 @@ impl Runtime {
             .assignment
             .as_ref()
             .or_else(|| {
-                iface.transitions.get(operation).and_then(|t| {
-                    t.default_assignment
-                        .as_ref()
-                        .and_then(|f| t.assignments.get(f).and_then(|arg| (&arg.name).into()))
-                })
+                iface
+                    .transitions
+                    .get(operation)
+                    .and_then(|t| t.default_assignment.as_ref())
             })
             .cloned()
             .ok_or(CompositionError::NoAssignment)?;