@@ -37,11 +37,7 @@ contract Raffle is VRFConsumerBaseV2Plus {
37
37
error Raffle__SendMoretoEnterRaffle ();
38
38
error Raffle__TransferFailed ();
39
39
error Raffle__RaffleNotOpen ();
40
- error Raffle__UpkeepNotNeeded (
41
- uint256 balance ,
42
- uint256 playersLength ,
43
- uint256 raffleState
44
- );
40
+ error Raffle__UpkeepNotNeeded (uint256 balance , uint256 playersLength , uint256 raffleState );
45
41
46
42
/*Type declarations */
47
43
@@ -112,27 +108,24 @@ contract Raffle is VRFConsumerBaseV2Plus {
112
108
* @return upkeepNeeded - true if its time to start the lottery.
113
109
* @return -ignored
114
110
*/
115
- function checkUpKeep (
116
- bytes memory /*CheckData*/
117
- ) public view returns (bool upkeepNeeded , bytes memory /*performData*/ ) {
118
- bool timehasPassed = ((block .timestamp - s_lastTimeStamp) >=
119
- i_interval);
111
+ function checkUpKeep (bytes memory /*CheckData*/ )
112
+ public
113
+ view
114
+ returns (bool upkeepNeeded , bytes memory /*performData*/ )
115
+ {
116
+ bool timehasPassed = ((block .timestamp - s_lastTimeStamp) >= i_interval);
120
117
bool isOpen = s_rafflestate == RaffleState.OPEN;
121
118
bool hasBalance = address (this ).balance > 0 ;
122
119
bool hasPlayers = s_players.length > 0 ;
123
120
upkeepNeeded = timehasPassed && isOpen && hasBalance && hasPlayers;
124
121
return (upkeepNeeded, "" );
125
122
}
126
123
127
- function performUpkeep (bytes calldata /* performData */ ) external {
128
- (bool upkeepNeeded , ) = checkUpKeep ("" );
124
+ function performUpkeep (bytes calldata /* performData */ ) external {
125
+ (bool upkeepNeeded ,) = checkUpKeep ("" );
129
126
130
127
if (! upkeepNeeded) {
131
- revert Raffle__UpkeepNotNeeded (
132
- address (this ).balance,
133
- s_players.length ,
134
- uint256 (s_rafflestate)
135
- );
128
+ revert Raffle__UpkeepNotNeeded (address (this ).balance, s_players.length , uint256 (s_rafflestate));
136
129
}
137
130
138
131
s_rafflestate = RaffleState.CALCULATING;
@@ -144,19 +137,14 @@ contract Raffle is VRFConsumerBaseV2Plus {
144
137
requestConfirmations: REQUEST_CONFIRMATIONS,
145
138
callbackGasLimit: i_callbackGasLimit, // gas limit
146
139
numWords: NUM_WORDS,
147
- extraArgs: VRFV2PlusClient._argsToBytes (
148
- VRFV2PlusClient.ExtraArgsV1 ({nativePayment: false })
149
- )
140
+ extraArgs: VRFV2PlusClient._argsToBytes (VRFV2PlusClient.ExtraArgsV1 ({nativePayment: false }))
150
141
})
151
142
);
152
143
153
144
emit RequestedRaffleWinner (requestId);
154
145
}
155
146
156
- function fulfillRandomWords (
157
- uint256 /*requestId*/ ,
158
- uint256 [] calldata randomWords
159
- ) internal override {
147
+ function fulfillRandomWords (uint256 , /*requestId*/ uint256 [] calldata randomWords ) internal override {
160
148
uint256 indexOfWinner = randomWords[0 ] % s_players.length ;
161
149
address payable recentWinner = s_players[indexOfWinner];
162
150
s_recentWinner = recentWinner;
@@ -166,7 +154,7 @@ contract Raffle is VRFConsumerBaseV2Plus {
166
154
s_lastTimeStamp = block .timestamp ;
167
155
emit WinnerPicked (s_recentWinner);
168
156
169
- (bool success , ) = recentWinner.call {value: address (this ).balance}("" );
157
+ (bool success ,) = recentWinner.call {value: address (this ).balance}("" );
170
158
if (! success) {
171
159
revert Raffle__TransferFailed ();
172
160
}
@@ -182,9 +170,7 @@ contract Raffle is VRFConsumerBaseV2Plus {
182
170
return s_rafflestate;
183
171
}
184
172
185
- function getPlayers (
186
- uint256 indexOfPlayers
187
- ) external view returns (address ) {
173
+ function getPlayers (uint256 indexOfPlayers ) external view returns (address ) {
188
174
return s_players[indexOfPlayers];
189
175
}
190
176
0 commit comments