From c7f9a374f2c489f1607c447aabd8dbba652c7b12 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Fri, 10 Aug 2018 12:57:37 -0400 Subject: [PATCH] rename name to className so it matches contract object --- embark-ui/src/components/Contracts.js | 2 +- embark-ui/src/containers/ContractsContainer.js | 2 +- embark-ui/src/reducers/index.js | 2 +- embark-ui/src/reducers/selectors.js | 2 +- lib/modules/contracts_manager/index.js | 6 +----- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/embark-ui/src/components/Contracts.js b/embark-ui/src/components/Contracts.js index fa8be267..cbae96e3 100644 --- a/embark-ui/src/components/Contracts.js +++ b/embark-ui/src/components/Contracts.js @@ -24,7 +24,7 @@ const Contracts = ({contracts}) => ( bodyItems={ contracts.map((contract) => { return ([ - {content: {contract.name}}, + {content: {contract.className}}, {content: contract.address}, {content: contract.deploy.toString()} ]); diff --git a/embark-ui/src/containers/ContractsContainer.js b/embark-ui/src/containers/ContractsContainer.js index 1fcac360..3ed0350f 100644 --- a/embark-ui/src/containers/ContractsContainer.js +++ b/embark-ui/src/containers/ContractsContainer.js @@ -26,7 +26,7 @@ function mapStateToProps(state) { } ContractsContainer.propTypes = { - contracts: PropTypes.object, + contracts: PropTypes.array, fetchContracts: PropTypes.func }; diff --git a/embark-ui/src/reducers/index.js b/embark-ui/src/reducers/index.js index e613daaa..d62f0c6d 100644 --- a/embark-ui/src/reducers/index.js +++ b/embark-ui/src/reducers/index.js @@ -37,7 +37,7 @@ const filtrer = { return index === self.findIndex((t) => t.name === process.name); }, contracts: function(contract, index, self) { - return index === self.findIndex((t) => t.name === contract.name); + return index === self.findIndex((t) => t.className === contract.className); }, accounts: function(account, index, self) { return index === self.findIndex((t) => t.address === account.address); diff --git a/embark-ui/src/reducers/selectors.js b/embark-ui/src/reducers/selectors.js index bac61e4b..fb98d86a 100644 --- a/embark-ui/src/reducers/selectors.js +++ b/embark-ui/src/reducers/selectors.js @@ -51,7 +51,7 @@ export function getContracts(state) { } export function getContract(state, contractName) { - return state.entities.contracts.find((contract => contract.name === contractName)); + return state.entities.contracts.find((contract => contract.className === contractName)); } export function getContractProfile(state, contractName) { diff --git a/lib/modules/contracts_manager/index.js b/lib/modules/contracts_manager/index.js index aa168f75..b944ef07 100644 --- a/lib/modules/contracts_manager/index.js +++ b/lib/modules/contracts_manager/index.js @@ -63,10 +63,6 @@ class ContractsManager { self.events.emit('contractsState', self.contractsState()); }); - self.events.setCommandHandler("contracts:contract", (contractName, cb) => { - cb(self.getContract(contractName)); - }); - self.events.setCommandHandler("contracts:all", (contractName, cb) => { let contracts = self.listContracts(); let results = []; @@ -76,7 +72,7 @@ class ContractsManager { results.push({ index: i, - name: contract.className, + className: contract.className, deploy: contract.deploy, error: contract.error, address: contract.deployedAddress