diff --git a/src/Stratis.Bitcoin.Features.PoA/Voting/VotingController.cs b/src/Stratis.Bitcoin.Features.PoA/Voting/VotingController.cs index 320bb33795..0b5f3f1943 100644 --- a/src/Stratis.Bitcoin.Features.PoA/Voting/VotingController.cs +++ b/src/Stratis.Bitcoin.Features.PoA/Voting/VotingController.cs @@ -268,14 +268,14 @@ 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() { @@ -283,7 +283,7 @@ public IActionResult VoteKickFederationMember([FromBody] KickFederationMemberMod 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) { diff --git a/src/Stratis.SmartContracts.IntegrationTests/RPC/SmartContractRPCTests.cs b/src/Stratis.SmartContracts.IntegrationTests/RPC/SmartContractRPCTests.cs index eea4de11b1..24ab763f29 100644 --- a/src/Stratis.SmartContracts.IntegrationTests/RPC/SmartContractRPCTests.cs +++ b/src/Stratis.SmartContracts.IntegrationTests/RPC/SmartContractRPCTests.cs @@ -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()) { diff --git a/src/Stratis.SmartContracts.Networks/SmartContractsPoARegTest.cs b/src/Stratis.SmartContracts.Networks/SmartContractsPoARegTest.cs index 380d859a39..5d32a93ac9 100644 --- a/src/Stratis.SmartContracts.Networks/SmartContractsPoARegTest.cs +++ b/src/Stratis.SmartContracts.Networks/SmartContractsPoARegTest.cs @@ -21,8 +21,6 @@ namespace Stratis.SmartContracts.Networks /// public class SmartContractsPoARegTest : PoANetwork { - public Key[] FederationKeys { get; private set; } - public SmartContractsPoARegTest() { this.Name = "SmartContractsPoARegTest"; @@ -68,7 +66,10 @@ public SmartContractsPoARegTest() targetSpacingSeconds: 60, votingEnabled: true, autoKickIdleMembers: false - ); + ) + { + PollExpiryBlocks = 450 + }; var buriedDeployments = new BuriedDeploymentsArray {