smeb_y/0g-chain
1
0
Fork 0
mirror of https://github.com/0glabs/0g-chain.git synced 2024-12-27 00:35:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

x/bep3: fix swap validation (#507)

Browse Source
This commit is contained in:
Federico Kunze 2020-05-13 08:41:54 -04:00 committed by GitHub
parent 7f236d322d
commit 12fe0c60a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
x/bep3/simulation/genesis.go
View File

@ -52,16 +52,16 @@ func GenMaxBlockLock(r *rand.Rand, minBlockLock uint64) uint64 {
// GenSupportedAssets gets randomized SupportedAssets // GenSupportedAssets gets randomized SupportedAssets
func GenSupportedAssets(r *rand.Rand) types.AssetParams { func GenSupportedAssets(r *rand.Rand) types.AssetParams {
var assets types.AssetParams
numAssets := (r.Intn(10) + 1) numAssets := (r.Intn(10) + 1)
assets := make(types.AssetParams, numAssets+1)
for i := 0; i < numAssets; i++ { for i := 0; i < numAssets; i++ {
denom := strings.ToLower(simulation.RandStringOfLength(r, (r.Intn(3) + 3))) denom := strings.ToLower(simulation.RandStringOfLength(r, (r.Intn(3) + 3)))
asset := genSupportedAsset(r, denom) asset := genSupportedAsset(r, denom)
assets = append(assets, asset) assets[i] = asset
} }
// Add bnb, btc, or xrp as a supported asset for interactions with other modules // Add bnb, btc, or xrp as a supported asset for interactions with other modules
stableAsset := genSupportedAsset(r, ConsistentDenoms[r.Intn(3)]) assets[len(assets)-1] = genSupportedAsset(r, ConsistentDenoms[r.Intn(3)])
assets = append(assets, stableAsset)
return assets return assets
} }
@ -91,6 +91,7 @@ func RandomizedGenState(simState *module.SimulationState) {
// Update supply to match amount of coins in auth // Update supply to match amount of coins in auth
var supplyGenesis supply.GenesisState var supplyGenesis supply.GenesisState
simState.Cdc.MustUnmarshalJSON(simState.GenState[supply.ModuleName], &supplyGenesis) simState.Cdc.MustUnmarshalJSON(simState.GenState[supply.ModuleName], &supplyGenesis)
for _, deputyCoin := range totalCoins { for _, deputyCoin := range totalCoins {
supplyGenesis.Supply = supplyGenesis.Supply.Add(deputyCoin...) supplyGenesis.Supply = supplyGenesis.Supply.Add(deputyCoin...)
} }
@ -122,8 +123,7 @@ func loadRandomBep3GenState(simState *module.SimulationState) types.GenesisState
return bep3Genesis return bep3Genesis
} }
func loadAuthGenState(simState *module.SimulationState, bep3Genesis types.GenesisState) ( func loadAuthGenState(simState *module.SimulationState, bep3Genesis types.GenesisState) (auth.GenesisState, []sdk.Coins) {
auth.GenesisState, []sdk.Coins) {
var authGenesis auth.GenesisState var authGenesis auth.GenesisState
simState.Cdc.MustUnmarshalJSON(simState.GenState[auth.ModuleName], &authGenesis) simState.Cdc.MustUnmarshalJSON(simState.GenState[auth.ModuleName], &authGenesis)

2
x/bep3/types/swap.go
View File

@ -95,7 +95,7 @@ func (a AtomicSwap) Validate() error {
if strings.TrimSpace(a.RecipientOtherChain) == "" { if strings.TrimSpace(a.RecipientOtherChain) == "" {
return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "recipient other chain cannot be blank") return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "recipient other chain cannot be blank")
} }
if a.ClosedBlock == 0 { if a.Status == Completed && a.ClosedBlock == 0 {
return errors.New("closed block cannot be 0") return errors.New("closed block cannot be 0")
} }
if a.Status == NULL || a.Status > 3 { if a.Status == NULL || a.Status > 3 {

1
x/bep3/types/swap_test.go
View File

@ -194,6 +194,7 @@ func (suite *AtomicSwapTestSuite) TestNewAtomicSwap() {
SenderOtherChain: "bnb1uky3me9ggqypmrsvxk7ur6hqkzq7zmv4ed4ng7", SenderOtherChain: "bnb1uky3me9ggqypmrsvxk7ur6hqkzq7zmv4ed4ng7",
RecipientOtherChain: "bnb1urfermcg92dwq36572cx4xg84wpk3lfpksr5g7", RecipientOtherChain: "bnb1urfermcg92dwq36572cx4xg84wpk3lfpksr5g7",
ClosedBlock: 0, ClosedBlock: 0,
Status: types.Completed,
}, },
false, false,
}, },