mleku/wasmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

address minor review comments from @ethanfrey

Browse Source
This commit is contained in:
Sunny Aggarwal
2020-01-08 16:06:52 -05:00
parent 5d21232326
commit 62cabd2a62
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
x/wasm/internal/keeper/genesis.go
View File

@@ -20,10 +20,7 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) {
panic(err)
}
newInfo := keeper.GetCodeInfo(ctx, newId)
if !info.Creator.Equals(newInfo.Creator) {
panic("code creators not same")
}
if bytes.Compare(info.CodeHash, newInfo.CodeHash) != 0 {
if !bytes.Equal(info.CodeHash, newInfo.CodeHash) {
panic("code hashes not same")
}
}
@@ -42,8 +39,8 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) {
func ExportGenesis(ctx sdk.Context, keeper Keeper) types.GenesisState {
var genState types.GenesisState
maxCodeID := keeper.GetLastID(ctx, types.KeyLastCodeID)
for i := uint64(0); i < maxCodeID; i++ {
maxCodeID := keeper.GetNextCodeID(ctx, types.KeyLastCodeID)
for i := uint64(1); i < maxCodeID; i++ {
genState.CodeInfos = append(genState.CodeInfos, *keeper.GetCodeInfo(ctx, i))
bytecode, err := keeper.GetByteCode(ctx, i)
if err != nil {

2
x/wasm/internal/keeper/keeper.go
View File

@@ -341,7 +341,7 @@ func (k Keeper) generateContractAddress(ctx sdk.Context, codeID uint64) sdk.AccA
return addrFromUint64(contractID)
}
func (k Keeper) GetLastID(ctx sdk.Context, lastIDKey []byte) uint64 {
func (k Keeper) GetNextID(ctx sdk.Context, lastIDKey []byte) uint64 {
store := ctx.KVStore(k.storeKey)
bz := store.Get(lastIDKey)
id := uint64(1)