Refactor export function

modules/htlc/genesis.go

@@ -2,8 +2,6 @@ package htlc
 
 import (
 	"encoding/hex"
-	"fmt"
-
 	tmbytes "github.com/tendermint/tendermint/libs/bytes"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -32,14 +30,8 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 
 	k.IterateHTLCs(ctx, func(hlock tmbytes.HexBytes, h types.HTLC) (stop bool) {
 		if h.State == types.Open {
-			h.ExpirationHeight = h.ExpirationHeight - uint64(ctx.BlockHeight()) + 1
 			pendingHtlcs[hlock.String()] = h
-		} else if h.State == types.Expired {
-			if err := k.RefundHTLC(ctx, hlock); err != nil {
-				panic(fmt.Errorf("failed to export the HTLC genesis state: %s", hlock.String()))
-			}
 		}
-
 		return false
 	})
 

modules/random/genesis.go

@@ -27,8 +27,8 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, data types.GenesisState) {
 func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 	pendingRequests := make(map[string]types.Requests)
 
-	k.IterateRandomRequestQueue(ctx, func(height int64, request types.Request) bool {
-		leftHeight := fmt.Sprintf("%d", height-ctx.BlockHeight()+1)
+	k.IterateRandomRequestQueue(ctx, func(height int64, reqID []byte, request types.Request) bool {
+		leftHeight := fmt.Sprintf("%d", height)
 		heightRequests, ok := pendingRequests[leftHeight]
 		if ok {
 			heightRequests.Requests = append(heightRequests.Requests, request)

modules/random/genesis_test.go

@@ -62,7 +62,7 @@ func (suite *GenesisTestSuite) TestExportGenesis() {
 
 	// get the pending requests from queue
 	storedRequests := make(map[int64][]types.Request)
-	suite.keeper.IterateRandomRequestQueue(suite.ctx, func(h int64, r types.Request) bool {
+	suite.keeper.IterateRandomRequestQueue(suite.ctx, func(h int64, reqID []byte, r types.Request) bool {
 		storedRequests[h] = append(storedRequests[h], r)
 		return false
 	})
@@ -76,7 +76,6 @@ func (suite *GenesisTestSuite) TestExportGenesis() {
 	// assert that exported requests are consistent with requests in queue
 	for height, requests := range exportedRequests {
 		h, _ := strconv.ParseInt(height, 10, 64)
-		storedHeight := h + testNewHeight - 1
-		suite.Equal(storedRequests[storedHeight], requests.Requests)
+		suite.Equal(storedRequests[h], requests.Requests)
 	}
 }

modules/random/keeper/grpc_query_test.go

@@ -51,7 +51,7 @@ func (suite *KeeperTestSuite) TestGRPCRandomRequestQueue() {
 	suite.Require().NoError(err)
 	var requests = make([]types.Request, 0)
 
-	app.RandomKeeper.IterateRandomRequestQueue(ctx, func(h int64, r types.Request) (stop bool) {
+	app.RandomKeeper.IterateRandomRequestQueue(ctx, func(h int64, reqID []byte, r types.Request) (stop bool) {
 		requests = append(requests, r)
 		return false
 	})

modules/random/keeper/keeper.go

@@ -169,7 +169,7 @@ func (k Keeper) IterateRandomRequestQueueByHeight(ctx sdk.Context, height int64)
 }
 
 // IterateRandomRequestQueue iterates through the random number request queue
-func (k Keeper) IterateRandomRequestQueue(ctx sdk.Context, op func(h int64, r types.Request) (stop bool)) {
+func (k Keeper) IterateRandomRequestQueue(ctx sdk.Context, op func(h int64, reqID []byte, r types.Request) (stop bool)) {
 	store := ctx.KVStore(k.storeKey)
 
 	iterator := sdk.KVStorePrefixIterator(store, types.PrefixRandomRequestQueue)
@@ -178,11 +178,12 @@ func (k Keeper) IterateRandomRequestQueue(ctx sdk.Context, op func(h int64, r ty
 	for ; iterator.Valid(); iterator.Next() {
 		keyParts := bytes.Split(iterator.Key(), types.KeyDelimiter)
 		height, _ := strconv.ParseInt(string(keyParts[1]), 10, 64)
+		reqID := keyParts[2]
 
 		var request types.Request
 		k.cdc.MustUnmarshalBinaryBare(iterator.Value(), &request)
 
-		if stop := op(height, request); stop {
+		if stop := op(height, reqID, request); stop {
 			break
 		}
 	}

modules/random/keeper/querier.go

@@ -97,7 +97,7 @@ func queryRandomRequestQueueByHeight(ctx sdk.Context, height int64, k Keeper) []
 func queryAllRandomRequestsInQueue(ctx sdk.Context, k Keeper) []types.Request {
 	var requests = make([]types.Request, 0)
 
-	k.IterateRandomRequestQueue(ctx, func(h int64, r types.Request) (stop bool) {
+	k.IterateRandomRequestQueue(ctx, func(h int64, reqID []byte, r types.Request) (stop bool) {
 		requests = append(requests, r)
 		return false
 	})

simapp/test_helpers.go

@@ -21,10 +21,10 @@ import (
 	bam "github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
-	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	"github.com/cosmos/cosmos-sdk/testutil"