Skip to content

feat: remove internal processors + contracts #920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brendanobra wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: remove internal processors + contracts #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ede292e
feat: remove internal processors + contracts
brendanobra Oct 28, 2025
3840d15
chore: de-contractification
brendanobra Nov 7, 2025
246e86f
Merge branch 'main' of github.com:rdkcentral/Ripple into remove-inter…
brendanobra Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/main/src/firebolt/firebolt_ws.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ async fn return_invalid_service_error_message(
id: id.clone(),
payload: ExtnPayload::Response(ExtnResponse::Error(e)),
requestor: ExtnId::try_from(session.get_app_id()).unwrap(),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: None,
ts: None,
};
Expand Down
2 changes: 1 addition & 1 deletion core/main/src/service/ripple_service/service_controller_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ async fn return_invalid_service_error_message(
id: id.clone(),
payload: ExtnPayload::Response(ExtnResponse::Error(e)),
requestor: ExtnId::try_from(session.get_app_id()).unwrap(),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
Copy link
Copy Markdown
Contributor

@Vinodsathyaseelan Vinodsathyaseelan Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should not be sending any ExtnMessage here. Instead use service message for propagating this error as JSON RPC error response.

target_id: None,
ts: None,
};
Expand Down
54 changes: 27 additions & 27 deletions core/sdk/src/extn/client/extn_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,7 +1132,7 @@ pub mod tests {
let msg = ExtnMessage {
id: "test_id".to_string(),
requestor: ExtnId::get_main_target("main".into()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
Copy link
Copy Markdown
Contributor

@Vinodsathyaseelan Vinodsathyaseelan Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The scope of this ticket is to eliminate the use of RippleContract::Internal and switch to direct function calls or rule-based invocation. These tests are no longer relevant since we are removing the use of ExtnMessages.

target_id: Some(ExtnId::get_main_target("main".into())),
payload: ExtnPayload::Response(ExtnResponse::String("success".to_string())),
ts: Some(Utc::now().timestamp_millis()),
Expand All @@ -1153,7 +1153,7 @@ pub mod tests {
let msg = ExtnMessage {
id: "test_id".to_string(),
requestor: ExtnId::get_main_target("main".into()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: Some(ExtnId::get_main_target("main".into())),
payload: ExtnPayload::Response(ExtnResponse::String("success".to_string())),
ts: Some(Utc::now().timestamp_millis()),
Expand All @@ -1171,7 +1171,7 @@ pub mod tests {
fn test_add_stream_processor() {
let extn_client = ExtnClient::mock();
let processor =
MockRequestProcessor::new_v1(extn_client.clone(), vec![RippleContract::Internal]);
MockRequestProcessor::new_v1(extn_client.clone(), vec![RippleContract::RippleContext]);

add_stream_processor(
processor.contract().as_clear_string(),
Expand All @@ -1186,7 +1186,7 @@ pub mod tests {
fn test_add_vec_stream_processor() {
let extn_client = ExtnClient::mock();
let processor =
MockEventProcessor::new_v1(extn_client.clone(), vec![RippleContract::Internal]);
MockEventProcessor::new_v1(extn_client.clone(), vec![RippleContract::RippleContext]);
let id = processor.contract().as_clear_string();

add_vec_stream_processor(
Expand Down Expand Up @@ -1222,7 +1222,7 @@ pub mod tests {
async fn test_add_request_processor() {
let mut extn_client = ExtnClient::mock();
let processor =
MockRequestProcessor::new_v1(extn_client.clone(), vec![RippleContract::Internal]);
MockRequestProcessor::new_v1(extn_client.clone(), vec![RippleContract::RippleContext]);

extn_client.add_request_processor(processor);
tokio::time::sleep(Duration::from_millis(10)).await;
Expand All @@ -1242,7 +1242,7 @@ pub mod tests {
async fn test_add_event_processor() {
let mut extn_client = ExtnClient::mock();
let processor =
MockEventProcessor::new_v1(extn_client.clone(), vec![RippleContract::Internal]);
MockEventProcessor::new_v1(extn_client.clone(), vec![RippleContract::RippleContext]);
let id = processor.contract().as_clear_string();
extn_client.add_event_processor(processor);

Expand Down Expand Up @@ -1420,7 +1420,7 @@ pub mod tests {
let processor = MockRequestProcessor::new_v1(
extn_client.clone(),
vec![
RippleContract::Internal,
RippleContract::RippleContext,
RippleContract::Session(SessionAdjective::Account),
],
);
Expand All @@ -1430,7 +1430,7 @@ pub mod tests {
let response = extn_client
.request(MockRequest {
app_id: "test_app_id".to_string(),
contract: RippleContract::Internal,
contract: RippleContract::RippleContext,
expected_response: Some(ExtnResponse::Boolean(true)),
})
.await;
Expand All @@ -1440,7 +1440,7 @@ pub mod tests {
let expected_message = ExtnMessage {
id: "some-uuid".to_string(),
requestor: ExtnId::get_main_target("main".into()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: None,
payload: ExtnPayload::Response(ExtnResponse::Boolean(true)),
ts: Some(Utc::now().timestamp_millis()),
Expand All @@ -1467,13 +1467,13 @@ pub mod tests {

let mut extn_client = ExtnClient::new_main();
let processor =
MockRequestProcessor::new_v1(extn_client.clone(), vec![RippleContract::Internal]);
MockRequestProcessor::new_v1(extn_client.clone(), vec![RippleContract::RippleContext]);
extn_client.add_request_processor(processor);

let response = extn_client
.main_internal_request(MockRequest {
app_id: "test_app_id".to_string(),
contract: RippleContract::Internal,
contract: RippleContract::RippleContext,
expected_response: Some(ExtnResponse::Boolean(true)),
})
.await;
Expand All @@ -1483,7 +1483,7 @@ pub mod tests {
let expected_message = ExtnMessage {
id: "some-uuid".to_string(),
requestor: cap,
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: None,
payload: ExtnPayload::Response(ExtnResponse::Boolean(true)),
ts: Some(Utc::now().timestamp_millis()),
Expand Down Expand Up @@ -1653,7 +1653,7 @@ pub mod tests {
let message = ExtnMessage {
id: "test_id".to_string(),
requestor: ExtnId::get_main_target("main".into()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: None,
payload: ExtnPayload::Request(ExtnRequest::Context(
RippleContextUpdateRequest::TimeZone(TimeZone {
Expand All @@ -1679,7 +1679,7 @@ pub mod tests {
async fn test_event() {
let mut extn_client = ExtnClient::new_main();
let processor =
MockEventProcessor::new_v1(extn_client.clone(), vec![RippleContract::Internal]);
MockEventProcessor::new_v1(extn_client.clone(), vec![RippleContract::RippleContext]);

extn_client.add_event_processor(processor);

Expand All @@ -1698,7 +1698,7 @@ pub mod tests {
extn_client.handle_message(ExtnMessage {
id: "test_id".to_string(),
requestor: ExtnId::get_main_target("main".into()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: None,
payload: event.get_extn_payload(),
ts: Some(Utc::now().timestamp_millis()),
Expand Down Expand Up @@ -1735,7 +1735,7 @@ pub mod tests {
let mut extn_client = ExtnClient::new_main();
let message = MockRequest {
app_id: "test_app_id".to_string(),
contract: RippleContract::Internal,
contract: RippleContract::RippleContext,
expected_response: Some(ExtnResponse::Boolean(true)),
};
let (tx, mut rx) = mpsc::channel(1);
Expand Down Expand Up @@ -1803,7 +1803,7 @@ pub mod tests {
let msg = ExtnMessage {
id,
requestor: ExtnId::get_main_target("main".into()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: None,
payload: ExtnPayload::Response(exp_resp.clone()),
ts: Some(Utc::now().timestamp_millis()),
Expand Down Expand Up @@ -1839,7 +1839,7 @@ pub mod tests {
testing_logger::setup();
let extn_client = ExtnClient::mock();
let processor =
MockRequestProcessor::new_v1(extn_client.clone(), vec![RippleContract::Internal]);
MockRequestProcessor::new_v1(extn_client.clone(), vec![RippleContract::RippleContext]);

if tc.contains("req processor err") {
extn_client.request_processors.write().unwrap().clear();
Expand All @@ -1856,7 +1856,7 @@ pub mod tests {
let msg = ExtnMessage {
id: "some-id".to_string(),
requestor: ExtnId::get_main_target("main".into()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: None,
payload: ExtnPayload::Response(exp_resp),
ts: Some(Utc::now().timestamp_millis()),
Expand Down Expand Up @@ -1897,7 +1897,7 @@ pub mod tests {
testing_logger::setup();
let extn_client = ExtnClient::mock();
let processor =
MockEventProcessor::new_v1(extn_client.clone(), vec![RippleContract::Internal]);
MockEventProcessor::new_v1(extn_client.clone(), vec![RippleContract::RippleContext]);
let id = processor.contract().as_clear_string();
add_vec_stream_processor(
id.clone(),
Expand All @@ -1920,7 +1920,7 @@ pub mod tests {
let msg = ExtnMessage {
id: "some-id".to_string(),
requestor: ExtnId::get_main_target("main".into()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: None,
payload: ExtnPayload::Response(exp_resp),
ts: Some(Utc::now().timestamp_millis()),
Expand Down Expand Up @@ -1953,7 +1953,7 @@ pub mod tests {
let req = ExtnMessage {
id: id.clone(),
requestor: ExtnId::get_main_target("main".into()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: None,
payload: ExtnPayload::Request(ExtnRequest::Device(DeviceRequest::DeviceInfo(
DeviceInfoRequest::Model,
Expand All @@ -1971,7 +1971,7 @@ pub mod tests {
received_msg.requestor.to_string(),
"ripple:main:internal:main"
);
assert_eq!(received_msg.target.as_clear_string(), "internal");
assert_eq!(received_msg.target.as_clear_string(), "ripple_context");
assert_eq!(received_msg.target_id, None);
if let ExtnPayload::Response(ExtnResponse::String(s)) = received_msg.payload {
assert!(s.eq("test_make"));
Expand Down Expand Up @@ -1999,7 +1999,7 @@ pub mod tests {
let msg = ExtnMessage {
id: id.clone(),
requestor: ExtnId::get_main_target("main".into()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: None,
payload: ExtnPayload::Response(ExtnResponse::String("test_make".to_string())),
ts: Some(Utc::now().timestamp_millis()),
Expand All @@ -2014,7 +2014,7 @@ pub mod tests {
received_msg.requestor.to_string(),
"ripple:main:internal:main"
);
assert_eq!(received_msg.target.as_clear_string(), "internal");
assert_eq!(received_msg.target.as_clear_string(), "ripple_context");
assert_eq!(received_msg.target_id, None);
if let ExtnPayload::Response(ExtnResponse::String(s)) = received_msg.payload {
assert!(s.eq("test_make"));
Expand Down Expand Up @@ -2340,15 +2340,15 @@ pub mod tests {
let (tx, mut tr) = mpsc::channel(1);
let request = MockRequest {
app_id: "test_app_id".to_string(),
contract: RippleContract::Internal,
contract: RippleContract::RippleContext,
expected_response: None,
};
let id = extn_client.subscribe(request.clone(), tx).await.unwrap();

let msg = ExtnMessage {
id: id.clone(),
requestor: ExtnId::get_main_target("main".into()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: None,
payload: request.get_extn_payload(),
ts: Some(Utc::now().timestamp_millis()),
Expand Down
16 changes: 8 additions & 8 deletions core/sdk/src/extn/client/extn_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ pub mod tests {
state: MockState {
client: ExtnClient::mock(),
contracts: vec![
RippleContract::Internal,
RippleContract::RippleContext,
RippleContract::Session(SessionAdjective::Account),
RippleContract::DeviceEvents(EventAdjective::Input),
],
Expand Down Expand Up @@ -501,7 +501,7 @@ pub mod tests {
let result = MockRequestProcessor::process_request(
MockState {
client: extn_client,
contracts: vec![RippleContract::Internal],
contracts: vec![RippleContract::RippleContext],
},
msg.clone(),
get_mock_request(),
Expand Down Expand Up @@ -611,7 +611,7 @@ pub mod tests {
assert_eq!(
result,
Some(vec![
RippleContract::Internal,
RippleContract::RippleContext,
RippleContract::Session(SessionAdjective::Account),
RippleContract::DeviceEvents(EventAdjective::Input),
])
Expand All @@ -622,7 +622,7 @@ pub mod tests {
async fn test_event_handle_error() {
let state = MockState {
client: ExtnClient::mock(),
contracts: vec![RippleContract::Internal],
contracts: vec![RippleContract::RippleContext],
};
let msg = get_mock_message(PayloadType::Event);
let error = RippleError::ProcessorError;
Expand All @@ -648,7 +648,7 @@ pub mod tests {
let processor = MockRequestProcessor {
state: MockState {
client: extn_client.clone(),
contracts: vec![RippleContract::Internal],
contracts: vec![RippleContract::RippleContext],
},
streamer: DefaultExtnStreamer::new(),
};
Expand All @@ -658,7 +658,7 @@ pub mod tests {
let response = extn_client
.request(MockRequest {
app_id: "test_app_id".to_string(),
contract: RippleContract::Internal,
contract: RippleContract::RippleContext,
expected_response: exp_resp.clone(),
})
.await;
Expand All @@ -668,7 +668,7 @@ pub mod tests {
let expected_message = ExtnMessage {
id: "some-uuid".to_string(),
requestor: ExtnId::get_main_target("main".into()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: None,
payload: ExtnPayload::Response(exp_resp.clone().unwrap()),
ts: Some(Utc::now().timestamp_millis()),
Expand Down Expand Up @@ -706,7 +706,7 @@ pub mod tests {
let processor = MockEventProcessor {
state: MockState {
client: extn_client.clone(),
contracts: vec![RippleContract::Internal],
contracts: vec![RippleContract::RippleContext],
},
streamer: DefaultExtnStreamer::new(),
};
Expand Down
8 changes: 4 additions & 4 deletions core/sdk/src/extn/client/wait_for_service_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ mod tests {
let ready_message = ExtnMessage {
id: "test_id".to_string(),
requestor: ExtnId::new_channel(ExtnClassId::Device, "info".to_string()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: Some(ExtnId::get_main_target("main".into())),
payload: ExtnPayload::Request(ExtnRequest::Config(Config::DefaultName)),
ts: Some(1234567890),
Expand Down Expand Up @@ -184,7 +184,7 @@ mod tests {
let invalid_message = ExtnMessage {
id: "test_id".to_string(),
requestor: ExtnId::new_channel(ExtnClassId::Device, "other".to_string()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: Some(ExtnId::get_main_target("main".into())),
payload: ExtnPayload::Request(ExtnRequest::Config(Config::DefaultName)),
ts: Some(1234567890),
Expand Down Expand Up @@ -238,7 +238,7 @@ mod tests {
let ready_message = ExtnMessage {
id: "test_id".to_string(),
requestor: ExtnId::new_channel(ExtnClassId::Device, "other".to_string()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: Some(ExtnId::get_main_target("main".into())),
payload: ExtnPayload::Request(ExtnRequest::Config(Config::DefaultName)),
ts: Some(1234567890),
Expand Down Expand Up @@ -274,7 +274,7 @@ mod tests {
let invalid_message = ExtnMessage {
id: "test_id".to_string(),
requestor: ExtnId::new_channel(ExtnClassId::Device, "info".to_string()),
target: RippleContract::Internal,
target: RippleContract::RippleContext,
target_id: Some(ExtnId::get_main_target("main".into())),
payload: ExtnPayload::Request(ExtnRequest::Config(Config::DefaultName)),
ts: Some(1234567890),
Expand Down
Loading