evie/rs-matter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Spelling: Sucess => Success

Browse source
This commit is contained in:
Troels Dalsgaard Hoffmeyer 2023-02-27 16:55:38 +01:00 • committed by Kedar Sovani
parent 9b5a2530f8
commit e3e085d135
11 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
matter/src/data_model/cluster_on_off.rs
View file

@ -90,7 +90,7 @@ impl ClusterType for OnOffCluster {
.map_err(|_| IMStatusCode::Failure)?; .map_err(|_| IMStatusCode::Failure)?;
} }
cmd_req.trans.complete(); cmd_req.trans.complete();
Err(IMStatusCode::Sucess) Err(IMStatusCode::Success)
} }
Commands::On => { Commands::On => {
cmd_enter!("On"); cmd_enter!("On");
@ -105,7 +105,7 @@ impl ClusterType for OnOffCluster {
} }
cmd_req.trans.complete(); cmd_req.trans.complete();
Err(IMStatusCode::Sucess) Err(IMStatusCode::Success)
} }
Commands::Toggle => { Commands::Toggle => {
cmd_enter!("Toggle"); cmd_enter!("Toggle");
@ -121,7 +121,7 @@ impl ClusterType for OnOffCluster {
.write_attribute_raw(Attributes::OnOff as u16, AttrValue::Bool(!value)) .write_attribute_raw(Attributes::OnOff as u16, AttrValue::Bool(!value))
.map_err(|_| IMStatusCode::Failure)?; .map_err(|_| IMStatusCode::Failure)?;
cmd_req.trans.complete(); cmd_req.trans.complete();
Err(IMStatusCode::Sucess) Err(IMStatusCode::Success)
} }
} }
} }

4
matter/src/data_model/core/mod.rs
View file

@ -135,7 +135,7 @@ impl DataModel {
encoder.set_path(*path); encoder.set_path(*path);
let mut access_req = AccessReq::new(accessor, path, Access::WRITE); let mut access_req = AccessReq::new(accessor, path, Access::WRITE);
let r = match Cluster::write_attribute(c, &mut access_req, write_data, &attr) { let r = match Cluster::write_attribute(c, &mut access_req, write_data, &attr) {
Ok(_) => IMStatusCode::Sucess, Ok(_) => IMStatusCode::Success,
Err(e) => e, Err(e) => e,
}; };
encoder.encode_status(r, 0); encoder.encode_status(r, 0);
@ -384,7 +384,7 @@ impl<'a, 'b, 'c> Encoder for AttrWriteEncoder<'a, 'b, 'c> {
} }
fn encode_status(&mut self, status: IMStatusCode, cluster_status: u16) { fn encode_status(&mut self, status: IMStatusCode, cluster_status: u16) {
if self.skip_error && status != IMStatusCode::Sucess { if self.skip_error && status != IMStatusCode::Success {
// Don't encode errors // Don't encode errors
return; return;
} }

4
matter/src/data_model/objects/cluster.rs
View file

@ -207,7 +207,7 @@ impl Cluster {
encoder: &mut dyn Encoder, encoder: &mut dyn Encoder,
attr: &AttrDetails, attr: &AttrDetails,
) { ) {
let mut error = IMStatusCode::Sucess; let mut error = IMStatusCode::Success;
let base = c.base(); let base = c.base();
let a = if let Ok(a) = base.get_attribute(attr.attr_id) { let a = if let Ok(a) = base.get_attribute(attr.attr_id) {
a a
@ -225,7 +225,7 @@ impl Cluster {
error = IMStatusCode::UnsupportedAccess; error = IMStatusCode::UnsupportedAccess;
} }
if error != IMStatusCode::Sucess { if error != IMStatusCode::Success {
encoder.encode_status(error, 0); encoder.encode_status(error, 0);
} else if Attribute::is_system_attr(attr.attr_id) { } else if Attribute::is_system_attr(attr.attr_id) {
c.base().read_system_attribute(encoder, a) c.base().read_system_attribute(encoder, a)

2
matter/src/data_model/sdm/admin_commissioning.rs
View file

@ -145,7 +145,7 @@ impl AdminCommCluster {
let verifier = VerifierData::new(req.verifier.0, req.iterations, req.salt.0); let verifier = VerifierData::new(req.verifier.0, req.iterations, req.salt.0);
self.pase_mgr self.pase_mgr
.enable_pase_session(verifier, req.discriminator)?; .enable_pase_session(verifier, req.discriminator)?;
Err(IMStatusCode::Sucess) Err(IMStatusCode::Success)
} }
} }

2
matter/src/data_model/sdm/noc.rs
View file

@ -410,7 +410,7 @@ impl NocCluster {
} }
cmd_req.trans.complete(); cmd_req.trans.complete();
Err(IMStatusCode::Sucess) Err(IMStatusCode::Success)
} }
} }

