Skip to content

Commit 448f72c

Browse files
committed
Rename deployCreateXIfNeeded
1 parent b8ec483 commit 448f72c

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

docs/interfaces/icolonynetwork.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -209,24 +209,6 @@ Calculate raw miner weight in WADs.
209209
|---|---|---|
210210
|_minerWeight|uint256|The weight of miner reward
211211

212-
### `checkDomainTokenReceiverDeployed(uint256 _domainId):address domainTokenReceiverAddress`
213-
214-
Function called by a colony to ensure that a DomainTokenReceiver has been deployed and set up correctly for a particular domain.
215-
216-
*Note: Should only be called by a colony.*
217-
218-
**Parameters**
219-
220-
|Name|Type|Description|
221-
|---|---|---|
222-
|_domainId|uint256|The domainId of the domain to check the deployment for
223-
224-
**Return Parameters**
225-
226-
|Name|Type|Description|
227-
|---|---|---|
228-
|domainTokenReceiverAddress|address|The address of the DomainTokenReceiver
229-
230212
### `claimMiningReward(address _recipient)`
231213

232214
Used by a user to claim any mining rewards due to them. This will place them in their balance or pending balance, as appropriate.
@@ -984,6 +966,24 @@ Get token locking contract address.
984966
|---|---|---|
985967
|_lockingAddress|address|Token locking contract address
986968

969+
### `idempotentDeployDomainTokenReceiver(uint256 _domainId):address domainTokenReceiverAddress`
970+
971+
Function called by a colony to ensure that a DomainTokenReceiver has been deployed and set up correctly for a particular domain.
972+
973+
*Note: Should only be called by a colony.*
974+
975+
**Parameters**
976+
977+
|Name|Type|Description|
978+
|---|---|---|
979+
|_domainId|uint256|The domainId of the domain to check the deployment for
980+
981+
**Return Parameters**
982+
983+
|Name|Type|Description|
984+
|---|---|---|
985+
|domainTokenReceiverAddress|address|The address of the DomainTokenReceiver
986+
987987
### `initialise(address _resolver, uint256 _version)`
988988

989989
Initialises the colony network by setting the first Colony version resolver to `_resolver` address.

helpers/test-helper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1347,7 +1347,7 @@ exports.isXdai = async function isXdai() {
13471347
return chainId === XDAI_CHAINID || chainId === FORKED_XDAI_CHAINID;
13481348
};
13491349

1350-
exports.deployCreateXIfNeeded = async function deployCreateXIfNeeded() {
1350+
exports.idempotentDeployCreateX = async function idempotentDeployCreateX() {
13511351
// Deploy CreateX if it's not already deployed
13521352
const createXCode = await web3.eth.getCode(CREATEX_ADDRESS);
13531353
if (createXCode === "0x") {

test/truffle-fixture.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const {
8181
setupDomainTokenReceiverResolver,
8282
} = require("../helpers/upgradable-contracts");
8383
const { FORKED_XDAI_CHAINID, XDAI_CHAINID, UINT256_MAX, CREATEX_ADDRESS } = require("../helpers/constants");
84-
const { getChainId, hardhatRevert, hardhatSnapshot, deployCreateXIfNeeded, isXdai } = require("../helpers/test-helper");
84+
const { getChainId, hardhatRevert, hardhatSnapshot, idempotentDeployCreateX, isXdai } = require("../helpers/test-helper");
8585

8686
module.exports = async () => {
8787
if (postFixtureSnapshotId) {
@@ -143,7 +143,7 @@ async function deployContracts() {
143143
const reputationMiningCycleBinarySearch = await ReputationMiningCycleBinarySearch.new();
144144
ReputationMiningCycleBinarySearch.setAsDeployed(reputationMiningCycleBinarySearch);
145145

146-
await deployCreateXIfNeeded();
146+
await idempotentDeployCreateX();
147147
}
148148

149149
async function setupColonyNetwork() {

0 commit comments

Comments
 (0)