Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
path = vendor/nim-ssz-serialization
url = https://github.com/status-im/nim-ssz-serialization.git
ignore = untracked
branch = master
branch = hashtree-which-skips-clang-assembler
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not that inclined either to merge something which uses a non-trunk branch, either.

So I assume this PR is still in progress.

[submodule "vendor/nim-websock"]
path = vendor/nim-websock
url = https://github.com/status-im/nim-websock.git
Expand Down
14 changes: 7 additions & 7 deletions beacon_chain/libnimbus_lc/test_libnimbus_lc.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static void *readEntireFile(const char *path, int *numBytes)
err = fseek(file, 0, SEEK_SET);
check(!err);

char *buffer = malloc((size_t) size + 1);
char *buffer = (char *)malloc((size_t) size + 1);
check(buffer);

size_t actualSize = fread(buffer, 1, (size_t) size, file);
Expand All @@ -66,7 +66,7 @@ ETH_RESULT_USE_CHECK
static ETHConsensusConfig *loadCfg(const char *path)
{
void *fileContent = readEntireFile(path, /* numBytes: */ NULL);
ETHConsensusConfig *cfg = ETHConsensusConfigCreateFromYaml(fileContent);
ETHConsensusConfig *cfg = ETHConsensusConfigCreateFromYaml((const char *)fileContent);
check(cfg);
free(fileContent);
return cfg;
Expand All @@ -90,7 +90,7 @@ static ETHBeaconState *loadGenesis(const ETHConsensusConfig *cfg, const char *pa

static void printHexString(const void *bytes, int numBytes)
{
const uint8_t *bytes_ = bytes;
const uint8_t *bytes_ = (const uint8_t *)bytes;
printf("0x");
for (int i = 0; i < numBytes; i++) {
printf("%02x", bytes_[i]);
Expand All @@ -99,7 +99,7 @@ static void printHexString(const void *bytes, int numBytes)

static void printHexStringReversed(const void *bytes, int numBytes)
{
const uint8_t *bytes_ = bytes;
const uint8_t *bytes_ = (const uint8_t *)bytes;
printf("0x");
for (int i = numBytes - 1; i >= 0; i--) {
printf("%02x", bytes_[i]);
Expand Down Expand Up @@ -369,7 +369,7 @@ int main(void)
void *blockHeaderJson = readEntireFile(
__DIR__ "/test_files/executionBlockHeader.json", /* numBytes: */ NULL);
ETHExecutionBlockHeader *executionBlockHeader =
ETHExecutionBlockHeaderCreateFromJson(copiedExecutionHash, blockHeaderJson);
ETHExecutionBlockHeaderCreateFromJson(copiedExecutionHash, (const char *)blockHeaderJson);
check(executionBlockHeader);
free(blockHeaderJson);
ETHRootDestroy(copiedExecutionHash);
Expand Down Expand Up @@ -434,7 +434,7 @@ int main(void)
void *sampleTransactionsJson = readEntireFile(
__DIR__ "/test_files/transactions.json", /* numBytes: */ NULL);
ETHTransactions *transactions =
ETHTransactionsCreateFromJson(&sampleTransactionsRoot, sampleTransactionsJson);
ETHTransactionsCreateFromJson(&sampleTransactionsRoot, (const char *)sampleTransactionsJson);
check(transactions);
free(sampleTransactionsJson);

Expand All @@ -447,7 +447,7 @@ int main(void)
void *sampleReceiptsJson = readEntireFile(
__DIR__ "/test_files/receipts.json", /* numBytes: */ NULL);
ETHReceipts *receipts =
ETHReceiptsCreateFromJson(&sampleReceiptsRoot, sampleReceiptsJson, transactions);
ETHReceiptsCreateFromJson(&sampleReceiptsRoot, (const char *)sampleReceiptsJson, transactions);
check(receipts);
free(sampleReceiptsJson);

Expand Down
2 changes: 1 addition & 1 deletion ci/Jenkinsfile.macos
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ library '[email protected]'

pipeline {
/* This way we run the same Jenkinsfile on different platforms. */
agent { label 'macos && aarch64' }
agent { label 'macm1-01' }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this is meant to be merged yet but if so, probably should be in the PR? Or if it's still trying to debug macm1-01 specifically, sure.


parameters {
choice(
Expand Down
2 changes: 1 addition & 1 deletion vendor/nim-ssz-serialization
Loading