Skip to content
This repository has been archived by the owner on Jan 27, 2022. It is now read-only.

adding contract for compliency with v1.1 of the spec #123

Conversation

Amxx
Copy link
Contributor

@Amxx Amxx commented Oct 8, 2019

Replaces #72

Copy link
Contributor

@danintel danintel left a comment

Choose a reason for hiding this comment

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

Please do not close and reopen PRs, especially without addressing issues. Use the Same PR. Thank you.

This PR has no DCO line (see PR #72 for details) in 1 of the 2 commits. All commits should be merged into 1 commit with a DCO line for the automated DCO check to pass. For you:
Signed-off-by: Hadrien Croubois <[email protected]>

Also, others have other issues that may still need to be addressed from #72.

// WorkerID → Worker
mapping(bytes32 => Worker) private m_workers;

// workerType → organizationId → appTypeId → WorkerID[]
Copy link
Contributor

Choose a reason for hiding this comment

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

From #72:
s/appTypeId/appTypeIds/

(I see no appTypeId here, only appTypeIds)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

appTypeIds are arrays of appTypeId
to make worker searcheable by invididual appTypeId, we have to split the set of supported appTypeIds and enter as many entries in this multidimensional mapping.

workerRegister's code should show that clearly

Copy link
Contributor

@danintel danintel left a comment

Choose a reason for hiding this comment

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

The commits need to be merged with a DCO line before CI can allow this PR to be merged.

Signed-off-by: Hadrien Croubois <[email protected]>
hariharan-avs pushed a commit to hariharan-avs/avalon that referenced this pull request Oct 10, 2019
* enable build HW mode without requiring SGX HW and remove large test artifacts

Signed-off-by: Michael Steiner <[email protected]>

* docker images allowing for build in SGX HW mode, also including sawtooth related parts
docker-compose files allowing automatic setup with various configurations of source, sgx mode, proxy (see header of docker/sawtooth*yaml)

bumped up sgx sdk to 2.4, sgxssl to 2.4.1 and openssl to 1.1.0.j (but resort to default OS openssl)

Signed-off-by: Michael Steiner <[email protected]>

* automated building and running of run-test from current locally committed branch via docker-compose (and test target in docker/Makefile)

remove obsolete dirs

Signed-off-by: Michael Steiner <[email protected]>

* resolve conflict with PR#124 and move all code generation to apprioriate makefiles

Signed-off-by: Michael Steiner <[email protected]>
@manojgop manojgop merged commit 460521d into hyperledger-archives:master Oct 12, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants