Skip to content

Commit

Permalink
review changes
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Robin Bryce committed Jan 15, 2024
1 parent db8ea99 commit 31d4d62
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Generate, Test and Export
run: |
# Note: it is by design that we don't use the builder
task all
task local-all
- name: Show exports
working-directory: exported/
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ jobs:
echo "TODO: permissions on accessing our acr prevent this from working"
exit 0
# task dockerall
# ensure the all target (which runs everything in docker) works
# task all
8 changes: 4 additions & 4 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,16 @@ tasks:
### -------------------------
# Primary workflow tasks
### -------------------------
dockerall:
all:
desc: "do everything necessary after clone (or rebase) in the builder"
cmds:
- task: builder-start
- defer: {task: builder-cleanup}
- task: all
- task: local-all

all:
local-all:
desc: |
do everything necessary after clone (or rebase)
do everything necessary after clone (or rebase) (faster as it RUNS ON NATIVE HOST)
Note: This requires go and protoc installed on your host. If you are not
comfortable doing this then use dockerall.
Expand Down
6 changes: 3 additions & 3 deletions datatrails-common-api/assets/v2/assets/enums.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ option go_package="github.com/datatrails/go-datatrails-common-api-gen/assets/v2/
enum ConfirmationStatus {
CONFIRMATION_STATUS_UNSPECIFIED = 0;
PENDING = 1; // not yet committed
CONFIRMED = 2; // committed
CONFIRMED = 2; // committed. forestrie: "You can easily prove it changed"
FAILED = 3; // permanent failure

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

enum TrackedStatus {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ message MerkleLogCommitMessage {

uint32 log_version = 3;
uint32 log_epoch = 4;
MerkleLogCommit committed = 5;
MerkleLogCommit commit = 5;
}


Expand Down

0 comments on commit 31d4d62

Please sign in to comment.