[ledger] drop NoNetworkService
This was a hack to run a few apptests with sync enabled but without
hitting the network. These tests now use fake cloud provider, so we
don't need the hack anymore.
LE-336 #comment [ledger] drop NoNetworkService
Change-Id: If9a6fb4f7246ae4848f449e0db598b2aae629a25
diff --git a/bin/ledger/app/app.cc b/bin/ledger/app/app.cc
index 894f580..63945ef 100644
--- a/bin/ledger/app/app.cc
+++ b/bin/ledger/app/app.cc
@@ -29,7 +29,6 @@
#include "peridot/bin/ledger/environment/environment.h"
#include "peridot/bin/ledger/fidl/internal.fidl.h"
#include "peridot/bin/ledger/network/network_service_impl.h"
-#include "peridot/bin/ledger/network/no_network_service.h"
namespace ledger {
@@ -39,14 +38,12 @@
constexpr fxl::StringView kMinFsName = "minfs";
constexpr fxl::TimeDelta kMaxPollingDelay = fxl::TimeDelta::FromSeconds(10);
constexpr fxl::StringView kNoMinFsFlag = "no_minfs_wait";
-constexpr fxl::StringView kNoNetworkForTesting = "no_network_for_testing";
constexpr fxl::StringView kNoStatisticsReporting =
"no_statistics_reporting_for_testing";
constexpr fxl::StringView kTriggerCloudErasedForTesting =
"trigger_cloud_erased_for_testing";
struct AppParams {
- bool no_network_for_testing = false;
bool trigger_cloud_erased_for_testing = false;
bool disable_statistics = false;
};
@@ -84,16 +81,11 @@
~App() override {}
bool Start() {
- if (app_params_.no_network_for_testing) {
- network_service_ =
- std::make_unique<ledger::NoNetworkService>(loop_.task_runner());
- } else {
- network_service_ = std::make_unique<ledger::NetworkServiceImpl>(
- loop_.task_runner(), [this] {
- return application_context_
- ->ConnectToEnvironmentService<network::NetworkService>();
- });
- }
+ network_service_ = std::make_unique<ledger::NetworkServiceImpl>(
+ loop_.task_runner(), [this] {
+ return application_context_
+ ->ConnectToEnvironmentService<network::NetworkService>();
+ });
environment_ = std::make_unique<Environment>(loop_.task_runner(),
network_service_.get());
if (app_params_.trigger_cloud_erased_for_testing) {
@@ -208,8 +200,6 @@
fxl::SetLogSettingsFromCommandLine(command_line);
ledger::AppParams app_params;
- app_params.no_network_for_testing =
- command_line.HasOption(ledger::kNoNetworkForTesting);
app_params.trigger_cloud_erased_for_testing =
command_line.HasOption(ledger::kTriggerCloudErasedForTesting);
app_params.disable_statistics =
diff --git a/bin/ledger/network/BUILD.gn b/bin/ledger/network/BUILD.gn
index 391f1d7..37aa0e3 100644
--- a/bin/ledger/network/BUILD.gn
+++ b/bin/ledger/network/BUILD.gn
@@ -12,8 +12,6 @@
"network_service.h",
"network_service_impl.cc",
"network_service_impl.h",
- "no_network_service.cc",
- "no_network_service.h",
]
public_deps = [
diff --git a/bin/ledger/network/no_network_service.cc b/bin/ledger/network/no_network_service.cc
deleted file mode 100644
index 3b392c9..0000000
--- a/bin/ledger/network/no_network_service.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "peridot/bin/ledger/network/no_network_service.h"
-
-#include <utility>
-
-#include "peridot/bin/ledger/callback/cancellable_helper.h"
-
-namespace ledger {
-
-NoNetworkService::NoNetworkService(fxl::RefPtr<fxl::TaskRunner> task_runner)
- : task_runner_(std::move(task_runner)) {}
-
-NoNetworkService::~NoNetworkService() {}
-
-fxl::RefPtr<callback::Cancellable> NoNetworkService::Request(
- std::function<network::URLRequestPtr()> /*request_factory*/,
- std::function<void(network::URLResponsePtr)> callback) {
- auto cancellable = callback::CancellableImpl::Create([] {});
-
- task_runner_->PostTask([callback = cancellable->WrapCallback(callback)] {
- network::URLResponsePtr response = network::URLResponse::New();
- response->error = network::NetworkError::New();
- response->error->code = 1;
- callback(std::move(response));
- });
- return cancellable;
-}
-
-} // namespace ledger
diff --git a/bin/ledger/network/no_network_service.h b/bin/ledger/network/no_network_service.h
deleted file mode 100644
index 8835720..0000000
--- a/bin/ledger/network/no_network_service.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef PERIDOT_BIN_LEDGER_NETWORK_NO_NETWORK_SERVICE_H_
-#define PERIDOT_BIN_LEDGER_NETWORK_NO_NETWORK_SERVICE_H_
-
-#include "lib/fxl/macros.h"
-#include "lib/fxl/tasks/task_runner.h"
-#include "lib/network/fidl/network_service.fidl.h"
-#include "peridot/bin/ledger/network/network_service.h"
-
-namespace ledger {
-
-class NoNetworkService : public NetworkService {
- public:
- explicit NoNetworkService(fxl::RefPtr<fxl::TaskRunner> task_runner);
- ~NoNetworkService() override;
-
- // NetworkService:
- fxl::RefPtr<callback::Cancellable> Request(
- std::function<network::URLRequestPtr()> request_factory,
- std::function<void(network::URLResponsePtr)> callback) override;
-
- private:
- fxl::RefPtr<fxl::TaskRunner> task_runner_;
-
- FXL_DISALLOW_COPY_AND_ASSIGN(NoNetworkService);
-};
-
-} // namespace ledger
-
-#endif // PERIDOT_BIN_LEDGER_NETWORK_NO_NETWORK_SERVICE_H_
