simplify account sequence testin lcd and rpc clients

mesg-foundation · May 28, 2020 · 3abe409 · 3abe409
1 parent 4e25a7e
commit 3abe409
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/cosmos/lcd.go b/cosmos/lcd.go
@@ -187,12 +187,11 @@ func (lcd *LCD) getAccount() (*auth.BaseAccount, error) {
 	if accR.Address.Empty() {
 		return nil, fmt.Errorf("account %q doesn't exist", lcd.acc.GetAddress().String())
 	}
-	localSeq := lcd.acc.GetSequence()
-	lcd.acc = accR
 	// replace seq if sup
-	if localSeq > lcd.acc.GetSequence() {
-		lcd.acc.SetSequence(localSeq)
+	if lcd.acc.GetSequence() > accR.GetSequence() {
+		accR.SetSequence(lcd.acc.GetSequence())
 	}
+	lcd.acc = accR
 	return lcd.acc, nil
 }
 

diff --git a/cosmos/rpc.go b/cosmos/rpc.go
@@ -181,12 +181,11 @@ func (c *RPC) GetAccount() (authExported.Account, error) {
 	if err != nil {
 		return nil, err
 	}
-	localSeq := c.acc.GetSequence()
-	c.acc = accR
 	// replace seq if sup
-	if localSeq > c.acc.GetSequence() {
-		c.acc.SetSequence(localSeq)
+	if c.acc.GetSequence() > accR.GetSequence() {
+		accR.SetSequence(c.acc.GetSequence())
 	}
+	c.acc = accR
 	return c.acc, nil
 }