From 8a456132e56234938e8f3fe02a9b5fbbdb6650c7 Mon Sep 17 00:00:00 2001 From: AnilChinchawale Date: Sun, 2 Dec 2018 11:26:18 +0530 Subject: [PATCH] modify logic to adapt new readers --- contracts/blockSignerReader.go | 2 +- contracts/randomizeReader.go | 10 +++++----- contracts/validatorReader.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contracts/blockSignerReader.go b/contracts/blockSignerReader.go index a3b319eb52..0849f3aedd 100644 --- a/contracts/blockSignerReader.go +++ b/contracts/blockSignerReader.go @@ -20,7 +20,7 @@ var ( ParsedBlockSignerABI, _ = abi.JSON(strings.NewReader(blockSignerContract.BlockSignerABI)) ) -func GetSigners(statedb *state.StateDB, parsed abi.ABI, block *types.Block) []common.Address { +func GetSigners(statedb *state.StateDB, block *types.Block) []common.Address { methodName := "getSigners" fmt.Printf("---%s---\n", methodName) start := time.Now() diff --git a/contracts/randomizeReader.go b/contracts/randomizeReader.go index 08934db6a1..6254098aab 100644 --- a/contracts/randomizeReader.go +++ b/contracts/randomizeReader.go @@ -19,7 +19,7 @@ var ( ParsedRandomizeABI, _ = abi.JSON(strings.NewReader(randomizeContract.XDCRandomizeABI)) ) -func GetSecret(statedb *state.StateDB, parsed abi.ABI, address common.Address) [][]byte { +func GetSecret(statedb *state.StateDB, address common.Address) [][32]byte { start := time.Now() fmt.Printf("--------GetSecret---------\n") @@ -32,10 +32,10 @@ func GetSecret(statedb *state.StateDB, parsed abi.ABI, address common.Address) [ key := getLocDynamicArrAtElement(common.BigToHash(locSecret), i, 1) keys = append(keys, key) } - rets := [][]byte{} + rets := [][32]byte{} for _, key := range keys { ret := statedb.GetState(common.HexToAddress(common.RandomizeSMC), key) - rets = append(rets, ret.Bytes()) + rets = append(rets, ret) fmt.Printf("ret hex: %v - ret byte: %v\n", ret.Hex(), ret.Bytes()) } elapsed := time.Since(start) @@ -44,7 +44,7 @@ func GetSecret(statedb *state.StateDB, parsed abi.ABI, address common.Address) [ return rets } -func GetOpening(statedb *state.StateDB, parsed abi.ABI, address common.Address) []byte { +func GetOpening(statedb *state.StateDB, address common.Address) [32]byte { start := time.Now() fmt.Printf("--------GetOpening---------\n") @@ -54,5 +54,5 @@ func GetOpening(statedb *state.StateDB, parsed abi.ABI, address common.Address) fmt.Printf("ret hex: %v - ret byte: %v\n", ret.Hex(), ret.Bytes()) elapsed := time.Since(start) fmt.Printf("Execution time: %s\n", elapsed) - return ret.Bytes() + return ret } \ No newline at end of file diff --git a/contracts/validatorReader.go b/contracts/validatorReader.go index 8df4fefb57..6e538a6ab9 100644 --- a/contracts/validatorReader.go +++ b/contracts/validatorReader.go @@ -50,7 +50,7 @@ func GetCandidates(statedb *state.StateDB, parsed abi.ABI) []common.Address { return rets } -func GetCandidateOwner(statedb *state.StateDB, parsed abi.ABI, candidate common.Address) common.Address { +func GetCandidateOwner(statedb *state.StateDB, candidate common.Address) common.Address { start := time.Now() fmt.Printf("--------GetCandidateOwner---------\n") @@ -81,7 +81,7 @@ func GetCandidateCap(statedb *state.StateDB, parsed abi.ABI, candidate common.Ad return ret.Hex() } -func GetVoters(statedb *state.StateDB, parsed abi.ABI, candidate common.Address) []common.Address { +func GetVoters(statedb *state.StateDB, candidate common.Address) []common.Address { start := time.Now() fmt.Printf("--------GetVoters---------\n")