Skip to content
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.

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

Update project references #121

Merged
merged 2 commits into from
May 7, 2018
Merged

Update project references #121

merged 2 commits into from
May 7, 2018

Conversation

germartinez
Copy link
Contributor

Updated to be consistent with the new project names.
package-lock.json and /dist must be regenerated.

@germartinez germartinez requested a review from cag May 4, 2018 15:46
README.md Outdated

[![Slack Status](https://slack.gnosis.pm/badge.svg)](https://slack.gnosis.pm)

## Getting Started

See the [documentation](https://gnosisjs.readthedocs.io/en/latest/).
See the [documentation](https://pm-js.readthedocs.io/en/latest/).
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Be careful with this.

@@ -31,7 +31,7 @@ async function createDescription () {
createDescription()
```

Of course, future events will come to pass, and once they do, the outcome should be determinable. Oracles report on the outcome of events. The simplest oracle contract provided by Gnosis is a [`CentralizedOracle`](https://gnosis-contracts.readthedocs.io/en/latest/CentralizedOracle.html), and it is controlled by a single entity: the `owner` of the contract, which is a single Ethereum address, and which will from this point forward in this guide be referred to as the centralized oracle itself.
Of course, future events will come to pass, and once they do, the outcome should be determinable. Oracles report on the outcome of events. The simplest oracle contract provided by Gnosis is a [`CentralizedOracle`](https://pm-contracts.readthedocs.io/en/latest/CentralizedOracle.html), and it is controlled by a single entity: the `owner` of the contract, which is a single Ethereum address, and which will from this point forward in this guide be referred to as the centralized oracle itself.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Be careful with this.

> ```
> https://gnosisdb.rinkeby.gnosis.pm/api/events/EVENT_ADDRESS
> https://pm-trading-db.rinkeby.gnosis.pm/api/events/EVENT_ADDRESS
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Be careful with this.

@cag
Copy link
Contributor

cag commented May 4, 2018

I'm gonna hold off for a moment so that all the RtD stuff can be finalized

@cag cag force-pushed the update-project-references branch 4 times, most recently from 8b88896 to 8832aca Compare May 7, 2018 22:41
Copy link
Contributor

@cag cag left a comment

Choose a reason for hiding this comment

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

🎰 🎲 🎴

"nodebuild": "babel src/ --out-dir dist --source-maps",
"webbuild": "webpack && cross-env WEBPACK_ENV=minified webpack -p",
"dev": "run-with-testrpc 'npm run migrate && webpack-dev-server'",
"test": "run-with-testrpc -l 40000000 'npm run migrate && npm run test-manual'",
"test-manual": "multidep test/multidep.json && mocha --timeout 120000 --require babel-core/register $MOCHA_OPTS",
"test-gnosisdb": "cross-env GNOSIS_OPTIONS='{\"ipfs\":{\"host\":\"localhost\",\"port\":5001,\"protocol\":\"http\"}}' npm run test-manual",
"test-pm-trading-db": "cross-env GNOSIS_OPTIONS='{\"ipfs\":{\"host\":\"localhost\",\"port\":5001,\"protocol\":\"http\"}}' npm run test-manual",
Copy link
Contributor

Choose a reason for hiding this comment

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

@denisgranha Gotta remember about this script name change...

@@ -92,8 +92,8 @@ describe('Gnosis', function () {

await gnosis.setWeb3Provider(ganache.provider({ network_id: 4 }))

assert.equal(gnosis.olympiaToken.address, '0xa0c107db0e9194c18359d3265289239453b56cf2')
assert.equal(gnosis.olympiaAddressRegistry.address, '0x79da1c9ef6bf6bc64e66f8abffddc1a093e50f13')
assert.equal(gnosis.olympiaToken.address, '0x979861df79c7408553aaf20c01cfb3f81ccf9341')
Copy link
Contributor

Choose a reason for hiding this comment

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

I know these changed upstream... I can't remember if that was intentional 😅

@cag cag force-pushed the update-project-references branch from 8832aca to 3bbd6a3 Compare May 7, 2018 22:52
@cag cag merged commit f562a95 into master May 7, 2018
@denisgranha denisgranha deleted the update-project-references branch October 12, 2018 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants