refactor

config/contracts.json

@@ -32,7 +32,48 @@
       },
       "UpdatableInstance": { 
         "deploy": false
-      } 
+      },
+      "SNT": {
+        "instanceOf": "MiniMeToken",
+        "deploy": true,
+        "args": [
+          "$MiniMeTokenFactory",
+          0,
+          0,
+          "TestMiniMeToken",
+          18,
+          "TST",
+          true
+        ]
+      },
+      "DelegationProxyFactory": {
+        "deploy": true
+      },
+      "DelegationProxy": {
+        "deploy": false
+      },
+      "DelegationProxyView": {
+        "deploy": false
+      },
+      "DelegationProxyKernel": { 
+        "deploy": false
+      },
+      "TrustNetwork": {
+        "deploy" : false
+      },
+      "ProposalCuration": { 
+        "deploy": false
+      },
+      "ProposalManager": { 
+        "deploy": false
+      },
+      "Democracy": {
+        "deploy": true,
+        "args": [
+          "$SNT",
+          "$DelegationProxyFactory"
+        ]
+      }
     }
   }
 }

contracts/democracy/DelegationProxy.sol

@@ -17,7 +17,7 @@ contract DelegationProxy is DelegationProxyInterface {
     /**
      * @notice Calls Constructor
      */
-    function DelegationProxy(address _parentProxy) public {
+    constructor(address _parentProxy) public {
         parentProxy = _parentProxy;
     }
 
@@ -258,7 +258,7 @@ contract DelegationProxy is DelegationProxyInterface {
      */
     function _updateDelegate(address _from, address _to) internal {
         require(delegationOfAt(_to, block.number) != msg.sender); //block impossible circular delegation
-        Delegate(_from, _to);
+        emit Delegate(_from, _to);
         Delegation memory _newFrom; //allocate memory
         Delegation[] storage fromHistory = delegations[_from];
         if (fromHistory.length > 0) { //have old config?

contracts/democracy/DelegationProxyFactory.sol

@@ -12,7 +12,7 @@ import "../deploy/Instance.sol";
  */
 contract DelegationProxyFactory is Factory {
 
-    function DelegationProxyFactory() 
+    constructor() 
         Factory(new DelegationProxyKernel()) 
         public 
     { }

contracts/democracy/DelegationProxyKernel.sol

@@ -14,7 +14,7 @@ contract DelegationProxyKernel is InstanceStorage, DelegationProxyView {
     /**
      * @notice Constructor of the model - only knows about watchdog that can trigger upgrade
      */
-    function DelegationProxyKernel() DelegationProxy(0x0) public {
+    constructor() DelegationProxyView(0x0) public {
         ready = true; 
     }
 

contracts/democracy/DelegationProxyView.sol

@@ -12,12 +12,16 @@ contract DelegationProxyView is DelegationProxy {
 
     //storage of preprocessed view of FinalDelegate
     mapping(bytes32 => FinalDelegate) public delegationView;
-
+    
     struct FinalDelegate {
         address delegate;
         bool found;
     }
 
+    constructor(address _parentTopic) DelegationProxy(0x0) public {
+
+    }
+
     /**
      * @notice Reads the final delegate of `_who` at block number `_block`.
      * @param _who Address to lookup.

contracts/democracy/Democracy.sol

@@ -1,12 +1,18 @@
 pragma solidity ^0.4.21;
 
-import "./DemocracyInterface.sol";
+import "../token/MiniMeTokenInterface.sol";
+import "./DelegationProxyFactory.sol";
+import "./TrustNetwork.sol";
+import "./ProposalCuration.sol";
 import "./ProposalManager.sol";
-import "./FeeRecycler.sol";
 
 
-contract Democracy is DemocracyInterface {
+contract Democracy {
 
+    MiniMeTokenInterface public token;
+    TrustNetwork public trustNet;
+    ProposalManager public proposalManager;
+
     mapping (bytes32 => Allowance) topicAllowance;
     mapping (uint256 => bool) executedProposals;
 
@@ -15,11 +21,10 @@ contract Democracy is DemocracyInterface {
         mapping(bytes32 => bool) calls;
     }
 
-    function Democracy(MiniMeTokenInterface _token, TrustNetworkInterface _trustNetwork) public {
+    constructor(MiniMeTokenInterface _token, DelegationProxyFactory _delegationProxyFactory) public {
         token = _token;
-        trustNet = _trustNetwork;
-        feeCollector = new FeeRecycler(_token);
-        proposalManager = new ProposalManager(_token, _trustNetwork, feeCollector);
+        trustNet = new TrustNetwork(_delegationProxyFactory);
+        proposalManager = new ProposalCuration(_token, trustNet).proposalManager();
     }
 
     function allowTopicSpecific(bytes32 _topic, address _destination, bytes4 _allowedCall, bool allowance)