status-im
/
status-network-token
mirror of https://github.com/status-im/status-network-token.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #96 from status-im/sgtOwned 

Sgt Controller should not be SGT exchange.
This commit is contained in:
Jarrad 2017-06-16 14:25:34 +08:00 committed by GitHub
parent 29f65d0f9b d06b8fab2d
commit 4d262017b7
4 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contracts/StatusContribution.sol
View File

@ -141,7 +141,6 @@ contract StatusContribution is Owned, TokenController {
destTokensSecondarySale = _destTokensSecondarySale; destTokensSecondarySale = _destTokensSecondarySale;
require(_sgt != 0x0); require(_sgt != 0x0);
require(MiniMeToken(_sgt).controller() == _destTokensSgt);
SGT = MiniMeToken(_sgt); SGT = MiniMeToken(_sgt);
require(_destTokensSgt != 0x0); require(_destTokensSgt != 0x0);

1
test/claimExternal.js
View File

@ -70,7 +70,6 @@ contract("StatusContribution", (accounts) => {
sgtExchanger.address); sgtExchanger.address);
await snt.changeController(statusContribution.address); await snt.changeController(statusContribution.address);
await sgt.changeController(sgtExchanger.address);
await statusContribution.initialize( await statusContribution.initialize(
snt.address, snt.address,

2
test/contribution.js
View File

@ -72,7 +72,6 @@ contract("StatusContribution", (accounts) => {
sgtExchanger.address); sgtExchanger.address);
await snt.changeController(statusContribution.address); await snt.changeController(statusContribution.address);
await sgt.changeController(sgtExchanger.address);
await statusContribution.initialize( await statusContribution.initialize(
snt.address, snt.address,
@ -95,7 +94,6 @@ contract("StatusContribution", (accounts) => {
it("Check initial parameters", async () => { it("Check initial parameters", async () => {
assert.equal(await snt.controller(), statusContribution.address); assert.equal(await snt.controller(), statusContribution.address);
assert.equal(await sgt.controller(), sgtExchanger.address);
}); });
it("Checks that no body can buy before the sale starts", async () => { it("Checks that no body can buy before the sale starts", async () => {

2
test/dynamicCeiling.js
View File

@ -193,7 +193,7 @@ contract("DynamicCeiling", (accounts) => {
web3.sha3("pwd0"), web3.sha3("pwd0"),
web3.sha3("pwd1"), web3.sha3("pwd1"),
web3.sha3("pwd2"), web3.sha3("pwd2"),
], ]
); );
assert.equal(await dynamicCeiling.currentIndex(), 0); assert.equal(await dynamicCeiling.currentIndex(), 0);