Skip to content

Commit 31d4d62

Browse files
author
Robin Bryce
committed
review changes
build: use 'local-all' as the native host target and reserve 'all' for people who want no surprises fix: committed -> commit for the field carrying the log commit info move the forestrie CONFIRMED comment to the original CONFIRMED constant and remove the confusing duplicate
1 parent db8ea99 commit 31d4d62

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Generate, Test and Export
3131
run: |
3232
# Note: it is by design that we don't use the builder
33-
task all
33+
task local-all
3434
3535
- name: Show exports
3636
working-directory: exported/

.github/workflows/workflow.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ jobs:
2121
2222
echo "TODO: permissions on accessing our acr prevent this from working"
2323
exit 0
24-
# task dockerall
24+
# ensure the all target (which runs everything in docker) works
25+
# task all

Taskfile.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,16 @@ tasks:
6767
### -------------------------
6868
# Primary workflow tasks
6969
### -------------------------
70-
dockerall:
70+
all:
7171
desc: "do everything necessary after clone (or rebase) in the builder"
7272
cmds:
7373
- task: builder-start
7474
- defer: {task: builder-cleanup}
75-
- task: all
75+
- task: local-all
7676

77-
all:
77+
local-all:
7878
desc: |
79-
do everything necessary after clone (or rebase)
79+
do everything necessary after clone (or rebase) (faster as it RUNS ON NATIVE HOST)
8080
8181
Note: This requires go and protoc installed on your host. If you are not
8282
comfortable doing this then use dockerall.

datatrails-common-api/assets/v2/assets/enums.proto

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ option go_package="github.com/datatrails/go-datatrails-common-api-gen/assets/v2/
55
enum ConfirmationStatus {
66
CONFIRMATION_STATUS_UNSPECIFIED = 0;
77
PENDING = 1; // not yet committed
8-
CONFIRMED = 2; // committed
8+
CONFIRMED = 2; // committed. forestrie: "You can easily prove it changed"
99
FAILED = 3; // permanent failure
1010

1111
// Regarding the new statuses for forestrie, See
1212
// https://github.com/datatrails/epic-8120-scalable-proof-mechanisms/blob/main/event-trust-levels.md
1313
STORED = 4; // forestrie, "its in the db"
1414
COMMITTED = 5; // forestrie, "you can know if its changed"
15-
// CONFIRMED = 6; // forestrie, "You can easily prove it changed"
16-
UNEQUIVOCAL = 7; // forestrie, "You easily prove it was publicly available to all"
15+
// We re-use the constant for CONFIRMED (above)
16+
UNEQUIVOCAL = 6; // forestrie, "You easily prove it was publicly available to all"
1717
}
1818

1919
enum TrackedStatus {

datatrails-common-api/assets/v2/assets/merklelogentry.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ message MerkleLogCommitMessage {
3030

3131
uint32 log_version = 3;
3232
uint32 log_epoch = 4;
33-
MerkleLogCommit committed = 5;
33+
MerkleLogCommit commit = 5;
3434
}
3535

3636

0 commit comments

Comments
 (0)