Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Global Fetch Service #3915

Merged
merged 11 commits into from
Dec 22, 2016
Merged

Global Fetch Service #3915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
38fa18b
Dapps web
Dec 15, 2016
ac82701
Rewriting fetch
Dec 19, 2016
f089d1f
Merge branch 'master' into web-dapps
Dec 19, 2016
cd6d6df
Parity-wide fetch service
Dec 20, 2016
7386b2b
Obey the limits and support cancellation.
Dec 20, 2016
9b226ba
Removing temporary files.
Dec 20, 2016
7fd62dc
Actually use Fetch for dapps
Dec 20, 2016
2bb9255
Merge branch 'master' into web-dapps
Dec 21, 2016
10e7a8b
Re-implementing file fetching to avoid temporary files.
Dec 21, 2016
dc46d9e
Serde to 0.8.19
Dec 21, 2016
3e22b73
Fixing content & dapps fetch
Dec 21, 2016
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
344 changes: 271 additions & 73 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ rpc-cli = { path = "rpc_cli" }
parity-rpc-client = { path = "rpc_client" }
ethcore-light = { path = "ethcore/light" }
parity-hash-fetch = { path = "hash-fetch" }
parity-updater = { path = "updater" }
parity-updater = { path = "updater" }
parity-reactor = { path = "util/reactor" }

[target.'cfg(windows)'.dependencies]
winapi = "0.2"
Expand Down
2 changes: 2 additions & 0 deletions dapps/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ build = "build.rs"
rand = "0.3.14"
log = "0.3"
env_logger = "0.3"
futures = "0.1"
jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc.git" }
jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc.git" }
hyper = { default-features = false, git = "https://github.com/ethcore/hyper" }
Expand All @@ -33,6 +34,7 @@ ethcore-util = { path = "../util" }
fetch = { path = "../util/fetch" }
parity-ui = { path = "./ui" }
parity-hash-fetch = { path = "../hash-fetch" }
parity-reactor = { path = "../util/reactor" }

clippy = { version = "0.0.103", optional = true}

Expand Down
6 changes: 3 additions & 3 deletions dapps/src/api/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use hyper::header::AccessControlAllowOrigin;

use api::types::{App, ApiError};
use api::response;
use apps::fetcher::ContentFetcher;
use apps::fetcher::Fetcher;

use handlers::extract_url;
use endpoint::{Endpoint, Endpoints, Handler, EndpointPath};
Expand All @@ -33,11 +33,11 @@ use jsonrpc_http_server::cors;
pub struct RestApi {
cors_domains: Option<Vec<AccessControlAllowOrigin>>,
endpoints: Arc<Endpoints>,
fetcher: Arc<ContentFetcher>,
fetcher: Arc<Fetcher>,
}

impl RestApi {
pub fn new(cors_domains: Vec<String>, endpoints: Arc<Endpoints>, fetcher: Arc<ContentFetcher>) -> Box<Endpoint> {
pub fn new(cors_domains: Vec<String>, endpoints: Arc<Endpoints>, fetcher: Arc<Fetcher>) -> Box<Endpoint> {
Box::new(RestApi {
cors_domains: Some(cors_domains.into_iter().map(AccessControlAllowOrigin::Value).collect()),
endpoints: endpoints,
Expand Down
Loading