[dice] Pass InputValues to dice::execute_steps without conversion
Test: atest VtsAidlDiceTargetTest VtsAidlDiceDemoteTargetTest
Bug: 267575445
Change-Id: I14819bb8e1af10a2de4539077491de3fb7df9a83
diff --git a/security/dice/aidl/vts/functional/dice_demote_test.rs b/security/dice/aidl/vts/functional/dice_demote_test.rs
index 02ff2a4..1a17ec7 100644
--- a/security/dice/aidl/vts/functional/dice_demote_test.rs
+++ b/security/dice/aidl/vts/functional/dice_demote_test.rs
@@ -12,7 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-use diced_open_dice_cbor as dice;
use diced_sample_inputs;
use diced_utils;
use std::convert::TryInto;
@@ -44,14 +43,7 @@
)
.unwrap();
- let input_values: Vec<diced_utils::InputValues> = input_values
- .iter()
- .map(|v| v.into())
- .collect();
-
- let artifacts = artifacts
- .execute_steps(input_values.iter().map(|v| v as &dyn dice::InputValues))
- .unwrap();
+ let artifacts = artifacts.execute_steps(input_values.iter()).unwrap();
let (cdi_attest, cdi_seal, bcc) = artifacts.into_tuple();
let from_former = diced_utils::make_bcc_handover(
cdi_attest[..].try_into().unwrap(),
diff --git a/security/dice/aidl/vts/functional/dice_test.rs b/security/dice/aidl/vts/functional/dice_test.rs
index 574b634..190f187 100644
--- a/security/dice/aidl/vts/functional/dice_test.rs
+++ b/security/dice/aidl/vts/functional/dice_test.rs
@@ -12,10 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-use diced_open_dice_cbor as dice;
use diced_sample_inputs;
use diced_utils;
-use std::convert::{TryInto, Into};
+use std::convert::TryInto;
mod utils;
use utils::with_connection;
@@ -44,14 +43,7 @@
)
.unwrap();
- let input_values: Vec<diced_utils::InputValues> = input_values
- .iter()
- .map(|v| v.into())
- .collect();
-
- let artifacts = artifacts
- .execute_steps(input_values.iter().map(|v| v as &dyn dice::InputValues))
- .unwrap();
+ let artifacts = artifacts.execute_steps(input_values.iter()).unwrap();
let (cdi_attest, cdi_seal, bcc) = artifacts.into_tuple();
let from_former = diced_utils::make_bcc_handover(
cdi_attest[..].try_into().unwrap(),