Fix bug in median calculation (#211)

* Fix the issue of the wrong median while proposing. Signed-off-by: Ashish Mishra <ashish10677@gmail.com>
razor-network · Sep 13, 2021 · 0c0527c · 0c0527c
1 parent b64ed7a
commit 0c0527c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/cmd/dispute.go b/cmd/dispute.go
@@ -50,7 +50,7 @@ func HandleDispute(client *ethclient.Client, config types.Configurations, accoun
 
 func Dispute(client *ethclient.Client, config types.Configurations, account types.Account, epoch uint32, blockId uint8, assetId int) error {
 	blockManager := utils.GetBlockManager(client)
-	sortedVotes, err := getSortedVotes(client, account.Address)
+	sortedVotes, err := getSortedVotes(client, account.Address, uint8(assetId))
 	if err != nil {
 		return err
 	}
@@ -64,7 +64,7 @@ func Dispute(client *ethclient.Client, config types.Configurations, account type
 		Config:         config,
 	})
 
-	GiveSorted(client, blockManager, txnOpts, epoch, uint8(assetId-1), utils.ConvertBigIntArrayToUint32Array(sortedVotes))
+	GiveSorted(client, blockManager, txnOpts, epoch, uint8(assetId), utils.ConvertBigIntArrayToUint32Array(sortedVotes))
 
 	log.Info("Finalizing dispute...")
 	finalizeDisputeTxnOpts := utils.GetTxnOpts(types.TransactionOptions{

diff --git a/cmd/propose.go b/cmd/propose.go
@@ -194,7 +194,7 @@ func MakeBlock(client *ethclient.Client, address string, rogueMode bool) ([]uint
 	}
 
 	for assetId := 1; assetId <= int(numAssets); assetId++ {
-		sortedVotes, err := getSortedVotes(client, address)
+		sortedVotes, err := getSortedVotes(client, address, uint8(assetId))
 		if err != nil {
 			log.Error(err)
 			// TODO: Add retry mechanism
@@ -232,19 +232,19 @@ func MakeBlock(client *ethclient.Client, address string, rogueMode bool) ([]uint
 	return mediansInUint32, nil
 }
 
-func getSortedVotes(client *ethclient.Client, address string) ([]*big.Int, error) {
+func getSortedVotes(client *ethclient.Client, address string, assetId uint8) ([]*big.Int, error) {
 	numberOfStakers, err := utils.GetNumberOfStakers(client, address)
 	if err != nil {
 		return nil, err
 	}
 	var voteValues []*big.Int
 
 	for i := 1; i <= int(numberOfStakers); i++ {
-		vote, err := utils.GetVotes(client, address, uint32(i))
+		vote, err := utils.GetVoteValue(client, address, assetId, uint32(i))
 		if err != nil {
 			return nil, err
 		}
-		voteValues = append(voteValues, vote.Values...)
+		voteValues = append(voteValues, vote)
 	}
 
 	sortutil.BigIntSlice.Sort(voteValues)

diff --git a/utils/vote.go b/utils/vote.go
@@ -32,6 +32,11 @@ func GetVotes(client *ethclient.Client, address string, stakerId uint32) (struct
 	return voteManager.GetVote(&callOpts, stakerId)
 }
 
+func GetVoteValue(client *ethclient.Client, address string, assetId uint8, stakerId uint32) (*big.Int, error) {
+	voteManager, callOpts := getVoteManagerWithOpts(client, address)
+	return voteManager.GetVoteValue(&callOpts, assetId, stakerId)
+}
+
 func GetInfluenceSnapshot(client *ethclient.Client, address string, epoch uint32) (*big.Int, error) {
 	voteManager, callOpts := getVoteManagerWithOpts(client, address)
 	stakerId, err := GetStakerId(client, address)