Skip to content

Commit 91488b3

Browse files
committed
Reenable disabled sections
1 parent eb6f75a commit 91488b3

File tree

2 files changed

+79
-79
lines changed

2 files changed

+79
-79
lines changed

Jenkinsfile

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -21,46 +21,46 @@ pipeline {
2121

2222
stages {
2323

24-
// stage("Truffle tests - Public") {
25-
// agent {
26-
// docker {
27-
// image "node:14"
28-
// label "${LABEL}"
29-
// }
30-
// }
31-
// steps {
32-
// script {
33-
// try {
34-
// sh "npm ci --production=false --no-progress"
35-
// sh "npm run autotest fast"
36-
// } finally {
37-
// archiveArtifacts artifacts: "logs/**"
38-
// }
39-
// }
40-
// }
41-
// }
24+
stage("Truffle tests - Public") {
25+
agent {
26+
docker {
27+
image "node:14"
28+
label "${LABEL}"
29+
}
30+
}
31+
steps {
32+
script {
33+
try {
34+
sh "npm ci --production=false --no-progress"
35+
sh "npm run autotest fast"
36+
} finally {
37+
archiveArtifacts artifacts: "logs/**"
38+
}
39+
}
40+
}
41+
}
4242

43-
// stage("Truffle tests - KYC") {
44-
// agent {
45-
// docker {
46-
// image "node:14"
47-
// label "${LABEL}"
48-
// }
49-
// }
50-
// environment {
51-
// KYC = 'true'
52-
// }
53-
// steps {
54-
// script {
55-
// try {
56-
// sh "npm ci --production=false --no-progress"
57-
// sh "npm run autotest fast"
58-
// } finally {
59-
// archiveArtifacts artifacts: "logs/**"
60-
// }
61-
// }
62-
// }
63-
// }
43+
stage("Truffle tests - KYC") {
44+
agent {
45+
docker {
46+
image "node:14"
47+
label "${LABEL}"
48+
}
49+
}
50+
environment {
51+
KYC = 'true'
52+
}
53+
steps {
54+
script {
55+
try {
56+
sh "npm ci --production=false --no-progress"
57+
sh "npm run autotest fast"
58+
} finally {
59+
archiveArtifacts artifacts: "logs/**"
60+
}
61+
}
62+
}
63+
}
6464

6565
/*
6666
Disable coverage

migrations/1001_fillwallets.js

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -20,47 +20,47 @@ module.exports = async function (deployer, network, accounts) {
2020
console.log("Chaintype is:", chaintype);
2121
console.log("Deployer is:", accounts[0]);
2222

23-
// const deploymentOptions = CONFIG.chains[chainid] || CONFIG.chains.default;
23+
const deploymentOptions = CONFIG.chains[chainid] || CONFIG.chains.default;
2424

25-
// //only for standard private chains
26-
// if (chainid > 1000 && !process.env.KYC) {
27-
// let IexecInterfaceInstance;
28-
// const IexecProxyInstance = await ERC1538Proxy.deployed();
29-
// const totalAmount = ACCOUNTS.reduce(
30-
// (acc, { amount }) => acc.add(web3.utils.toBN(amount)),
31-
// web3.utils.toBN(0)
32-
// );
25+
//only for standard private chains
26+
if (chainid > 1000 && !process.env.KYC) {
27+
let IexecInterfaceInstance;
28+
const IexecProxyInstance = await ERC1538Proxy.deployed();
29+
const totalAmount = ACCOUNTS.reduce(
30+
(acc, { amount }) => acc.add(web3.utils.toBN(amount)),
31+
web3.utils.toBN(0)
32+
);
3333

34-
// // deposit
35-
// console.log("Depositing " + totalAmount);
36-
// switch (deploymentOptions.asset) {
37-
// case "Token":
38-
// IexecInterfaceInstance = await IexecInterfaceToken.at(
39-
// IexecProxyInstance.address
40-
// );
41-
// const RLCInstance = await RLC.deployed();
42-
// await RLCInstance.approveAndCall(
43-
// IexecInterfaceInstance.address,
44-
// totalAmount,
45-
// "0x"
46-
// );
47-
// break;
48-
// case "Native":
49-
// IexecInterfaceInstance = await IexecInterfaceNative.at(
50-
// IexecProxyInstance.address
51-
// );
52-
// await IexecInterfaceInstance.deposit({
53-
// from: accounts[0],
54-
// value: totalAmount.mul(web3.utils.toBN(10 ** 9)),
55-
// });
56-
// break;
57-
// }
34+
// deposit
35+
console.log("Depositing " + totalAmount);
36+
switch (deploymentOptions.asset) {
37+
case "Token":
38+
IexecInterfaceInstance = await IexecInterfaceToken.at(
39+
IexecProxyInstance.address
40+
);
41+
const RLCInstance = await RLC.deployed();
42+
await RLCInstance.approveAndCall(
43+
IexecInterfaceInstance.address,
44+
totalAmount,
45+
"0x"
46+
);
47+
break;
48+
case "Native":
49+
IexecInterfaceInstance = await IexecInterfaceNative.at(
50+
IexecProxyInstance.address
51+
);
52+
await IexecInterfaceInstance.deposit({
53+
from: accounts[0],
54+
value: totalAmount.mul(web3.utils.toBN(10 ** 9)),
55+
});
56+
break;
57+
}
5858

59-
// // all transfers
60-
// for (account of ACCOUNTS) {
61-
// const { address, amount } = account
62-
// console.log("Transferring for address " + address + ": " + amount);
63-
// await IexecInterfaceInstance.transfer(address, amount);
64-
// }
65-
// }
59+
// all transfers
60+
for (account of ACCOUNTS) {
61+
const { address, amount } = account
62+
console.log("Transferring for address " + address + ": " + amount);
63+
await IexecInterfaceInstance.transfer(address, amount);
64+
}
65+
}
6666
};

0 commit comments

Comments
 (0)