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

fix: added test case for points #207

Merged
merged 6 commits into from
Dec 12, 2024
Merged

fix: added test case for points #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
43dd958
fix: added test case for points
troykessler Jul 24, 2024
102df19
test: extend msg_server_skip_uploader_role_test.go to check for valid…
shifty11 Jul 29, 2024
b963de9
chore: remove todo
shifty11 Jul 30, 2024
dfd70e2
fix: return early for empty bundles in SkipUploaderRole
shifty11 Jul 31, 2024
3c0260d
test: add points check
shifty11 Aug 1, 2024
5cdad0c
chore: reset config.yml and cleaned skip uploader role tests
troykessler Aug 12, 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
16 changes: 16 additions & 0 deletions x/bundles/keeper/msg_server_skip_uploader_role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,22 @@ func (k msgServer) SkipUploaderRole(goCtx context.Context, msg *types.MsgSkipUpl
// reset points of uploader as node has proven to be active
k.resetPoints(ctx, msg.PoolId, msg.Staker)

// If previous bundle was dropped just skip uploader role
// No previous round needs to be evaluated
if bundleProposal.StorageId == "" {
nextUploader := k.chooseNextUploader(ctx, msg.PoolId)

// Register empty bundle with next uploader
bundleProposal = types.BundleProposal{
PoolId: msg.PoolId,
NextUploader: nextUploader,
UpdatedAt: uint64(ctx.BlockTime().Unix()),
}
k.SetBundleProposal(ctx, bundleProposal)

return &types.MsgSkipUploaderRoleResponse{}, nil
}

// Previous round contains a bundle which needs to be validated now
result, err := k.tallyBundleProposal(ctx, bundleProposal, msg.PoolId)
if err != nil {
Expand Down
86 changes: 82 additions & 4 deletions x/bundles/keeper/msg_server_skip_uploader_role_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() {
}
s.RunTxPoolSuccess(msg)

//// create funders
// create funders
s.RunTxFundersSuccess(&funderstypes.MsgCreateFunder{
Creator: i.ALICE,
Moniker: "Alice",
Expand Down Expand Up @@ -125,6 +125,22 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() {

It("Skip uploader role on data bundle if staker is next uploader", func() {
// ARRANGE
s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{
Creator: i.VALADDRESS_1_A,
Staker: i.STAKER_1,
PoolId: 0,
StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI",
Vote: bundletypes.VOTE_TYPE_ABSTAIN,
})

s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{
Creator: i.VALADDRESS_2_A,
Staker: i.STAKER_2,
PoolId: 0,
StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI",
Vote: bundletypes.VOTE_TYPE_ABSTAIN,
})

s.Commit()
s.WaitSeconds(60)

Expand Down Expand Up @@ -152,18 +168,41 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() {
Expect(bundleProposal.UpdatedAt).NotTo(BeZero())
Expect(bundleProposal.VotersValid).To(ContainElement(i.STAKER_0))
Expect(bundleProposal.VotersInvalid).To(BeEmpty())
Expect(bundleProposal.VotersAbstain).To(BeEmpty())
Expect(bundleProposal.VotersAbstain).To(ContainElement(i.STAKER_1))
Expect(bundleProposal.VotersAbstain).To(ContainElement(i.STAKER_2))

// here the next uploader should be always be different after skipping
Expect(bundleProposal.NextUploader).To(Equal(i.STAKER_0))

// check that the bundle is not finalized
_, found = s.App().BundlesKeeper.GetFinalizedBundle(s.Ctx(), 0, 0)
Expect(found).To(BeFalse())

// check that no validator got a point for the second round
valaccounts := s.App().StakersKeeper.GetAllValaccountsOfPool(s.Ctx(), 0)
for _, valaccount := range valaccounts {
Expect(valaccount.Points).To(BeZero())
}
})

It("Skip uploader on data bundle after uploader role has already been skipped", func() {
// ARRANGE
s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{
Creator: i.VALADDRESS_1_A,
Staker: i.STAKER_1,
PoolId: 0,
StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI",
Vote: bundletypes.VOTE_TYPE_ABSTAIN,
})

s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{
Creator: i.VALADDRESS_2_A,
Staker: i.STAKER_2,
PoolId: 0,
StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI",
Vote: bundletypes.VOTE_TYPE_ABSTAIN,
})

s.Commit()
s.WaitSeconds(60)

Expand Down Expand Up @@ -201,14 +240,21 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() {
Expect(bundleProposal.UpdatedAt).NotTo(BeZero())
Expect(bundleProposal.VotersValid).To(ContainElement(i.STAKER_0))
Expect(bundleProposal.VotersInvalid).To(BeEmpty())
Expect(bundleProposal.VotersAbstain).To(BeEmpty())
Expect(bundleProposal.VotersAbstain).To(ContainElement(i.STAKER_1))
Expect(bundleProposal.VotersAbstain).To(ContainElement(i.STAKER_2))

// here the next uploader should be always be different after skipping
// here the next uploader should always be different after skipping
Expect(bundleProposal.NextUploader).NotTo(Equal(i.STAKER_0))

// check that the bundle is not finalized
_, found = s.App().BundlesKeeper.GetFinalizedBundle(s.Ctx(), 0, 0)
Expect(found).To(BeFalse())

// check that no validator got a point for the second round
valaccounts := s.App().StakersKeeper.GetAllValaccountsOfPool(s.Ctx(), 0)
for _, valaccount := range valaccounts {
Expect(valaccount.Points).To(BeZero())
}
})

It("Skip uploader role on dropped bundle", func() {
Expand Down Expand Up @@ -252,6 +298,17 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() {
// check that the bundle is not finalized
_, found = s.App().BundlesKeeper.GetFinalizedBundle(s.Ctx(), 0, 0)
Expect(found).To(BeFalse())

// check that no validator got a point for the second round
valaccounts := s.App().StakersKeeper.GetAllValaccountsOfPool(s.Ctx(), 0)
for _, valaccount := range valaccounts {
if valaccount.Staker == i.STAKER_0 {
Expect(valaccount.Points).To(BeZero())
} else {
// All others have one point because they did not vote at all
Expect(valaccount.Points).To(Equal(uint64(1)))
}
}
})

It("Skip uploader role on data bundle with current round containing a valid bundle", func() {
Expand All @@ -264,6 +321,14 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() {
Vote: bundletypes.VOTE_TYPE_VALID,
})

s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{
Creator: i.VALADDRESS_2_A,
Staker: i.STAKER_2,
PoolId: 0,
StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI",
Vote: bundletypes.VOTE_TYPE_VALID,
})

s.Commit()
s.WaitSeconds(60)

Expand Down Expand Up @@ -300,6 +365,12 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() {

Expect(finalizedBundle.PoolId).To(Equal(uint64(0)))
Expect(finalizedBundle.Uploader).To(Equal(i.STAKER_0))

// check if no validator got a point for the second round
valaccounts := s.App().StakersKeeper.GetAllValaccountsOfPool(s.Ctx(), 0)
for _, valaccount := range valaccounts {
Expect(valaccount.Points).To(BeZero())
}
})

It("Skip uploader role on data bundle with current round containing an invalid bundle", func() {
Expand All @@ -311,6 +382,7 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() {
StorageId: "y62A3tfbSNcNYDGoL-eXwzyV-Zc9Q0OVtDvR1biJmNI",
Vote: bundletypes.VOTE_TYPE_INVALID,
})

s.RunTxBundlesSuccess(&bundletypes.MsgVoteBundleProposal{
Creator: i.VALADDRESS_2_A,
Staker: i.STAKER_2,
Expand Down Expand Up @@ -352,5 +424,11 @@ var _ = Describe("msg_server_skip_uploader_role.go", Ordered, func() {
// check that the bundle is not finalized
_, found = s.App().BundlesKeeper.GetFinalizedBundle(s.Ctx(), 0, 0)
Expect(found).To(BeFalse())

// check that no validator got a point
valaccounts := s.App().StakersKeeper.GetAllValaccountsOfPool(s.Ctx(), 0)
for _, valaccount := range valaccounts {
Expect(valaccount.Points).To(BeZero())
}
})
})
Loading