Skip to content

Commit 4fb6f80

Browse files
SosiaalinenSosiaalinen
committed
added staging test and minor changes to code
1 parent 6153e6d commit 4fb6f80

35 files changed

+3528
-19
lines changed

‎Raffle

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit db7c4c47d36efdedd095b560d47cfca4cbdee725

‎contracts/Raffle.sol

+16-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// raffle contract
2-
// entering lottery by paying
2+
// entering lottery by payingRaffle__UpkeepNotNeeded
33
// pick a true random winner
44
// winner to be selected every x minutes --> comp automated
55
// chainlink oracle --> randomness, automated execution (chainlink keepers)
@@ -11,6 +11,7 @@ pragma solidity ^0.8.7;
1111
import "@chainlink/contracts/src/v0.8/VRFConsumerBaseV2.sol";
1212
import "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol";
1313
import "@chainlink/contracts/src/v0.8/AutomationCompatible.sol";
14+
import "hardhat/console.sol";
1415

1516
error Raffle__NotEnoughETH();
1617
error Raffle__TransferFailed();
@@ -71,11 +72,12 @@ contract Raffle is VRFConsumerBaseV2, AutomationCompatibleInterface {
7172
}
7273

7374
function enterRaffle() public payable {
74-
// instead of this: (msg.value > i_entranceFee, "Not enough ETH!")
7575
if (msg.value < i_entranceFee) revert Raffle__NotEnoughETH();
7676

7777
if (s_raffleState != RaffleState.OPEN) revert Raffle__NotOpen();
78+
7879
s_players.push(payable(msg.sender));
80+
7981
emit RaffleEnter(msg.sender);
8082
}
8183

@@ -169,4 +171,16 @@ contract Raffle is VRFConsumerBaseV2, AutomationCompatibleInterface {
169171
function getInterval() public view returns (uint256) {
170172
return i_interval;
171173
}
174+
175+
function getLatestTimeStamp() public view returns (uint256) {
176+
return s_lastTimeStamp;
177+
}
178+
179+
function getRequestConfirmations() public pure returns (uint256) {
180+
return REQUEST_CONFIRMATIONS;
181+
}
182+
183+
function getNumberOfPlayers() public view returns (uint256) {
184+
return s_players.length;
185+
}
172186
}

