Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AddCommittedToken was edited to avoid amount duplicate on Lockup #476

Merged
merged 10 commits into from
May 16, 2024
+24 −18
Merged

AddCommittedToken was edited to avoid amount duplicate on Lockup #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
62db5c6
AddCommittedToken was edited to avoid amount duplicate on Lockup
fenriz07 Apr 30, 2024
cc08f6c
AddCommittedToken was edited to avoid amount duplicate on Lockup
fenriz07 Apr 30, 2024
b6c5102
it was merged with main
fenriz07 May 7, 2024
ae3fa14
Merge branch 'main' into withdraw-liquidity-lockup
cosmic-vagabond May 8, 2024
dabb966
Merge branch 'main' into withdraw-liquidity-lockup
cosmic-vagabond May 8, 2024
23620fb
Merge branch 'main' into withdraw-liquidity-lockup
cosmic-vagabond May 8, 2024
f55e276
a new test was added to check if the lockup amount is doubled for itself
fenriz07 May 14, 2024
3dfcd1c
a new test was added to check if the lockup amount is doubled for itself
fenriz07 May 14, 2024
d3d40c7
Merge branch 'main' into withdraw-liquidity-lockup
cosmic-vagabond May 15, 2024
882166c
Merge branch 'main' into withdraw-liquidity-lockup
cosmic-vagabond May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions x/commitment/types/commitments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,6 @@ func (c *Commitments) AddCommittedTokens(denom string, amount math.Int, unlockTi
Amount: amount,
UnlockTimestamp: unlockTime,
})

li := int(0)
for _, lockup := range token.Lockups {
if lockup.UnlockTimestamp < unlockTime {
li++
continue
} else if lockup.UnlockTimestamp == unlockTime {
c.CommittedTokens[i].Lockups[li].Amount = lockup.Amount.Add(amount)
fenriz07 marked this conversation as resolved.
Show resolved Hide resolved
return
} else {
break
}
}
c.CommittedTokens[i].Lockups = append(token.Lockups[:li+1], token.Lockups[li:]...)
c.CommittedTokens[i].Lockups[li] = Lockup{
Amount: amount,
UnlockTimestamp: unlockTime,
}
return
}
}
Expand Down
24 changes: 24 additions & 0 deletions x/commitment/types/commitments_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ func TestCommitments_AddCommittedTokens(t *testing.T) {
require.Equal(t, commitments.CommittedTokens[0].Lockups[0].Amount.String(), "100")
require.Equal(t, commitments.CommittedTokens[0].Lockups[0].UnlockTimestamp, uint64(100))
require.Len(t, commitments.CommittedTokens[1].Lockups, 1)

commitments.AddCommittedTokens("lp/3", sdk.NewInt(1000), 100)
commitments.AddCommittedTokens("lp/3", sdk.NewInt(2000), 120)
commitments.AddCommittedTokens("lp/3", sdk.NewInt(3000), 130)

require.Equal(t, commitments.CommittedTokens[2].Lockups[0].Amount.String(), "1000")
require.Equal(t, commitments.CommittedTokens[2].Lockups[1].Amount.String(), "2000")
require.Equal(t, commitments.CommittedTokens[2].Lockups[2].Amount.String(), "3000")

}

func TestCommitments_WithdrawCommitedTokens(t *testing.T) {
Expand All @@ -48,3 +57,18 @@ func TestCommitments_WithdrawCommitedTokens(t *testing.T) {
err = commitments.DeductFromCommitted("lp/2", sdk.NewInt(200), 100)
require.Error(t, err)
}

func TestLockupAmount_WithdrawCommited(t *testing.T) {
commitments := types.Commitments{
Creator: "",
CommittedTokens: []*types.CommittedTokens{},
VestingTokens: []*types.VestingTokens{},
}

commitments.AddCommittedTokens("lp/1", sdk.NewInt(1000), 1)
commitments.AddCommittedTokens("lp/1", sdk.NewInt(5000), 2)
commitments.AddCommittedTokens("lp/1", sdk.NewInt(3000), 4)

err := commitments.DeductFromCommitted("lp/1", sdk.NewInt(9000), 3)
require.Error(t, err)
}