Skip to content
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

Jump to bottom

Removed unnecessary usage of Link token interface #103

Merged
merged 1 commit into from
Jun 10, 2022
+1 −9
Merged

Removed unnecessary usage of Link token interface #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions contracts/RandomNumberConsumerV2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// An example of a consumer contract that relies on a subscription for funding.
pragma solidity ^0.8.7;

import "@chainlink/contracts/src/v0.8/interfaces/LinkTokenInterface.sol";
import "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol";
import "@chainlink/contracts/src/v0.8/VRFConsumerBaseV2.sol";

Expand All @@ -12,7 +11,6 @@ import "@chainlink/contracts/src/v0.8/VRFConsumerBaseV2.sol";
*/
contract RandomNumberConsumerV2 is VRFConsumerBaseV2 {
VRFCoordinatorV2Interface immutable COORDINATOR;
LinkTokenInterface immutable LINKTOKEN;

// Your subscription ID.
uint64 immutable s_subscriptionId;
Expand Down Expand Up @@ -53,11 +51,9 @@ contract RandomNumberConsumerV2 is VRFConsumerBaseV2 {
constructor(
uint64 subscriptionId,
address vrfCoordinator,
address link,
bytes32 keyHash
) VRFConsumerBaseV2(vrfCoordinator) {
COORDINATOR = VRFCoordinatorV2Interface(vrfCoordinator);
LINKTOKEN = LinkTokenInterface(link);
s_keyHash = keyHash;
s_owner = msg.sender;
s_subscriptionId = subscriptionId;
Expand Down
6 changes: 1 addition & 5 deletions deploy/03_Deploy_RandomNumberConsumer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,13 @@ module.exports = async ({ getNamedAccounts, deployments }) => {
const { deploy, get, log } = deployments
const { deployer } = await getNamedAccounts()
const chainId = network.config.chainId
let linkTokenAddress
let vrfCoordinatorAddress
let subscriptionId

if (chainId == 31337) {
linkToken = await get("LinkToken")
VRFCoordinatorV2Mock = await ethers.getContract("VRFCoordinatorV2Mock")

vrfCoordinatorAddress = VRFCoordinatorV2Mock.address
linkTokenAddress = linkToken.address

const fundAmount = networkConfig[chainId]["fundAmount"]
const transaction = await VRFCoordinatorV2Mock.createSubscription()
Expand All @@ -28,14 +25,13 @@ module.exports = async ({ getNamedAccounts, deployments }) => {
await VRFCoordinatorV2Mock.fundSubscription(subscriptionId, fundAmount)
} else {
subscriptionId = process.env.VRF_SUBSCRIPTION_ID
linkTokenAddress = networkConfig[chainId]["linkToken"]
vrfCoordinatorAddress = networkConfig[chainId]["vrfCoordinator"]
}
const keyHash = networkConfig[chainId]["keyHash"]
const waitBlockConfirmations = developmentChains.includes(network.name)
? 1
: VERIFICATION_BLOCK_CONFIRMATIONS
const args = [subscriptionId, vrfCoordinatorAddress, linkTokenAddress, keyHash]
const args = [subscriptionId, vrfCoordinatorAddress, keyHash]
const randomNumberConsumerV2 = await deploy("RandomNumberConsumerV2", {
from: deployer,
args: args,
Expand Down