diff --git a/internal/bfa/node.go b/internal/bfa/node.go index 7c85a16b63841118d570e2a1d3ec3d0be71b01a2..225a0609840a6b1847d7c498e8bc73da78dfb6fe 100644 --- a/internal/bfa/node.go +++ b/internal/bfa/node.go @@ -8,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/consensus/clique" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/rpc" - . "gitlab.bfa.ar/miguel/bfa/internal/util" + "gitlab.bfa.ar/miguel/bfa/internal/util" ) type Node rpc.Client @@ -87,7 +87,7 @@ func (genesis Genesis) String() string { var Self = Address{} // Empty address to represent the address of the caller func (node *Node) Call(result interface{}, method string, args ...interface{}) { - Check((*rpc.Client)(node).Call(result, method, args...)) + util.Check((*rpc.Client)(node).Call(result, method, args...)) } func (node *Node) CallWithError(result interface{}, method string, args ...interface{}) error { @@ -142,7 +142,7 @@ func (node *Node) BlockNumberInRange(number int64) (blockNumber int64) { case number == -1, number > latest: blockNumber = latest case number < 0: - blockNumber = Max(0, latest+1+number) + blockNumber = util.Max(0, latest+1+number) default: blockNumber = number } @@ -210,7 +210,7 @@ func (node *Node) SealersAtBlock(blockNumber int64) (signers []Address) { if blockNumber == -1 { return node.Sealers() } - node.Call(&signers, "clique_getSigners", Int64ToHex(blockNumber)) + node.Call(&signers, "clique_getSigners", util.Int64ToHex(blockNumber)) return } @@ -315,7 +315,7 @@ func (node *Node) SealersStatus(blockNumber int64) (status map[Address]*SealerSt notSeen := int64(len(status)) block := node.HeaderByNumber(blockNumber) blockNumber = block.Number.Int64() - until := Max(1, blockNumber-SealerRounds*notSeen) + until := util.Max(1, blockNumber-SealerRounds*notSeen) for notSeen > 0 { signer := node.BlockSigner(blockNumber) if _, ok := status[signer]; !ok { diff --git a/internal/util/util.go b/internal/util/util.go index deb9778c92cc8fade1d9af760a4ba3244922f3da..15564b152992602fb58f5b5785e9631d5b647813 100644 --- a/internal/util/util.go +++ b/internal/util/util.go @@ -3,12 +3,13 @@ package util import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common" "log" "os" "runtime" "strconv" "strings" + + "github.com/ethereum/go-ethereum/common" ) func Contains(slice []string, s string) bool { @@ -64,7 +65,6 @@ func PrintJson(s interface{}) { v, err := json.MarshalIndent(s, "", " ") Check(err) fmt.Println(string(v)) - return } func isMixedCase(address string) bool {