commit bd097fbd956a9a6650ce772a186203792d60e5ec
author Miguel Flores Ruiz de Eguino <miguelfrde@google.com> Thu Sep 12 16:50:22 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Thu Sep 12 16:50:22 2019 +0000
tree 60b78e5b4fb8c1b35e4be78e450713639f2ade69
parent 47aae506092f4833e697ce3fffcb493785391630

[discovermgr] Stop querying package resolver

TESTED=no tests affected, discovermgr_tests succeeds

Change-Id: Ib25242a6e787c26bf20905687785239a7b14c0fc

src/stories/bin/discovermgr/src/local_action_provider.rs

diff --git a/src/stories/bin/discovermgr/src/local_action_provider.rs b/src/stories/bin/discovermgr/src/local_action_provider.rs
index 87a57f1..749a2c4 100644
--- a/src/stories/bin/discovermgr/src/local_action_provider.rs
+++ b/src/stories/bin/discovermgr/src/local_action_provider.rs
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#![allow(dead_code)]
+
 use crate::indexing::load_module_facet;
 use crate::models::{Action, FuchsiaFulfillment, Parameter};
 use failure::Error;

src/stories/bin/discovermgr/src/main.rs

diff --git a/src/stories/bin/discovermgr/src/main.rs b/src/stories/bin/discovermgr/src/main.rs
index ab909ab..af504c3 100644
--- a/src/stories/bin/discovermgr/src/main.rs
+++ b/src/stories/bin/discovermgr/src/main.rs
@@ -7,9 +7,7 @@
 use {
     crate::{
         cloud_action_provider::get_cloud_actions,
-        local_action_provider::get_local_actions,
         mod_manager::ModManager,
-        models::Action,
         story_context_store::StoryContextStore,
         story_manager::StoryManager,
         story_storage::{LedgerStorage, MemoryStorage, StoryStorage},
@@ -33,8 +31,6 @@
     fuchsia_syslog::{self as syslog, macros::*},
     futures::prelude::*,
     parking_lot::Mutex,
-    std::collections::HashSet,
-    std::iter::FromIterator,
     std::sync::Arc,
 };
 
@@ -119,16 +115,7 @@
         fx_log_err!("Error fetching cloud actions index: {}", e);
         vec![]
     });
-    let local_actions = get_local_actions().await.unwrap_or_else(|e| {
-        fx_log_err!("Error fetching local actions index: {}", e);
-        vec![]
-    });
-    // Remove duplicates by moving both collections through a HashSet
-    let actions_arc = Arc::new(
-        HashSet::<Action>::from_iter(cloud_actions.into_iter().chain(local_actions.into_iter()))
-            .into_iter()
-            .collect::<Vec<Action>>(),
-    );
+    let actions_arc = Arc::new(cloud_actions);
 
     let storage =
         LedgerStorage::new().map(|s| Box::new(s) as Box<dyn StoryStorage>).unwrap_or_else(|_| {
@@ -185,7 +172,12 @@
 
 #[cfg(test)]
 mod test {
-    use {super::*, fuchsia_async as fasync};
+    use {
+        super::*,
+        crate::models::Action,
+        fuchsia_async as fasync,
+        std::{collections::HashSet, iter::FromIterator},
+    };
 
     // Verify the logic for removing duplicates
     #[fasync::run_singlethreaded(test)]