Merge pull request #55 from qianbin/fix-authority-get-listed

fix(builtin): incorrect 'listed' value when there's only one node
vechain · Jun 29, 2018 · a788cfd · a788cfd
2 parents e723351 + b9152b8
commit a788cfd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/builtin/authority/authority.go b/builtin/authority/authority.go
@@ -71,7 +71,14 @@ func (a *Authority) setAddressPtr(key thor.Bytes32, addr *thor.Address) {
 // Get get candidate by node master address.
 func (a *Authority) Get(nodeMaster thor.Address) (listed bool, endorsor thor.Address, identity thor.Bytes32, active bool) {
 	entry := a.getEntry(nodeMaster)
-	return entry.IsListed(), entry.Endorsor, entry.Identity, entry.Active
+	if entry.IsLinked() {
+		return true, entry.Endorsor, entry.Identity, entry.Active
+	}
+	// if it's the only node, IsLinked will be false.
+	// check whether it's the head.
+	ptr := a.getAddressPtr(headKey)
+	listed = ptr != nil && *ptr == nodeMaster
+	return listed, entry.Endorsor, entry.Identity, entry.Active
 }
 
 // Add add a new candidate.
@@ -105,7 +112,7 @@ func (a *Authority) Add(nodeMaster thor.Address, endorsor thor.Address, identity
 // The entry is not removed, but set unlisted and inactive.
 func (a *Authority) Revoke(nodeMaster thor.Address) bool {
 	entry := a.getEntry(nodeMaster)
-	if !entry.IsListed() {
+	if !entry.IsLinked() {
 		return false
 	}
 
@@ -135,7 +142,7 @@ func (a *Authority) Revoke(nodeMaster thor.Address) bool {
 // Update update candidate's status.
 func (a *Authority) Update(nodeMaster thor.Address, active bool) bool {
 	entry := a.getEntry(nodeMaster)
-	if !entry.IsListed() {
+	if !entry.IsLinked() {
 		return false
 	}
 	entry.Active = active

diff --git a/builtin/authority/authority_test.go b/builtin/authority/authority_test.go
@@ -37,6 +37,7 @@ func TestAuthority(t *testing.T) {
 		expected interface{}
 	}{
 		{aut.Add(p1, p1, thor.Bytes32{}), true},
+		{M(aut.Get(p1)), []interface{}{true, p1, thor.Bytes32{}, true}},
 		{aut.Add(p2, p2, thor.Bytes32{}), true},
 		{aut.Add(p3, p3, thor.Bytes32{}), true},
 		{M(aut.Candidates(big.NewInt(10), thor.MaxBlockProposers)), []interface{}{

diff --git a/builtin/authority/types.go b/builtin/authority/types.go
@@ -36,6 +36,6 @@ func (e *entry) IsEmpty() bool {
 		e.Next == nil
 }
 
-func (e *entry) IsListed() bool {
+func (e *entry) IsLinked() bool {
 	return e.Prev != nil || e.Next != nil
 }
diff --git a/builtin/authority_native.go b/builtin/authority_native.go
@@ -56,7 +56,7 @@ func init() {
 			var nodeMaster common.Address
 			env.ParseArgs(&nodeMaster)
 
-			env.UseGas(thor.SloadGas)
+			env.UseGas(thor.SloadGas * 2)
 			listed, endorsor, identity, active := Authority.Native(env.State()).Get(thor.Address(nodeMaster))
 
 			return []interface{}{listed, endorsor, identity, active}
@@ -82,7 +82,7 @@ func init() {
 			var nodeMaster common.Address
 			env.ParseArgs(&nodeMaster)
 
-			env.UseGas(thor.SloadGas)
+			env.UseGas(thor.SloadGas * 2)
 			listed, endorsor, _, _ := Authority.Native(env.State()).Get(thor.Address(nodeMaster))
 			if !listed {
 				return []interface{}{false}