Skip to content

Commit 2ae9ae3

Browse files
committed
fd-conformance: use consensus mode
1 parent 7ced055 commit 2ae9ae3

File tree

1 file changed

+9
-22
lines changed

1 file changed

+9
-22
lines changed

scripts/ci/fd-conformance.mjs

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,29 @@ import { getProgramId, getProgramSharedObjectPath, workingDirectory } from '../u
1010

1111
// Clone the conformance harness.
1212
const harnessPath = path.join(workingDirectory, 'solana-conformance');
13-
await $`git clone https://github.com/firedancer-io/solana-conformance.git`;
13+
// await $`git clone https://github.com/firedancer-io/solana-conformance.git`;
1414

1515
// Clone the test vectors.
1616
const testVectorsPath = path.join(harnessPath, 'impl', 'test-vectors');
17-
await $`git clone https://github.com/firedancer-io/test-vectors.git ${testVectorsPath}`;
18-
19-
// Remove the fixtures we want to skip.
20-
const fixturesPath = path.join(testVectorsPath, 'instr', 'fixtures', 'config');
21-
const skipFixtures = [
22-
// These fixtures provide executable config accounts, which we know is a
23-
// case that can't manifest under the Solana protocol.
24-
'04a0b782cb1f4b1be044313331edda9dfb4696d6.fix',
25-
'c7ec10c03d5faadcebd32dc5b9a4086abef892ca_3157979.fix',
26-
'68e8dbf0f31de69a2bd1d2c0fe9af3ba676301d6_3157979.fix',
27-
'f84b5ad44f7a253ebc8056d06396694370a7fa4c_3157979.fix',
28-
'8bbe900444c675cfc3fbf0f80ae2eb061e536a09.fix',
29-
];
30-
for (const fixture of skipFixtures) {
31-
await $`rm -f ${path.join(fixturesPath, fixture)}`;
32-
}
17+
// await $`git clone https://github.com/firedancer-io/test-vectors.git ${testVectorsPath}`;
3318

3419
// Add the Mollusk-generated fixtures to the test inputs.
20+
const firedancerFixturesPath = path.join(testVectorsPath, 'instr', 'fixtures', 'config');
3521
const molluskFixturesPath = path.join(workingDirectory, 'program', 'fuzz', 'blob');
36-
await $`cp -a ${molluskFixturesPath}/. ${fixturesPath}/`;
22+
// await $`cp -a ${molluskFixturesPath}/. ${firedancerFixturesPath}/`;
3723

3824
// Clone the SolFuzz-Agave harness.
3925
const solFuzzAgavePath = path.join(harnessPath, 'impl', 'solfuzz-agave');
40-
await $`git clone -b agave-v2.1.3 http://github.com/firedancer-io/solfuzz-agave.git ${solFuzzAgavePath}`;
26+
// await $`git clone -b agave-v2.1.3 http://github.com/firedancer-io/solfuzz-agave.git ${solFuzzAgavePath}`;
4127

4228
// Fetch protobuf files.
43-
await $`make -j -C ${solFuzzAgavePath} fetch_proto`
29+
// await $`make -j -C ${solFuzzAgavePath} fetch_proto`
4430

4531
// Move into the conformance harness.
4632
cd(harnessPath);
4733

4834
// Build the environment.
49-
await $`bash install_ubuntu_lite.sh`;
35+
// await $`bash install_ubuntu_lite.sh`;
5036

5137
const solFuzzAgaveManifestPath = path.join(solFuzzAgavePath, 'Cargo.toml');
5238
const solFuzzAgaveTargetPath = path.join(
@@ -83,7 +69,8 @@ await $`rm -rf test_results`;
8369
// Run the tests.
8470
await $`source test_suite_env/bin/activate && \
8571
solana-test-suite run-tests \
86-
-i ${fixturesPath} -s ${testTargetPathBuiltin} -t ${testTargetPathCoreBpf}`;
72+
-i ${firedancerFixturesPath} -s ${testTargetPathBuiltin} -t ${testTargetPathCoreBpf} \
73+
--consensus-mode`;
8774

8875
// Assert conformance.
8976
// There should be no fixtures in the `failed_protobufs` directory.

0 commit comments

Comments
 (0)