Merge branch 'master' into 10076-buildProposals

Agoric · Oct 10, 2024 · 77a1aff · 77a1aff
2 parents b027c95 + b423dda
commit 77a1aff
Show file tree

Hide file tree

Showing 4 changed files with 602 additions and 47 deletions.
diff --git a/golang/cosmos/x/vbank/vbank.go b/golang/cosmos/x/vbank/vbank.go
@@ -144,11 +144,9 @@ func (ch portHandler) Receive(cctx context.Context, str string) (ret string, err
 		}
 		coin := keeper.GetBalance(ctx, addr, msg.Denom)
 		packet := coin.Amount.String()
+		bytes, err := json.Marshal(&packet)
 		if err == nil {
-			bytes, err := json.Marshal(&packet)
-			if err == nil {
-				ret = string(bytes)
-			}
+			ret = string(bytes)
 		}
 
 	case "VBANK_GRAB":
@@ -216,9 +214,6 @@ func (ch portHandler) Receive(cctx context.Context, str string) (ret string, err
 		if err := keeper.StoreRewardCoins(ctx, coins); err != nil {
 			return "", fmt.Errorf("cannot store reward %s coins: %s", coins.Sort().String(), err)
 		}
-		if err != nil {
-			return "", err
-		}
 		state := keeper.GetState(ctx)
 		state.RewardPool = state.RewardPool.Add(coins...)
 		keeper.SetState(ctx, state)