Skip to content

Commit

Permalink
Merge pull request #2 from devicehive/development
Browse files Browse the repository at this point in the history
changed location of ethereum-config, updated readme
  • Loading branch information
tmatvienko authored Jun 20, 2018
2 parents 5c23137 + 029dfea commit 538e35a
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Add ethereum url, account's address and account's password to config file *(path

## Specify plugin configuration
In [plugin configuration](#Plugin.config) there are already [playground](https://playground.devicehive.com) urls, however you can run [devicehive](https://github.com/devicehive/devicehive-docker) locally and write your own.
Add plugin topic and access token. Also add user and password for [devicehive admin panel](https://github.com/devicehive/devicehive-admin-panel).
Add plugin topic and access token. Also add user access token, which you can copy from playground.

# Simple start

Expand All @@ -38,6 +38,7 @@ Logger will notify you about results. You will see message `Transaction has been

You can find plugin configuration in `./config.json`
Plugin part of configuration you can find [here](https://github.com/devicehive/devicehive-plugin-core-node#configuration).
Also plugin authentication process and options are described [here](https://github.com/devicehive/devicehive-plugin-core-node/blob/master/README.md#plugin-authentication).

**_PLUGIN_PROPS_** - plugin's properties. There are only filters at the moment.
**_PLUGIN_PROPS.OVERRIDE_** - set it to true and plugin's filters will be updated according to config.
Expand All @@ -62,7 +63,7 @@ Examples:

## Ethereum smart contract

You can find configuration in `./src/ethereum-node/config.json`
You can find configuration in `./ethereum-config.json`

* **_CONTRACT_PATH_** - path to your smart contract, <br />
* **_ETHEREUM_URL_** - url to ethereum node, <br />
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const { DeviceHivePlugin } = require(`devicehive-plugin-core`);

const log = require('./src/utils/Logger');
const pluginConfig = require('./config/index');
const ethereumConfig = require('./src/ethereum-node/config.json');
const ethereumConfig = require('./ethereum-config.json');
const EthereumAccount = require('./src/ethereum-node/EthereumAccount');
const PluginContract = require('./src/ethereum-node/PluginContract');
const PluginEthereumService = require('./src/PluginEthereumService');
Expand Down
2 changes: 1 addition & 1 deletion src/ethereum-node/GasLimiter.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const ethereumConfig = require ('./config.json');
const ethereumConfig = require ('../../ethereum-config.json');

class GasLimiter {
constructor(gasLimit, timePeriod) {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/PluginEthereumUtils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const config = require('../ethereum-node/config.json');
const config = require('../../ethereum-config.json');
const Utils = require('./Utils');

class PluginEthereumUtils {
Expand Down

0 comments on commit 538e35a

Please sign in to comment.