‎coverage.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"contracts\\Raffle.sol":{"l":{"64":3,"65":3,"66":3,"67":3,"68":3,"69":3,"70":3,"71":3,"75":5,"77":4,"79":3,"81":3,"103":1,"104":1,"105":1,"106":1,"107":1,"113":1,"114":1,"115":0,"122":1,"123":1,"130":1,"137":0,"138":0,"139":0,"140":0,"141":0,"142":0,"143":0,"144":0,"145":0,"147":0,"152":6,"156":1,"160":0,"164":1,"168":0,"172":7},"path":"C:\\Users\\Sosiaalinen\\hardhat-raffle\\contracts\\Raffle.sol","s":{"1":3,"2":3,"3":3,"4":3,"5":3,"6":3,"7":3,"8":3,"9":5,"10":4,"11":3,"12":3,"13":1,"14":1,"15":1,"16":1,"17":1,"18":1,"19":1,"20":1,"21":1,"22":1,"23":0,"24":0,"25":0,"26":0,"27":0,"28":0,"29":0,"30":0,"31":0,"32":6,"33":1,"34":0,"35":1,"36":0,"37":7},"b":{"1":[1,4],"2":[1,3],"3":[0,1],"4":[0,0]},"f":{"1":3,"2":5,"3":1,"4":1,"5":0,"6":6,"7":1,"8":0,"9":1,"10":0,"11":7},"fnMap":{"1":{"name":"constructor","line":63,"loc":{"start":{"line":56,"column":4},"end":{"line":72,"column":4}}},"2":{"name":"enterRaffle","line":74,"loc":{"start":{"line":74,"column":4},"end":{"line":82,"column":4}}},"3":{"name":"checkUpkeep","line":93,"loc":{"start":{"line":93,"column":4},"end":{"line":108,"column":4}}},"4":{"name":"performUpkeep","line":110,"loc":{"start":{"line":110,"column":4},"end":{"line":131,"column":4}}},"5":{"name":"fulfillRandomWords","line":133,"loc":{"start":{"line":133,"column":4},"end":{"line":148,"column":4}}},"6":{"name":"getEntranceFee","line":151,"loc":{"start":{"line":151,"column":4},"end":{"line":153,"column":4}}},"7":{"name":"getPlayer","line":155,"loc":{"start":{"line":155,"column":4},"end":{"line":157,"column":4}}},"8":{"name":"getRecentWinner","line":159,"loc":{"start":{"line":159,"column":4},"end":{"line":161,"column":4}}},"9":{"name":"getRaffleState","line":163,"loc":{"start":{"line":163,"column":4},"end":{"line":165,"column":4}}},"10":{"name":"getNumWords","line":167,"loc":{"start":{"line":167,"column":4},"end":{"line":169,"column":4}}},"11":{"name":"getInterval","line":171,"loc":{"start":{"line":171,"column":4},"end":{"line":173,"column":4}}}},"statementMap":{"1":{"start":{"line":64,"column":8},"end":{"line":64,"column":69}},"2":{"start":{"line":65,"column":8},"end":{"line":65,"column":26}},"3":{"start":{"line":66,"column":8},"end":{"line":66,"column":28}},"4":{"start":{"line":67,"column":8},"end":{"line":67,"column":40}},"5":{"start":{"line":68,"column":8},"end":{"line":68,"column":34}},"6":{"start":{"line":69,"column":8},"end":{"line":69,"column":39}},"7":{"start":{"line":70,"column":8},"end":{"line":70,"column":40}},"8":{"start":{"line":71,"column":8},"end":{"line":71,"column":44}},"9":{"start":{"line":75,"column":8},"end":{"line":75,"column":68}},"10":{"start":{"line":77,"column":8},"end":{"line":77,"column":71}},"11":{"start":{"line":79,"column":8},"end":{"line":79,"column":42}},"12":{"start":{"line":81,"column":8},"end":{"line":81,"column":36}},"13":{"start":{"line":103,"column":8},"end":{"line":103,"column":57}},"14":{"start":{"line":104,"column":8},"end":{"line":104,"column":76}},"15":{"start":{"line":105,"column":8},"end":{"line":105,"column":48}},"16":{"start":{"line":106,"column":8},"end":{"line":106,"column":51}},"17":{"start":{"line":107,"column":8},"end":{"line":107,"column":72}},"18":{"start":{"line":113,"column":8},"end":{"line":113,"column":47}},"19":{"start":{"line":114,"column":8},"end":{"line":114,"column":4030}},"20":{"start":{"line":122,"column":8},"end":{"line":122,"column":46}},"21":{"start":{"line":123,"column":8},"end":{"line":123,"column":4300}},"22":{"start":{"line":130,"column":8},"end":{"line":130,"column":45}},"23":{"start":{"line":137,"column":8},"end":{"line":137,"column":65}},"24":{"start":{"line":138,"column":8},"end":{"line":138,"column":63}},"25":{"start":{"line":139,"column":8},"end":{"line":139,"column":36}},"26":{"start":{"line":140,"column":8},"end":{"line":140,"column":39}},"27":{"start":{"line":141,"column":8},"end":{"line":141,"column":43}},"28":{"start":{"line":142,"column":8},"end":{"line":142,"column":40}},"29":{"start":{"line":143,"column":8},"end":{"line":143,"column":78}},"30":{"start":{"line":144,"column":8},"end":{"line":144,"column":5156}},"31":{"start":{"line":147,"column":8},"end":{"line":147,"column":39}},"32":{"start":{"line":152,"column":8},"end":{"line":152,"column":28}},"33":{"start":{"line":156,"column":8},"end":{"line":156,"column":31}},"34":{"start":{"line":160,"column":8},"end":{"line":160,"column":29}},"35":{"start":{"line":164,"column":8},"end":{"line":164,"column":28}},"36":{"start":{"line":168,"column":8},"end":{"line":168,"column":24}},"37":{"start":{"line":172,"column":8},"end":{"line":172,"column":25}}},"branchMap":{"1":{"line":75,"type":"if","locations":[{"start":{"line":75,"column":8},"end":{"line":75,"column":8}},{"start":{"line":75,"column":8},"end":{"line":75,"column":8}}]},"2":{"line":77,"type":"if","locations":[{"start":{"line":77,"column":8},"end":{"line":77,"column":8}},{"start":{"line":77,"column":8},"end":{"line":77,"column":8}}]},"3":{"line":114,"type":"if","locations":[{"start":{"line":114,"column":8},"end":{"line":114,"column":8}},{"start":{"line":114,"column":8},"end":{"line":114,"column":8}}]},"4":{"line":144,"type":"if","locations":[{"start":{"line":144,"column":8},"end":{"line":144,"column":8}},{"start":{"line":144,"column":8},"end":{"line":144,"column":8}}]}}},"contracts\\test\\VRFCoordinatorV2Mock.sol":{"l":{},"path":"C:\\Users\\Sosiaalinen\\hardhat-raffle\\contracts\\test\\VRFCoordinatorV2Mock.sol","s":{},"b":{},"f":{},"fnMap":{},"statementMap":{},"branchMap":{}}}

