Skip to content

Commit

Permalink
find . -type f -not -path './.*' -exec sed -i -e "s/ethcore\.io/parit…
Browse files Browse the repository at this point in the history
…y.io/g" {} \; (openethereum#5528)
  • Loading branch information
rien authored and gavofyork committed May 2, 2017
1 parent da2f684 commit 02b54ff
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 34 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# [Parity](https://ethcore.io/parity.html)
# [Parity](https://parity.io/parity.html)
### Fast, light, and robust Ethereum implementation

### [Download latest release](https://github.com/paritytech/parity/releases)

[![build status](https://gitlab.ethcore.io/parity/parity/badges/master/build.svg)](https://gitlab.ethcore.io/parity/parity/commits/master) [![Coverage Status][coveralls-image]][coveralls-url] [![GPLv3][license-image]][license-url]
[![build status](https://gitlab.parity.io/parity/parity/badges/master/build.svg)](https://gitlab.parity.io/parity/parity/commits/master) [![Coverage Status][coveralls-image]][coveralls-url] [![GPLv3][license-image]][license-url]

### Join the chat!

Expand Down
2 changes: 1 addition & 1 deletion hash-fetch/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ mod tests {
}

fn fetch_with_abort(&self, url: &str, _abort: fetch::Abort) -> Self::Result {
assert_eq!(url, "https://ethcore.io/assets/images/ethcore-black-horizontal.png");
assert_eq!(url, "https://parity.io/assets/images/ethcore-black-horizontal.png");
future::ok(if self.return_success {
let cursor = ::std::io::Cursor::new(b"result");
fetch::Response::from_reader(cursor)
Expand Down
12 changes: 6 additions & 6 deletions hash-fetch/src/urlhint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ pub mod tests {

// then
assert_eq!(res, Some(URLHintResult::Content(Content {
url: "https://ethcore.io/assets/images/ethcore-black-horizontal.png".into(),
url: "https://parity.io/assets/images/ethcore-black-horizontal.png".into(),
mime: mime!(Image/Png),
owner: Address::from_str("deadcafebeefbeefcafedeaddeedfeedffffffff").unwrap(),
})))
Expand All @@ -395,11 +395,11 @@ pub mod tests {

#[test]
fn should_guess_mime_type_from_url() {
let url1 = "https://ethcore.io/parity";
let url2 = "https://ethcore.io/parity#content-type=image/png";
let url3 = "https://ethcore.io/parity#something&content-type=image/png";
let url4 = "https://ethcore.io/parity.png#content-type=image/jpeg";
let url5 = "https://ethcore.io/parity.png";
let url1 = "https://parity.io/parity";
let url2 = "https://parity.io/parity#content-type=image/png";
let url3 = "https://parity.io/parity#something&content-type=image/png";
let url4 = "https://parity.io/parity.png#content-type=image/jpeg";
let url5 = "https://parity.io/parity.png";


assert_eq!(guess_mime_type(url1), None);
Expand Down
2 changes: 1 addition & 1 deletion js/src/3rdparty/email-verification/terms-of-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ export default (
<li>We collect your email address when you use this service. This is temporarily kept in memory, and then encrypted and stored in our EU servers. We only retain the cryptographic hash of the email address to prevent duplicated accounts. The cryptographic hash of your email address is also stored on the blockchain which is public by design. You consent to this use.</li>
<li>You pay a fee for the cost of this service using the account you want to verify.</li>
<li>Your email address is transmitted to a third party EU email verification service mailjet for the sole purpose of the email verification. You consent to this use. Mailjet's privacy policy is here: <a href='https://www.mailjet.com/privacy-policy'>https://www.mailjet.com/privacy-policy</a>.</li>
<li><i>Parity Technology Limited</i> is registered in England and Wales under company number <code>09760015</code> and complies with the Data Protection Act 1998 (UK). You may contact us via email at <a href={ 'mailto:[email protected]' }>[email protected]</a>. Our general privacy policy can be found here: <a href={ 'https://ethcore.io/legal.html' }>https://ethcore.io/legal.html</a>.</li>
<li><i>Parity Technology Limited</i> is registered in England and Wales under company number <code>09760015</code> and complies with the Data Protection Act 1998 (UK). You may contact us via email at <a href={ 'mailto:[email protected]' }>[email protected]</a>. Our general privacy policy can be found here: <a href={ 'https://parity.io/legal.html' }>https://parity.io/legal.html</a>.</li>
</ul>
);
2 changes: 1 addition & 1 deletion js/src/3rdparty/sms-verification/terms-of-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ export default (
<li>We collect your phone number when you use this service. This is temporarily kept in memory, and then encrypted and stored in our EU servers. We only retain the cryptographic hash of the number to prevent duplicated accounts. You consent to this use.</li>
<li>You pay a fee for the cost of this service using the account you want to verify.</li>
<li>Your phone number is transmitted to a third party US SMS verification service Twilio for the sole purpose of the SMS verification. You consent to this use. Twilio’s privacy policy is here: <a href={ 'https://www.twilio.com/legal/privacy/developer' }>https://www.twilio.com/legal/privacy/developer</a>.</li>
<li><i>Parity Technology Limited</i> is registered in England and Wales under company number <code>09760015</code> and complies with the Data Protection Act 1998 (UK). You may contact us via email at <a href={ 'mailto:[email protected]' }>[email protected]</a>. Our general privacy policy can be found here: <a href={ 'https://ethcore.io/legal.html' }>https://ethcore.io/legal.html</a>.</li>
<li><i>Parity Technology Limited</i> is registered in England and Wales under company number <code>09760015</code> and complies with the Data Protection Act 1998 (UK). You may contact us via email at <a href={ 'mailto:[email protected]' }>[email protected]</a>. Our general privacy policy can be found here: <a href={ 'https://parity.io/legal.html' }>https://parity.io/legal.html</a>.</li>
</ul>
);
2 changes: 1 addition & 1 deletion js/src/lib.rs.in
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ impl WebApp for App {
Info {
name: "Parity UI",
version: env!("CARGO_PKG_VERSION"),
author: "Ethcore <admin@ethcore.io>",
author: "Ethcore <admin@parity.io>",
description: "New UI for Parity.",
icon_url: "icon.png",
}
Expand Down
6 changes: 3 additions & 3 deletions js/src/modals/FirstRun/TnC/tnc.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions js/src/views/Dapps/builtin.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"url": "chaindeploy",
"name": "Chain Deployment",
"description": "Deploy all basic contracts, names & applications to the network",
"author": "Parity Team <admin@ethcore.io>",
"author": "Parity Team <admin@parity.io>",
"version": "1.0.0",
"visible": false
},
Expand All @@ -12,7 +12,7 @@
"url": "tokendeploy",
"name": "Token Deployment",
"description": "Deploy new basic tokens that you are able to send around",
"author": "Parity Team <admin@ethcore.io>",
"author": "Parity Team <admin@parity.io>",
"version": "1.0.0",
"visible": true
},
Expand All @@ -21,7 +21,7 @@
"url": "registry",
"name": "Registry",
"description": "A global registry of addresses on the network",
"author": "Parity Team <admin@ethcore.io>",
"author": "Parity Team <admin@parity.io>",
"version": "1.0.0",
"visible": true
},
Expand All @@ -30,7 +30,7 @@
"url": "tokenreg",
"name": "Token Registry",
"description": "A registry of transactable tokens on the network",
"author": "Parity Team <admin@ethcore.io>",
"author": "Parity Team <admin@parity.io>",
"version": "1.0.0",
"visible": true,
"secure": true
Expand All @@ -40,7 +40,7 @@
"url": "signaturereg",
"name": "Method Registry",
"description": "A registry of method signatures for lookups on transactions",
"author": "Parity Team <admin@ethcore.io>",
"author": "Parity Team <admin@parity.io>",
"version": "1.0.0",
"visible": true
},
Expand All @@ -49,7 +49,7 @@
"url": "githubhint",
"name": "GitHub Hint",
"description": "A mapping of GitHub URLs to hashes for use in contracts as references",
"author": "Parity Team <admin@ethcore.io>",
"author": "Parity Team <admin@parity.io>",
"version": "1.0.0",
"visible": false,
"secure": true
Expand All @@ -59,7 +59,7 @@
"url": "localtx",
"name": "TxQueue Viewer",
"description": "Have a peek at the internals of your node's transaction queue",
"author": "Parity Team <admin@ethcore.io>",
"author": "Parity Team <admin@parity.io>",
"version": "1.0.0",
"visible": true,
"secure": true
Expand All @@ -69,7 +69,7 @@
"url": "dappreg",
"name": "Dapp Registration",
"description": "Enables the registration and content management of dapps on the network",
"author": "Parity Team <admin@ethcore.io>",
"author": "Parity Team <admin@parity.io>",
"version": "1.0.0",
"visible": false,
"secure": true
Expand All @@ -79,7 +79,7 @@
"url": "web",
"name": "Browser",
"description": "A Web 2.0 hosted pseudo-dapps browser",
"author": "Parity Team <admin@ethcore.io>",
"author": "Parity Team <admin@parity.io>",
"version": "1.0.0",
"visible": true,
"skipBuild": true,
Expand All @@ -91,7 +91,7 @@
"name": "Parity/Web3 console",
"description": "A Javascript development console complete with web3 and parity objects",
"version": "0.3",
"author": "Gav Wood <gavin@ethcore.io>",
"author": "Gav Wood <gavin@parity.io>",
"position": "top-right",
"visible": true,
"secure": true,
Expand Down
12 changes: 6 additions & 6 deletions parity/configuration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1369,13 +1369,13 @@ mod tests {
let conf0 = parse(&["parity"]);
let conf1 = parse(&["parity", "--jsonrpc-hosts", "none"]);
let conf2 = parse(&["parity", "--jsonrpc-hosts", "all"]);
let conf3 = parse(&["parity", "--jsonrpc-hosts", "ethcore.io,something.io"]);
let conf3 = parse(&["parity", "--jsonrpc-hosts", "parity.io,something.io"]);

// then
assert_eq!(conf0.rpc_hosts(), Some(Vec::new()));
assert_eq!(conf1.rpc_hosts(), Some(Vec::new()));
assert_eq!(conf2.rpc_hosts(), None);
assert_eq!(conf3.rpc_hosts(), Some(vec!["ethcore.io".into(), "something.io".into()]));
assert_eq!(conf3.rpc_hosts(), Some(vec!["parity.io".into(), "something.io".into()]));
}

#[test]
Expand All @@ -1386,13 +1386,13 @@ mod tests {
let conf0 = parse(&["parity"]);
let conf1 = parse(&["parity", "--ipfs-api-hosts", "none"]);
let conf2 = parse(&["parity", "--ipfs-api-hosts", "all"]);
let conf3 = parse(&["parity", "--ipfs-api-hosts", "ethcore.io,something.io"]);
let conf3 = parse(&["parity", "--ipfs-api-hosts", "parity.io,something.io"]);

// then
assert_eq!(conf0.ipfs_hosts(), Some(Vec::new()));
assert_eq!(conf1.ipfs_hosts(), Some(Vec::new()));
assert_eq!(conf2.ipfs_hosts(), None);
assert_eq!(conf3.ipfs_hosts(), Some(vec!["ethcore.io".into(), "something.io".into()]));
assert_eq!(conf3.ipfs_hosts(), Some(vec!["parity.io".into(), "something.io".into()]));
}

#[test]
Expand All @@ -1402,12 +1402,12 @@ mod tests {
// when
let conf0 = parse(&["parity"]);
let conf1 = parse(&["parity", "--ipfs-api-cors", "*"]);
let conf2 = parse(&["parity", "--ipfs-api-cors", "http://ethcore.io,http://something.io"]);
let conf2 = parse(&["parity", "--ipfs-api-cors", "http://parity.io,http://something.io"]);

// then
assert_eq!(conf0.ipfs_cors(), None);
assert_eq!(conf1.ipfs_cors(), Some(vec!["*".into()]));
assert_eq!(conf2.ipfs_cors(), Some(vec!["http://ethcore.io".into(),"http://something.io".into()]));
assert_eq!(conf2.ipfs_cors(), Some(vec!["http://parity.io".into(),"http://something.io".into()]));
}

#[test]
Expand Down
2 changes: 1 addition & 1 deletion rpc/src/v1/tests/mocked/parity_set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ fn rpc_parity_set_hash_content() {
let mut io = IoHandler::new();
io.extend_with(parity_set_client(&client, &miner, &updater, &network).to_delegate());

let request = r#"{"jsonrpc": "2.0", "method": "parity_hashContent", "params":["https://ethcore.io/assets/images/ethcore-black-horizontal.png"], "id": 1}"#;
let request = r#"{"jsonrpc": "2.0", "method": "parity_hashContent", "params":["https://parity.io/assets/images/ethcore-black-horizontal.png"], "id": 1}"#;
let response = r#"{"jsonrpc":"2.0","result":"0x2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e","id":1}"#;

assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
Expand Down
4 changes: 2 additions & 2 deletions rpc_cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
authors = ["Ethcore <admin@ethcore.io>"]
authors = ["Ethcore <admin@parity.io>"]
description = "Parity Cli Tool"
homepage = "http://ethcore.io"
homepage = "http://parity.io"
license = "GPL-3.0"
name = "rpc-cli"
version = "1.4.0"
Expand Down

0 comments on commit 02b54ff

Please sign in to comment.