Merge pull request #628 from StephenButtolph/fix-get-stake

reverted accidental get stake change
ava-labs · Dec 1, 2020 · 8db1bbd · 8db1bbd
2 parents ca62edc + 0a12bf1
commit 8db1bbd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/vms/platformvm/client.go b/vms/platformvm/client.go
@@ -417,7 +417,7 @@ func (c *Client) GetStake(addrs []string) (uint64, error) {
 	err := c.requester.SendRequest("getStake", &api.JSONAddresses{
 		Addresses: addrs,
 	}, res)
-	return uint64(res.Stake), err
+	return uint64(res.Staked), err
 }
 
 // GetMinStake returns the minimum staking amount in nAVAX for validators
@@ -430,7 +430,7 @@ func (c *Client) GetMinStake() (uint64, uint64, error) {
 
 // GetTotalStake returns the total amount (in nAVAX) staked on the network
 func (c *Client) GetTotalStake() (uint64, error) {
-	res := new(GetStakeReply)
+	res := new(GetTotalStakeReply)
 	err := c.requester.SendRequest("getTotalStake", struct{}{}, res)
 	return uint64(res.Stake), err
 }

diff --git a/vms/platformvm/service.go b/vms/platformvm/service.go
@@ -1931,7 +1931,7 @@ func (service *Service) GetTxStatus(_ *http.Request, args *GetTxStatusArgs, resp
 
 // GetStakeReply is the response from calling GetStake.
 type GetStakeReply struct {
-	Stake json.Uint64 `json:"stake"`
+	Staked json.Uint64 `json:"staked"`
 }
 
 // GetStake returns the amount of nAVAX that [args.Addresses] have cumulatively
@@ -2066,7 +2066,7 @@ func (service *Service) GetStake(_ *http.Request, args *api.JSONAddresses, respo
 		return fmt.Errorf("iterator errored: %w", err)
 	}
 
-	response.Stake = json.Uint64(totalStake)
+	response.Staked = json.Uint64(totalStake)
 
 	errs := wrappers.Errs{}
 	errs.Add(
@@ -2091,8 +2091,13 @@ func (service *Service) GetMinStake(_ *http.Request, _ *struct{}, reply *GetMinS
 	return nil
 }
 
+// GetTotalStakeReply is the response from calling GetTotalStake.
+type GetTotalStakeReply struct {
+	Stake json.Uint64 `json:"stake"`
+}
+
 // GetTotalStake returns the total amount staked on the Primary Network
-func (service *Service) GetTotalStake(_ *http.Request, _ *struct{}, reply *GetStakeReply) error {
+func (service *Service) GetTotalStake(_ *http.Request, _ *struct{}, reply *GetTotalStakeReply) error {
 	stake, err := service.vm.getTotalStake()
 	reply.Stake = json.Uint64(stake)
 	return err

diff --git a/vms/platformvm/service_test.go b/vms/platformvm/service_test.go
@@ -444,8 +444,8 @@ func TestGetStake(t *testing.T) {
 		if err := service.GetStake(nil, &args, &response); err != nil {
 			t.Fatal(err)
 		}
-		if uint64(response.Stake) != defaultWeight {
-			t.Fatalf("expected stake to be %d but is %d", defaultWeight, response.Stake)
+		if uint64(response.Staked) != defaultWeight {
+			t.Fatalf("expected stake to be %d but is %d", defaultWeight, response.Staked)
 		}
 	}
 
@@ -457,8 +457,8 @@ func TestGetStake(t *testing.T) {
 	if err := service.GetStake(nil, &args, &response); err != nil {
 		t.Fatal(err)
 	}
-	if int(response.Stake) != len(genesis.Validators)*defaultWeight {
-		t.Fatalf("expected stake to be %d but is %d", len(genesis.Validators)*defaultWeight, response.Stake)
+	if int(response.Staked) != len(genesis.Validators)*defaultWeight {
+		t.Fatalf("expected stake to be %d but is %d", len(genesis.Validators)*defaultWeight, response.Staked)
 	}
 
 	// Make sure this works for delegators
@@ -468,7 +468,7 @@ func TestGetStake(t *testing.T) {
 	if err := service.GetStake(nil, &args, &response); err != nil {
 		t.Fatal(err)
 	}
-	oldStake := response.Stake
+	oldStake := response.Staked
 
 	// Add a delegator
 	stakeAmt := service.vm.minDelegatorStake + 12345
@@ -495,10 +495,10 @@ func TestGetStake(t *testing.T) {
 	if err := service.GetStake(nil, &args, &response); err != nil {
 		t.Fatal(err)
 	}
-	if uint64(response.Stake) != uint64(oldStake)+stakeAmt {
-		t.Fatalf("expected stake to be %d but is %d", uint64(oldStake)+stakeAmt, response.Stake)
+	if uint64(response.Staked) != uint64(oldStake)+stakeAmt {
+		t.Fatalf("expected stake to be %d but is %d", uint64(oldStake)+stakeAmt, response.Staked)
 	}
-	oldStake = response.Stake
+	oldStake = response.Staked
 
 	// Make sure this works for pending stakers
 	// Add a pending staker
@@ -523,8 +523,8 @@ func TestGetStake(t *testing.T) {
 	if err := service.GetStake(nil, &args, &response); err != nil {
 		t.Fatal(err)
 	}
-	if uint64(response.Stake) != uint64(oldStake)+stakeAmt {
-		t.Fatalf("expected stake to be %d but is %d", uint64(oldStake)+stakeAmt, response.Stake)
+	if uint64(response.Staked) != uint64(oldStake)+stakeAmt {
+		t.Fatalf("expected stake to be %d but is %d", uint64(oldStake)+stakeAmt, response.Staked)
 	}
 	oldStake += cjson.Uint64(stakeAmt)
 
@@ -569,8 +569,8 @@ func TestGetStake(t *testing.T) {
 	if err := service.GetStake(nil, &args, &response); err != nil {
 		t.Fatal(err)
 	}
-	if uint64(response.Stake) != uint64(oldStake)+stakeAmt {
-		t.Fatalf("expected stake to be %d but is %d", uint64(oldStake)+stakeAmt, response.Stake)
+	if uint64(response.Staked) != uint64(oldStake)+stakeAmt {
+		t.Fatalf("expected stake to be %d but is %d", uint64(oldStake)+stakeAmt, response.Staked)
 	}
 }