4
matter/src/interaction_model/core.rs
View file

@ -139,7 +139,7 @@ impl InteractionModel {
trans.set_timeout(req.timeout.into()); trans.set_timeout(req.timeout.into());
let status = StatusResp { let status = StatusResp {
status: IMStatusCode::Sucess, status: IMStatusCode::Success,
}; };
let mut tw = TLVWriter::new(proto_tx.get_writebuf()?); let mut tw = TLVWriter::new(proto_tx.get_writebuf()?);
let _ = status.to_tlv(&mut tw, TagType::Anonymous); let _ = status.to_tlv(&mut tw, TagType::Anonymous);
@ -213,7 +213,7 @@ impl proto_demux::HandleProto for InteractionModel {
#[derive(FromPrimitive, Debug, Clone, Copy, PartialEq)] #[derive(FromPrimitive, Debug, Clone, Copy, PartialEq)]
pub enum IMStatusCode { pub enum IMStatusCode {
Sucess = 0, Success = 0,
Failure = 1, Failure = 1,
InvalidSubscription = 0x7D, InvalidSubscription = 0x7D,
UnsupportedAccess = 0x7E, UnsupportedAccess = 0x7E,

18
matter/tests/data_model/acl_and_dataver.rs
View file

@ -294,7 +294,7 @@ fn wc_write_attribute() {
peer, peer,
None, None,
input0, input0,
&[AttrStatus::new(&ep0_att, IMStatusCode::Sucess, 0)], &[AttrStatus::new(&ep0_att, IMStatusCode::Success, 0)],
); );
assert_eq!(AttrValue::Uint16(val0), read_cluster_id_write_attr(&im, 0)); assert_eq!(AttrValue::Uint16(val0), read_cluster_id_write_attr(&im, 0));
assert_eq!( assert_eq!(
@ -316,8 +316,8 @@ fn wc_write_attribute() {
None, None,
input1, input1,
&[ &[
AttrStatus::new(&ep0_att, IMStatusCode::Sucess, 0), AttrStatus::new(&ep0_att, IMStatusCode::Success, 0),
AttrStatus::new(&ep1_att, IMStatusCode::Sucess, 0), AttrStatus::new(&ep1_att, IMStatusCode::Success, 0),
], ],
); );
assert_eq!(AttrValue::Uint16(val1), read_cluster_id_write_attr(&im, 0)); assert_eq!(AttrValue::Uint16(val1), read_cluster_id_write_attr(&im, 0));
@ -350,7 +350,7 @@ fn exact_write_attribute() {
IMStatusCode::UnsupportedAccess, IMStatusCode::UnsupportedAccess,
0, 0,
)]; )];
let expected_success = &[AttrStatus::new(&ep0_att, IMStatusCode::Sucess, 0)]; let expected_success = &[AttrStatus::new(&ep0_att, IMStatusCode::Success, 0)];
let peer = 98765; let peer = 98765;
let mut im = ImEngine::new(); let mut im = ImEngine::new();
@ -401,7 +401,7 @@ fn exact_write_attribute_noc_cat() {
IMStatusCode::UnsupportedAccess, IMStatusCode::UnsupportedAccess,
0, 0,
)]; )];
let expected_success = &[AttrStatus::new(&ep0_att, IMStatusCode::Sucess, 0)]; let expected_success = &[AttrStatus::new(&ep0_att, IMStatusCode::Success, 0)];
let peer = 98765; let peer = 98765;
/* CAT in NOC is 1 more, in version, than that in ACL */ /* CAT in NOC is 1 more, in version, than that in ACL */
@ -534,8 +534,8 @@ fn write_with_runtime_acl_add() {
&[input0, acl_input, input0], &[input0, acl_input, input0],
&[ &[
AttrStatus::new(&ep0_att, IMStatusCode::UnsupportedAccess, 0), AttrStatus::new(&ep0_att, IMStatusCode::UnsupportedAccess, 0),
AttrStatus::new(&acl_att, IMStatusCode::Sucess, 0), AttrStatus::new(&acl_att, IMStatusCode::Success, 0),
AttrStatus::new(&ep0_att, IMStatusCode::Sucess, 0), AttrStatus::new(&ep0_att, IMStatusCode::Success, 0),
], ],
); );
assert_eq!(AttrValue::Uint16(val0), read_cluster_id_write_attr(&im, 0)); assert_eq!(AttrValue::Uint16(val0), read_cluster_id_write_attr(&im, 0));
@ -689,7 +689,7 @@ fn test_write_data_ver() {
peer, peer,
None, None,
input_correct_dataver, input_correct_dataver,
&[AttrStatus::new(&ep0_attwrite, IMStatusCode::Sucess, 0)], &[AttrStatus::new(&ep0_attwrite, IMStatusCode::Success, 0)],
); );
assert_eq!(AttrValue::Uint16(val0), read_cluster_id_write_attr(&im, 0)); assert_eq!(AttrValue::Uint16(val0), read_cluster_id_write_attr(&im, 0));
@ -728,7 +728,7 @@ fn test_write_data_ver() {
peer, peer,
None, None,
input_correct_dataver, input_correct_dataver,
&[AttrStatus::new(&ep0_attwrite, IMStatusCode::Sucess, 0)], &[AttrStatus::new(&ep0_attwrite, IMStatusCode::Success, 0)],
); );
assert_eq!(AttrValue::Uint16(val1), read_cluster_id_write_attr(&im, 0)); assert_eq!(AttrValue::Uint16(val1), read_cluster_id_write_attr(&im, 0));

