forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #134 from thanhson1085/master

Browse source 
remove nodeId in smart contract
This commit is contained in:
Tuna 2018-08-14 16:58:39 +07:00 committed by GitHub
commit 4d1aa5ea51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 206 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
contracts/validator/contract/TomoValidator.sol
View file

@ -9,12 +9,10 @@ contract TomoValidator {
event Unvote(address _voter, address _candidate, uint256 _cap); event Unvote(address _voter, address _candidate, uint256 _cap);
event Propose(address _owner, address _candidate, uint256 _cap); event Propose(address _owner, address _candidate, uint256 _cap);
event Resign(address _owner, address _candidate); event Resign(address _owner, address _candidate);
event SetNodeId(address _owner, address _candidate, string _nodeId);
event Withdraw(address _owner, uint256 _blockNumber, uint256 _cap); event Withdraw(address _owner, uint256 _blockNumber, uint256 _cap);
struct ValidatorState { struct ValidatorState {
address owner; address owner;
string nodeId;
bool isCandidate; bool isCandidate;
uint256 cap; uint256 cap;
mapping(address => uint256) voters; mapping(address => uint256) voters;
@ -97,7 +95,6 @@ contract TomoValidator {
candidates.push(_candidates[i]); candidates.push(_candidates[i]);
validatorsState[_candidates[i]] = ValidatorState({ validatorsState[_candidates[i]] = ValidatorState({
owner: _firstOwner, owner: _firstOwner,
nodeId: '',
isCandidate: true, isCandidate: true,
cap: _caps[i] cap: _caps[i]
}); });
@ -106,11 +103,10 @@ contract TomoValidator {
} }
} }
function propose(address _candidate, string _nodeId) external payable onlyValidCandidateCap onlyNotCandidate(_candidate) { function propose(address _candidate) external payable onlyValidCandidateCap onlyNotCandidate(_candidate) {
candidates.push(_candidate); candidates.push(_candidate);
validatorsState[_candidate] = ValidatorState({ validatorsState[_candidate] = ValidatorState({
owner: msg.sender, owner: msg.sender,
nodeId: _nodeId,
isCandidate: true, isCandidate: true,
cap: msg.value cap: msg.value
}); });
@ -137,10 +133,6 @@ contract TomoValidator {
return validatorsState[_candidate].cap; return validatorsState[_candidate].cap;
} }
function getCandidateNodeId(address _candidate) public view returns(string) {
return validatorsState[_candidate].nodeId;
}
function getCandidateOwner(address _candidate) public view returns(address) { function getCandidateOwner(address _candidate) public view returns(address) {
return validatorsState[_candidate].owner; return validatorsState[_candidate].owner;
} }
@ -177,11 +169,6 @@ contract TomoValidator {
emit Unvote(msg.sender, _candidate, _cap); emit Unvote(msg.sender, _candidate, _cap);
} }
function setNodeId(address _candidate, string _nodeId) public onlyOwner(_candidate) {
validatorsState[_candidate].nodeId = _nodeId;
emit SetNodeId(msg.sender, _candidate, _nodeId);
}
function resign(address _candidate) public onlyOwner(_candidate) onlyCandidate(_candidate) { function resign(address _candidate) public onlyOwner(_candidate) onlyCandidate(_candidate) {
validatorsState[_candidate].isCandidate = false; validatorsState[_candidate].isCandidate = false;
candidateCount = candidateCount - 1; candidateCount = candidateCount - 1;

6
contracts/validator/contract/interfaces/IValidator.sol
View file

@ -1,6 +0,0 @@
pragma solidity ^0.4.21;
interface IValidator {
function propose(address, string) external payable;
function vote(address) external payable;
}

199
contracts/validator/contract/validator.go
View file

File diff suppressed because one or more lines are too long

2
contracts/validator/validator_test.go
View file

@ -114,7 +114,7 @@ func TestRewardBalance(t *testing.T) {
opts := bind.NewKeyedTransactor(acc4Key) opts := bind.NewKeyedTransactor(acc4Key)
opts.Value = new(big.Int).SetUint64(50000) opts.Value = new(big.Int).SetUint64(50000)
acc4Validator, _ := NewValidator(opts, validatorAddr, contractBackend) acc4Validator, _ := NewValidator(opts, validatorAddr, contractBackend)
acc4Validator.Propose(acc3Addr, "http://") acc4Validator.Propose(acc3Addr)
contractBackend.Commit() contractBackend.Commit()
totalVote := 0 totalVote := 0