Skip to content

[API] Schedule kick should return BadRequest when invalid #717

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

Merged
fassadlr merged 2 commits into from
Sep 21, 2021
Merged

[API] Schedule kick should return BadRequest when invalid #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74b687c
Update to BadRequest
fassadlr Sep 21, 2021
4acef50
Fix Tests
fassadlr Sep 21, 2021
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
6 changes: 3 additions & 3 deletions src/Stratis.Bitcoin.Features.PoA/Voting/VotingController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,22 +268,22 @@ public IActionResult VoteKickFederationMember([FromBody] KickFederationMemberMod
{
IFederationMember federationMember = this.federationManager.GetFederationMembers().SingleOrDefault(m => m.PubKey.ToHex() == model.PubKey);
if (federationMember == null)
return this.Json($"'{model.PubKey}' is not currently a federation member.");
return BadRequest($"'{model.PubKey}' is not currently a federation member.");

var consensusFactory = this.network.Consensus.ConsensusFactory as PoAConsensusFactory;
byte[] federationMemberBytes = consensusFactory.SerializeFederationMember(federationMember);

bool alreadyKicking = this.votingManager.AlreadyVotingFor(VoteKey.KickFederationMember, federationMemberBytes);
if (alreadyKicking)
return this.Json($"Skipping because kicking {model.PubKey} is already being voted on.");
return BadRequest($"Skipping because kicking {model.PubKey} is already being voted on.");

this.votingManager.ScheduleVote(new VotingData()
{
Key = VoteKey.KickFederationMember,
Data = federationMemberBytes
});

return this.Json($"A vote to kick '{model.PubKey}' has now been scheduled.");
return Ok($"A vote to kick '{model.PubKey}' has now been scheduled.");
}
catch (Exception e)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.SmartContracts.IntegrationTests/RPC/SmartContractRPCTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public SmartContractRPCTests()
}

[Fact]
public async Task RPC_GetReceipt_Returns_Value()
public async Task RPC_GetReceipt_Returns_ValueAsync()
{
using (var chain = new PoAMockChain(2, this.nodeFactory).Build())
{
Expand Down
7 changes: 4 additions & 3 deletions src/Stratis.SmartContracts.Networks/SmartContractsPoARegTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ namespace Stratis.SmartContracts.Networks
/// </summary>
public class SmartContractsPoARegTest : PoANetwork
{
public Key[] FederationKeys { get; private set; }

public SmartContractsPoARegTest()
{
this.Name = "SmartContractsPoARegTest";
Expand Down Expand Up @@ -68,7 +66,10 @@ public SmartContractsPoARegTest()
targetSpacingSeconds: 60,
votingEnabled: true,
autoKickIdleMembers: false
);
)
{
PollExpiryBlocks = 450
};

var buriedDeployments = new BuriedDeploymentsArray
{
Expand Down