Merge pull request #24 from consensus-shipyard/valstring

Fix validator types
consensus-shipyard · Aug 1, 2023 · 49fa8a0 · 49fa8a0
2 parents 64aa908 + ce6bec5
commit 49fa8a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-.idea
+.idea
+.DS_Store
diff --git a/validator/validator.go b/validator/validator.go
@@ -68,11 +68,6 @@ type Validator struct {
 	Weight  *abi.TokenAmount `json:"weight,omitempty"`
 }
 
-func NewValidator(a addr.Address, netAddr string) *Validator {
-	w := abi.NewTokenAmount(0)
-	return &Validator{Addr: a, NetAddr: netAddr, Weight: &w}
-}
-
 func NewValidatorWithWeight(a addr.Address, netAddr string, w *big.Int) *Validator {
 	return &Validator{Addr: a, NetAddr: netAddr, Weight: w}
 }
@@ -97,7 +92,7 @@ func (v *Validator) Bytes() ([]byte, error) {
 }
 
 func (v *Validator) String() string {
-	return fmt.Sprintf("%s@%s", v.Addr.String(), v.NetAddr)
+	return fmt.Sprintf("%s@%s:%s", v.Addr.String(), v.NetAddr, v.Weight)
 }
 
 func SplitAndTrimEmpty(s, sep, cutset string) []string {