12
matter/tests/data_model/attribute_lists.rs
View file

@ -73,7 +73,7 @@ fn attr_list_ops() {
// Test 1: Add Operation - add val0 // Test 1: Add Operation - add val0
let input = &[AttrData::new(None, att_path, EncodeValue::Value(&val0))]; let input = &[AttrData::new(None, att_path, EncodeValue::Value(&val0))];
let expected = &[AttrStatus::new(&att_data, IMStatusCode::Sucess, 0)]; let expected = &[AttrStatus::new(&att_data, IMStatusCode::Success, 0)];
let _ = handle_write_reqs(input, expected); let _ = handle_write_reqs(input, expected);
{ {
@ -83,7 +83,7 @@ fn attr_list_ops() {
// Test 2: Another Add Operation - add val1 // Test 2: Another Add Operation - add val1
let input = &[AttrData::new(None, att_path, EncodeValue::Value(&val1))]; let input = &[AttrData::new(None, att_path, EncodeValue::Value(&val1))];
let expected = &[AttrStatus::new(&att_data, IMStatusCode::Sucess, 0)]; let expected = &[AttrStatus::new(&att_data, IMStatusCode::Success, 0)];
let _ = handle_write_reqs(input, expected); let _ = handle_write_reqs(input, expected);
{ {
@ -94,7 +94,7 @@ fn attr_list_ops() {
// Test 3: Edit Operation - edit val1 to val0 // Test 3: Edit Operation - edit val1 to val0
att_path.list_index = Some(Nullable::NotNull(1)); att_path.list_index = Some(Nullable::NotNull(1));
let input = &[AttrData::new(None, att_path, EncodeValue::Value(&val0))]; let input = &[AttrData::new(None, att_path, EncodeValue::Value(&val0))];
let expected = &[AttrStatus::new(&att_data, IMStatusCode::Sucess, 0)]; let expected = &[AttrStatus::new(&att_data, IMStatusCode::Success, 0)];
let _ = handle_write_reqs(input, expected); let _ = handle_write_reqs(input, expected);
{ {
@ -105,7 +105,7 @@ fn attr_list_ops() {
// Test 4: Delete Operation - delete index 0 // Test 4: Delete Operation - delete index 0
att_path.list_index = Some(Nullable::NotNull(0)); att_path.list_index = Some(Nullable::NotNull(0));
let input = &[AttrData::new(None, att_path, delete_item)]; let input = &[AttrData::new(None, att_path, delete_item)];
let expected = &[AttrStatus::new(&att_data, IMStatusCode::Sucess, 0)]; let expected = &[AttrStatus::new(&att_data, IMStatusCode::Success, 0)];
let _ = handle_write_reqs(input, expected); let _ = handle_write_reqs(input, expected);
{ {
@ -121,7 +121,7 @@ fn attr_list_ops() {
att_path, att_path,
EncodeValue::Value(&overwrite_val), EncodeValue::Value(&overwrite_val),
)]; )];
let expected = &[AttrStatus::new(&att_data, IMStatusCode::Sucess, 0)]; let expected = &[AttrStatus::new(&att_data, IMStatusCode::Success, 0)];
let _ = handle_write_reqs(input, expected); let _ = handle_write_reqs(input, expected);
{ {
@ -132,7 +132,7 @@ fn attr_list_ops() {
// Test 6: Overwrite Operation - delete whole list // Test 6: Overwrite Operation - delete whole list
att_path.list_index = None; att_path.list_index = None;
let input = &[AttrData::new(None, att_path, delete_all)]; let input = &[AttrData::new(None, att_path, delete_all)];
let expected = &[AttrStatus::new(&att_data, IMStatusCode::Sucess, 0)]; let expected = &[AttrStatus::new(&att_data, IMStatusCode::Success, 0)];
let _ = handle_write_reqs(input, expected); let _ = handle_write_reqs(input, expected);
{ {

8
matter/tests/data_model/attributes.rs
View file

@ -371,8 +371,8 @@ fn test_write_success() {
), ),
]; ];
let expected = &[ let expected = &[
AttrStatus::new(&ep0_att, IMStatusCode::Sucess, 0), AttrStatus::new(&ep0_att, IMStatusCode::Success, 0),
AttrStatus::new(&ep1_att, IMStatusCode::Sucess, 0), AttrStatus::new(&ep1_att, IMStatusCode::Success, 0),
]; ];
let dm = handle_write_reqs(input, expected); let dm = handle_write_reqs(input, expected);
@ -428,8 +428,8 @@ fn test_write_wc_endpoint() {
Some(echo_cluster::Attributes::AttWrite as u32), Some(echo_cluster::Attributes::AttWrite as u32),
); );
let expected = &[ let expected = &[
AttrStatus::new(&ep0_att, IMStatusCode::Sucess, 0), AttrStatus::new(&ep0_att, IMStatusCode::Success, 0),
AttrStatus::new(&ep1_att, IMStatusCode::Sucess, 0), AttrStatus::new(&ep1_att, IMStatusCode::Success, 0),
]; ];
let dm = handle_write_reqs(input, expected); let dm = handle_write_reqs(input, expected);

2
matter/tests/data_model/commands.rs
View file

@ -151,7 +151,7 @@ fn test_invoke_cmd_wc_endpoint_only_1_has_cluster() {
let input = &[cmd_data!(target, 1)]; let input = &[cmd_data!(target, 1)];
let expected = &[ExpectedInvResp::Status(CmdStatus::new( let expected = &[ExpectedInvResp::Status(CmdStatus::new(
expected_path, expected_path,
IMStatusCode::Sucess, IMStatusCode::Success,
0, 0,
))]; ))];
handle_commands(input, expected); handle_commands(input, expected);

4
matter/tests/data_model/timed_requests.rs
View file

@ -154,8 +154,8 @@ fn test_timed_write_fail_and_success() {
Some(echo_cluster::Attributes::AttWrite as u32), Some(echo_cluster::Attributes::AttWrite as u32),
); );
let expected = &[ let expected = &[
AttrStatus::new(&ep0_att, IMStatusCode::Sucess, 0), AttrStatus::new(&ep0_att, IMStatusCode::Success, 0),
AttrStatus::new(&ep1_att, IMStatusCode::Sucess, 0), AttrStatus::new(&ep1_att, IMStatusCode::Success, 0),
]; ];
// Test with incorrect handling // Test with incorrect handling