From c69251ddd239eb8578f03872427de6df98b64cd3 Mon Sep 17 00:00:00 2001 From: MestryOmkar Date: Tue, 25 Sep 2018 11:43:29 +0530 Subject: [PATCH] update smart contract, hard-code first 3-masternodes --- contracts/validator/validator.go | 4 ++-- contracts/validator/validator_test.go | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/contracts/validator/validator.go b/contracts/validator/validator.go index b56145b9eb..0cf8889593 100644 --- a/contracts/validator/validator.go +++ b/contracts/validator/validator.go @@ -27,8 +27,8 @@ func NewValidator(transactOpts *bind.TransactOpts, contractAddr common.Address, }, nil } -func DeployValidator(transactOpts *bind.TransactOpts, contractBackend bind.ContractBackend, candidates []common.Address, caps []*big.Int) (common.Address, *Validator, error) { - validatorAddr, _, _, err := contract.DeployXDCValidator(transactOpts, contractBackend, candidates, caps, big.NewInt(50000), big.NewInt(99), big.NewInt(100)) +func DeployValidator(transactOpts *bind.TransactOpts, contractBackend bind.ContractBackend) (common.Address, *Validator, error) { + validatorAddr, _, _, err := contract.DeployXDCValidator(transactOpts, contractBackend, big.NewInt(50000), big.NewInt(99), big.NewInt(100)) if err != nil { return validatorAddr, nil, err } diff --git a/contracts/validator/validator_test.go b/contracts/validator/validator_test.go index 15d64f002b..b9759e2e9b 100644 --- a/contracts/validator/validator_test.go +++ b/contracts/validator/validator_test.go @@ -1,32 +1,31 @@ package validator - import ( +import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" ) - var ( +var ( key, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") addr = crypto.PubkeyToAddress(key.PublicKey) ) - func TestValidator(t *testing.T) { +func TestValidator(t *testing.T) { contractBackend := backends.NewSimulatedBackend(core.GenesisAlloc{addr: {Balance: big.NewInt(1000000000)}}) transactOpts := bind.NewKeyedTransactor(key) - _, validator, err := DeployValidator(transactOpts, contractBackend, []common.Address{addr}, []*big.Int{big.NewInt(0)}) + _, validator, err := DeployValidator(transactOpts, contractBackend) if err != nil { t.Fatalf("can't deploy root registry: %v", err) } contractBackend.Commit() - candidates, err := validator.GetCandidates() + candidates, err := validator.GetCandidates() if err != nil { t.Fatalf("can't get candidates: %v", err) }