follow suggestions

precompiles/conviction-voting/src/lib.rs

@@ -53,6 +53,14 @@ type ClassOf<Runtime> = <<Runtime as pallet_conviction_voting::Config>::Polls as
 	>,
 >>::Class;
 
+/// Direction of vote
+enum VoteDirection {
+	Yes,
+	No,
+	#[allow(unused)]
+	Abstain,
+}
+
 /// A precompile to wrap the functionality from pallet-conviction-voting.
 pub struct ConvictionVotingPrecompile<Runtime>(PhantomData<Runtime>);
 
@@ -69,34 +77,32 @@ where
 	IndexOf<Runtime>: TryFrom<u32>,
 	ClassOf<Runtime>: TryFrom<u16>,
 {
-	/// Vote yes in a poll.
-	///
-	/// Parameters:
-	/// * poll_index: Index of poll
-	/// * vote_amount: Balance locked for vote
-	/// * conviction: Conviction multiplier for length of vote lock
-	#[precompile::public("voteYes(uint32,uint256,uint8)")]
-	fn vote_yes(
+	/// Internal helper function for vote* extrinsics exposed in this precompile.
+	fn vote(
 		handle: &mut impl PrecompileHandle,
 		poll_index: u32,
+		vote: VoteDirection,
 		vote_amount: U256,
 		conviction: u8,
 	) -> EvmResult {
 		let poll_index = Self::u32_to_index(poll_index).in_field("pollIndex")?;
 		let vote_amount = Self::u256_to_amount(vote_amount).in_field("voteAmount")?;
 		let conviction = Self::u8_to_conviction(conviction).in_field("conviction")?;
 
+		let aye = match vote {
+			VoteDirection::Yes => true,
+			VoteDirection::No => false,
+			_ => return Err(RevertReason::custom("Abstain not supported").into()),
+		};
+
 		let vote = AccountVote::Standard {
-			vote: Vote {
-				aye: true,
-				conviction,
-			},
+			vote: Vote { aye, conviction },
 			balance: vote_amount,
 		};
 
 		log::trace!(target: "conviction-voting-precompile",
 			"Voting {:?} on poll {:?}, with conviction {:?}",
-			true, poll_index, conviction
+			aye, poll_index, conviction
 		);
 
 		let origin = Runtime::AddressMapping::into_account_id(handle.context().caller);
@@ -107,6 +113,28 @@ where
 		Ok(())
 	}
 
+	/// Vote yes in a poll.
+	///
+	/// Parameters:
+	/// * poll_index: Index of poll
+	/// * vote_amount: Balance locked for vote
+	/// * conviction: Conviction multiplier for length of vote lock
+	#[precompile::public("voteYes(uint32,uint256,uint8)")]
+	fn vote_yes(
+		handle: &mut impl PrecompileHandle,
+		poll_index: u32,
+		vote_amount: U256,
+		conviction: u8,
+	) -> EvmResult {
+		Self::vote(
+			handle,
+			poll_index,
+			VoteDirection::Yes,
+			vote_amount,
+			conviction,
+		)
+	}
+
 	/// Vote no in a poll.
 	///
 	/// Parameters:
@@ -120,29 +148,13 @@ where
 		vote_amount: U256,
 		conviction: u8,
 	) -> EvmResult {
-		let poll_index = Self::u32_to_index(poll_index).in_field("pollIndex")?;
-		let vote_amount = Self::u256_to_amount(vote_amount).in_field("voteAmount")?;
-		let conviction = Self::u8_to_conviction(conviction).in_field("conviction")?;
-
-		let vote = AccountVote::Standard {
-			vote: Vote {
-				aye: false,
-				conviction,
-			},
-			balance: vote_amount,
-		};
-
-		log::trace!(target: "conviction-voting-precompile",
-			"Voting {:?} on poll {:?}, with conviction {:?}",
-			false, poll_index, conviction
-		);
-
-		let origin = Runtime::AddressMapping::into_account_id(handle.context().caller);
-		let call = ConvictionVotingCall::<Runtime>::vote { poll_index, vote }.into();
-
-		<RuntimeHelper<Runtime>>::try_dispatch(handle, Some(origin).into(), call)?;
-
-		Ok(())
+		Self::vote(
+			handle,
+			poll_index,
+			VoteDirection::No,
+			vote_amount,
+			conviction,
+		)
 	}
 
 	#[precompile::public("removeVote(uint32)")]

precompiles/referenda/src/lib.rs

@@ -182,10 +182,10 @@ where
 		proposal: BoundedBytes<GetCallDataLimit>,
 		block_number: u32,
 	) -> EvmResult {
-		let origin: GovOrigin = track_id.try_into().map_err(|_| {
+		let proposal_origin: GovOrigin = track_id.try_into().map_err(|_| {
 			RevertReason::custom("Origin does not exist for TrackId").in_field("trackId")
 		})?;
-		let proposal_origin: Box<OriginOf<Runtime>> = Box::new(origin.into());
+		let proposal_origin: Box<OriginOf<Runtime>> = Box::new(proposal_origin.into());
 		let proposal: BoundedCallOf<Runtime> = Bounded::Inline(
 			frame_support::BoundedVec::try_from(proposal.as_bytes().to_vec()).map_err(|_| {
 				RevertReason::custom("Proposal input is not a runtime call").in_field("proposal")