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

updated to new solidity keywords and linting

This commit is contained in:
Ricardo Guilherme Schmidt 2018-03-30 02:31:08 -03:00
parent d91bfb7f8e
commit 212f60d5f1
10 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contracts/democracy/DelegationProxy.sol
View File

@ -39,7 +39,7 @@ contract DelegationProxy is DelegationProxyInterface {
*/
function delegatedTo(address _who)
public
constant
view
returns (address)
{
return delegatedToAt(_who, block.number);
@ -52,7 +52,7 @@ contract DelegationProxy is DelegationProxyInterface {
*/
function delegationOf(address _who)
public
constant
view
returns(address)
{
return delegationOfAt(_who, block.number);
@ -69,7 +69,7 @@ contract DelegationProxy is DelegationProxyInterface {
MiniMeTokenInterface _token
)
public
constant
view
returns(uint256 _total)
{
return influenceOfAt(_who, _token, block.number);
@ -86,7 +86,7 @@ contract DelegationProxy is DelegationProxyInterface {
address _token
)
public
constant
view
returns(uint256 _total)
{
return delegatedInfluenceFromAt(_who, _token, block.number, address(this));
@ -105,7 +105,7 @@ contract DelegationProxy is DelegationProxyInterface {
uint _block
)
public
constant
view
returns(uint256 _total)
{
return delegatedInfluenceFromAt(_who, _token, _block, address(this));
@ -123,7 +123,7 @@ contract DelegationProxy is DelegationProxyInterface {
uint _block
)
public
constant
view
returns (address directDelegate)
{
Delegation[] storage checkpoints = delegations[_who];
@ -155,7 +155,7 @@ contract DelegationProxy is DelegationProxyInterface {
uint _block
)
public
constant
view
returns(address finalDelegate)
{
finalDelegate = delegatedToAt(_who, _block);
@ -182,7 +182,7 @@ contract DelegationProxy is DelegationProxyInterface {
address _childProxy
)
public
constant
view
returns(uint256 _total)
{
Delegation[] storage checkpoints = delegations[_who];
@ -238,7 +238,7 @@ contract DelegationProxy is DelegationProxyInterface {
uint _block
)
public
constant
view
returns(uint256 _total)
{
if (delegationOfAt(_who, _block) == _who) { //is endpoint of delegation?
@ -286,7 +286,7 @@ contract DelegationProxy is DelegationProxyInterface {
* @param _block The block number to retrieve the value at.
* @return The delegation being queried.
*/
function _getMemoryAt(Delegation[] storage checkpoints, uint _block) internal constant returns (Delegation d) {
function _getMemoryAt(Delegation[] storage checkpoints, uint _block) internal view returns (Delegation d) {
// Case last checkpoint is the one;
if (_block >= checkpoints[checkpoints.length-1].fromBlock) {
d = checkpoints[checkpoints.length-1];

18
contracts/democracy/DelegationProxyInterface.sol
View File

@ -34,7 +34,7 @@ contract DelegationProxyInterface {
*/
function delegatedTo(address _who)
public
constant
view
returns (address directDelegate);
/**
@ -44,7 +44,7 @@ contract DelegationProxyInterface {
*/
function delegationOf(address _who)
public
constant
view
returns(address finalDelegate);
/**
@ -58,7 +58,7 @@ contract DelegationProxyInterface {
MiniMeTokenInterface _token
)
public
constant
view
returns(uint256 _total);
/**
@ -72,7 +72,7 @@ contract DelegationProxyInterface {
address _token
)
public
constant
view
returns(uint256 _total);
/**
@ -88,7 +88,7 @@ contract DelegationProxyInterface {
uint _block
)
public
constant
view
returns(uint256 _total);
/**
@ -103,7 +103,7 @@ contract DelegationProxyInterface {
uint _block
)
public
constant
view
returns (address directDelegate);
/**
@ -117,7 +117,7 @@ contract DelegationProxyInterface {
uint _block
)
public
constant
view
returns(address finalDelegate);
/**
@ -135,7 +135,7 @@ contract DelegationProxyInterface {
address _childProxy
)
public
constant
view
returns(uint256 _total);
/**
@ -151,7 +151,7 @@ contract DelegationProxyInterface {
uint _block
)
public
constant
view
returns(uint256 _total);

2
contracts/democracy/DelegationProxyView.sol
View File

@ -29,7 +29,7 @@ contract DelegationProxyView is DelegationProxy {
uint _block
)
public
constant
view
returns(address finalDelegate)
{
bytes32 searchIndex = keccak256(_who, _block);

2
contracts/democracy/Democracy.sol
View File

@ -1,8 +1,10 @@
pragma solidity ^0.4.21;
import "./DemocracyInterface.sol";
import "./ProposalManager.sol";
import "./FeeRecycler.sol";
contract Democracy is DemocracyInterface {
mapping (bytes32 => Allowance) topicAllowance;

2
contracts/democracy/DemocracyInterface.sol
View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.17;
pragma solidity ^0.4.21;
import "./DemocracyStorage.sol";

2
contracts/democracy/DemocracyStorage.sol
View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.17;
pragma solidity ^0.4.21;
import "../deploy/InstanceStorage.sol";
import "../token/MiniMeTokenInterface.sol";

4
contracts/democracy/ProposalManager.sol
View File

@ -79,7 +79,7 @@ contract ProposalManager is ProposalManagerInterface, Controlled {
function getProposal(uint _proposalId)
public
constant
view
returns (
bytes32 topic,
bytes32 txHash,
@ -92,7 +92,7 @@ contract ProposalManager is ProposalManagerInterface, Controlled {
function getProposalTxHash(uint _proposalId)
public
constant
view
returns(bytes32)
{
return proposals[_proposalId].txHash;

2
contracts/democracy/ProposalManagerInterface.sol
View File

@ -50,7 +50,7 @@ contract ProposalManagerInterface {
event ProposalResult(uint256 _proposalId, Vote finalResult);
function addProposal(bytes32 _topic, bytes32 _txHash, uint _visibilityFee) public returns (uint);
function getProposal(uint _id) public constant returns (bytes32 topic, bytes32 txHash, bool approved);
function getProposal(uint _id) public view returns (bytes32 topic, bytes32 txHash, bool approved);
function voteProposal(uint _proposal, Vote _vote) public;
function tabulateVote(uint _proposal, address _delegator) public;
function tabulateVeto(uint _proposal, address _delegator) public;

2
contracts/democracy/TrustNetwork.sol
View File

@ -40,7 +40,7 @@ contract TrustNetwork is TrustNetworkInterface, Controlled {
topics[topicId] = newTopic(vote, veto);
}
function getTopic(bytes32 _topicId) public constant returns (DelegationProxyInterface vote, DelegationProxyInterface veto) {
function getTopic(bytes32 _topicId) public view returns (DelegationProxyInterface vote, DelegationProxyInterface veto) {
Topic memory topic = topics[_topicId];
vote = topic.voteDelegation;
veto = topic.vetoDelegation;

2
contracts/democracy/TrustNetworkInterface.sol
View File

@ -5,7 +5,7 @@ import "./DelegationProxyInterface.sol";
contract TrustNetworkInterface {
function addTopic(bytes32 topicId, bytes32 parentTopic) public;
function getTopic(bytes32 _topicId) public constant returns (DelegationProxyInterface vote, DelegationProxyInterface veto);
function getTopic(bytes32 _topicId) public view returns (DelegationProxyInterface vote, DelegationProxyInterface veto);
function getVoteDelegation(bytes32 _topicId) public view returns (DelegationProxyInterface voteDelegation);
function getVetoDelegation(bytes32 _topicId) public view returns (DelegationProxyInterface vetoDelegation);
}