‎coverage/base.css

+213
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,213 @@
1+
body, html {
2+
margin:0; padding: 0;
3+
height: 100%;
4+
}
5+
body {
6+
font-family: Helvetica Neue, Helvetica, Arial;
7+
font-size: 14px;
8+
color:#333;
9+
}
10+
.small { font-size: 12px; }
11+
*, *:after, *:before {
12+
-webkit-box-sizing:border-box;
13+
-moz-box-sizing:border-box;
14+
box-sizing:border-box;
15+
}
16+
h1 { font-size: 20px; margin: 0;}
17+
h2 { font-size: 14px; }
18+
pre {
19+
font: 12px/1.4 Consolas, "Liberation Mono", Menlo, Courier, monospace;
20+
margin: 0;
21+
padding: 0;
22+
-moz-tab-size: 2;
23+
-o-tab-size: 2;
24+
tab-size: 2;
25+
}
26+
a { color:#0074D9; text-decoration:none; }
27+
a:hover { text-decoration:underline; }
28+
.strong { font-weight: bold; }
29+
.space-top1 { padding: 10px 0 0 0; }
30+
.pad2y { padding: 20px 0; }
31+
.pad1y { padding: 10px 0; }
32+
.pad2x { padding: 0 20px; }
33+
.pad2 { padding: 20px; }
34+
.pad1 { padding: 10px; }
35+
.space-left2 { padding-left:55px; }
36+
.space-right2 { padding-right:20px; }
37+
.center { text-align:center; }
38+
.clearfix { display:block; }
39+
.clearfix:after {
40+
content:'';
41+
display:block;
42+
height:0;
43+
clear:both;
44+
visibility:hidden;
45+
}
46+
.fl { float: left; }
47+
@media only screen and (max-width:640px) {
48+
.col3 { width:100%; max-width:100%; }
49+
.hide-mobile { display:none!important; }
50+
}
51+
52+
.quiet {
53+
color: #7f7f7f;
54+
color: rgba(0,0,0,0.5);
55+
}
56+
.quiet a { opacity: 0.7; }
57+
58+
.fraction {
59+
font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
60+
font-size: 10px;
61+
color: #555;
62+
background: #E8E8E8;
63+
padding: 4px 5px;
64+
border-radius: 3px;
65+
vertical-align: middle;
66+
}
67+
68+
div.path a:link, div.path a:visited { color: #333; }
69+
table.coverage {
70+
border-collapse: collapse;
71+
margin: 10px 0 0 0;
72+
padding: 0;
73+
}
74+
75+
table.coverage td {
76+
margin: 0;
77+
padding: 0;
78+
vertical-align: top;
79+
}
80+
table.coverage td.line-count {
81+
text-align: right;
82+
padding: 0 5px 0 20px;
83+
}
84+
table.coverage td.line-coverage {
85+
text-align: right;
86+
padding-right: 10px;
87+
min-width:20px;
88+
}
89+
90+
table.coverage td span.cline-any {
91+
display: inline-block;
92+
padding: 0 5px;
93+
width: 100%;
94+
}
95+
.missing-if-branch {
96+
display: inline-block;
97+
margin-right: 5px;
98+
border-radius: 3px;
99+
position: relative;
100+
padding: 0 4px;
101+
background: #333;
102+
color: yellow;
103+
}
104+
105+
.skip-if-branch {
106+
display: none;
107+
margin-right: 10px;
108+
position: relative;
109+
padding: 0 4px;
110+
background: #ccc;
111+
color: white;
112+
}
113+
.missing-if-branch .typ, .skip-if-branch .typ {
114+
color: inherit !important;
115+
}
116+
.coverage-summary {
117+
border-collapse: collapse;
118+
width: 100%;
119+
}
120+
.coverage-summary tr { border-bottom: 1px solid #bbb; }
121+
.keyline-all { border: 1px solid #ddd; }
122+
.coverage-summary td, .coverage-summary th { padding: 10px; }
123+
.coverage-summary tbody { border: 1px solid #bbb; }
124+
.coverage-summary td { border-right: 1px solid #bbb; }
125+
.coverage-summary td:last-child { border-right: none; }
126+
.coverage-summary th {
127+
text-align: left;
128+
font-weight: normal;
129+
white-space: nowrap;
130+
}
131+
.coverage-summary th.file { border-right: none !important; }
132+
.coverage-summary th.pct { }
133+
.coverage-summary th.pic,
134+
.coverage-summary th.abs,
135+
.coverage-summary td.pct,
136+
.coverage-summary td.abs { text-align: right; }
137+
.coverage-summary td.file { white-space: nowrap; }
138+
.coverage-summary td.pic { min-width: 120px !important; }
139+
.coverage-summary tfoot td { }
140+
141+
.coverage-summary .sorter {
142+
height: 10px;
143+
width: 7px;
144+
display: inline-block;
145+
margin-left: 0.5em;
146+
background: url(sort-arrow-sprite.png) no-repeat scroll 0 0 transparent;
147+
}
148+
.coverage-summary .sorted .sorter {
149+
background-position: 0 -20px;
150+
}
151+
.coverage-summary .sorted-desc .sorter {
152+
background-position: 0 -10px;
153+
}
154+
.status-line { height: 10px; }
155+
/* dark red */
156+
.red.solid, .status-line.low, .low .cover-fill { background:#C21F39 }
157+
.low .chart { border:1px solid #C21F39 }
158+
/* medium red */
159+
.cstat-no, .fstat-no, .cbranch-no, .cbranch-no { background:#F6C6CE }
160+
/* light red */
161+
.low, .cline-no { background:#FCE1E5 }
162+
/* light green */
163+
.high, .cline-yes { background:rgb(230,245,208) }
164+
/* medium green */
165+
.cstat-yes { background:rgb(161,215,106) }
166+
/* dark green */
167+
.status-line.high, .high .cover-fill { background:rgb(77,146,33) }
168+
.high .chart { border:1px solid rgb(77,146,33) }
169+
/* dark yellow (gold) */
170+
.medium .chart { border:1px solid #f9cd0b; }
171+
.status-line.medium, .medium .cover-fill { background: #f9cd0b; }
172+
/* light yellow */
173+
.medium { background: #fff4c2; }
174+
/* light gray */
175+
span.cline-neutral { background: #eaeaea; }
176+
177+
.cbranch-no { background: yellow !important; color: #111; }
178+
179+
.cstat-skip { background: #ddd; color: #111; }
180+
.fstat-skip { background: #ddd; color: #111 !important; }
181+
.cbranch-skip { background: #ddd !important; color: #111; }
182+
183+
184+
.cover-fill, .cover-empty {
185+
display:inline-block;
186+
height: 12px;
187+
}
188+
.chart {
189+
line-height: 0;
190+
}
191+
.cover-empty {
192+
background: white;
193+
}
194+
.cover-full {
195+
border-right: none !important;
196+
}
197+
pre.prettyprint {
198+
border: none !important;
199+
padding: 0 !important;
200+
margin: 0 !important;
201+
}
202+
.com { color: #999 !important; }
203+
.ignore-none { color: #999; font-weight: normal; }
204+
205+
.wrapper {
206+
min-height: 100%;
207+
height: auto !important;
208+
height: 100%;
209+
margin: 0 auto -48px;
210+
}
211+
.footer, .push {
212+
height: 48px;
213+
}

0 commit comments

Comments
 (0)