diff --git a/contracts/colony/ColonyStorage.sol b/contracts/colony/ColonyStorage.sol index ce7b965f08..dfadd371af 100755 --- a/contracts/colony/ColonyStorage.sol +++ b/contracts/colony/ColonyStorage.sol @@ -270,12 +270,12 @@ contract ColonyStorage is CommonStorage, ColonyDataTypes, ColonyNetworkDataTypes return size > 0; } + // slither-disable-next-line unused-return function isOwnExtension(address addr) internal returns (bool) { // Ensure addr is a contract first, otherwise `try` block will revert if (!isContract(addr)) { return false; } - // // Ensure addr is an extension installed in the colony, must check old & new formats - // // slither-disable-next-line unused-return + // Ensure addr is an extension installed in the colony, must check old & new formats try ColonyExtension(addr).identifier() returns (bytes32 extensionId) { return ( IColonyNetwork(colonyNetworkAddress).getExtensionInstallation(extensionId, address(this)) == addr || diff --git a/test-smoke/colony-storage-consistent.js b/test-smoke/colony-storage-consistent.js index 4c755295fb..dda7fe6bc9 100644 --- a/test-smoke/colony-storage-consistent.js +++ b/test-smoke/colony-storage-consistent.js @@ -154,11 +154,11 @@ contract("Contract Storage", (accounts) => { console.log("miningCycleStateHash:", miningCycleAccount.stateRoot.toString("hex")); console.log("tokenLockingStateHash:", tokenLockingAccount.stateRoot.toString("hex")); - expect(colonyNetworkAccount.stateRoot.toString("hex")).to.equal("2d8b407a3d5d1a48b07a00c968942ee7cb384961a5f166035a194cf7f8bd3245"); - expect(colonyAccount.stateRoot.toString("hex")).to.equal("36096952d464e6c70a0a3aa2ecf068dff7bc6af70ffe022d57d8e2342d39f989"); - expect(metaColonyAccount.stateRoot.toString("hex")).to.equal("6bee0085d000fc929e06c1281c162eaa7ac22ff9e2dcc520066e5e7720de6394"); - expect(miningCycleAccount.stateRoot.toString("hex")).to.equal("bcfee6939c375d042704e338652a1e2d1e6f7b0e69587b79e72bde08ca777927"); - expect(tokenLockingAccount.stateRoot.toString("hex")).to.equal("8b9242eb6e0fd017538f71e90c6ce9793839743e869bed54030861d3594453b1"); + expect(colonyNetworkAccount.stateRoot.toString("hex")).to.equal("dbbc46d3289f954f195a5e654674842649e94d4b80ef1333b93d9f47d427c48f"); + expect(colonyAccount.stateRoot.toString("hex")).to.equal("8da63822e605e999fa303e58b7f5421f3b4b683c8ae3d9832f6e3bd8a5780907"); + expect(metaColonyAccount.stateRoot.toString("hex")).to.equal("6cd575aceaee4dc0056375102384fc21b19241fb64120336f6e6957188091f3b"); + expect(miningCycleAccount.stateRoot.toString("hex")).to.equal("7fad525e1ecd8a701224c766c3b6341334ed52d73114b4ec243d18280f2afd46"); + expect(tokenLockingAccount.stateRoot.toString("hex")).to.equal("37e6b9b7b5c615f7fa2fb6a2bab8eb86f3233716944ae9c3e6050b411af53cfe"); }); }); });