- Fix failure to generate all possible combinations #3132
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thank you for the contribution! Please remember to sign the commit so that DCO check passes, instructions: |
|
@timtim-git, please could you add a unit test to |
yacovm
reviewed
Dec 19, 2021
|
@denyeart when this is merged we would need to backport it everywhere... |
timtim-git
force-pushed
the
main
branch
2 times, most recently
from
9387962
to
189affe
Compare
yacovm
reviewed
Dec 20, 2021
Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com>
Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com>
Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com>
This will fix your build error: |
Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com>
|
@denyeart let's merge this everywhere |
|
@Mergifyio backport release-2.4 |
|
@Mergifyio backport release-2.3 |
|
@Mergifyio backport release-2.2 |
|
@Mergifyio backport release-2.1 |
|
@Mergifyio backport release-1.4 |
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Dec 23, 2021
* - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Update choose_test.go Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix build error Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> (cherry picked from commit 21a17ee)
mergify bot
pushed a commit
that referenced
this pull request
Dec 23, 2021
* - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Update choose_test.go Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix build error Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> (cherry picked from commit 21a17ee)
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Dec 23, 2021
* - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Update choose_test.go Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix build error Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> (cherry picked from commit 21a17ee)
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Dec 23, 2021
* - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Update choose_test.go Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix build error Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> (cherry picked from commit 21a17ee)
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Dec 23, 2021
* - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Update choose_test.go Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix build error Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> (cherry picked from commit 21a17ee)
✅ Backports have been created
|
denyeart
pushed a commit
to denyeart/fabric
that referenced
this pull request
Jan 4, 2022
…dger#3132) * - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Update choose_test.go Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix build error Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> Signed-off-by: David Enyeart <enyeart@us.ibm.com>
denyeart
pushed a commit
that referenced
this pull request
Jan 4, 2022
* - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Update choose_test.go Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix build error Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> (cherry picked from commit 21a17ee)
denyeart
pushed a commit
that referenced
this pull request
Jan 4, 2022
* - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Update choose_test.go Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix build error Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> (cherry picked from commit 21a17ee)
andrew-coleman
pushed a commit
that referenced
this pull request
Jan 4, 2022
…3150) * - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix failure to generate all possible combinations Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1. For example, when there are 6 organizations and the endorsement policy is set to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN() in original code are as below. [0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5], [0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Obviously, the function fails to find out all the possible combinations. Some of the combinations are overrided by child's call. This bug would trigger below error sometimes when the alive peers are not within the above combinations. [discovery] chaincodeQuery -> ERRO 13a Failed constructing descriptor for chaincode chaincodes:<name:"XXXX" > ,: no peer combination can satisfy the endorsement policy To fix it, the last line of choose() should be changed to pass a copy of "currentSubGroup" to the recursive call instead, i.e. choose(n, targetAmount, i+1, append(make([]int, 0), currentSubGroup...), subGroups) After applying the fix, the resulting combinations generated should be corrected as below. [0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4], [0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5], [0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5], [1 2 4 5], [1 3 4 5], [2 3 4 5] Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Update choose_test.go Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> * - Fix build error Signed-off-by: Tim <96273851+timtim-git@users.noreply.github.com> Signed-off-by: David Enyeart <enyeart@us.ibm.com> Co-authored-by: Tim <96273851+timtim-git@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Type of change
Description
Bug happens when the endorsement policy is set to k-out-of-n where (n - k) > 1.
For example, when there are 6 organizations and the endorsement policy is set
to majority (i.e. 4-out-of-6). The combinations calculated by chooseKoutOfN()
in original code are as below.
[0 1 2 5], [0 1 2 5], [0 1 2 5], [0 1 3 5],
[0 1 3 5], [0 1 4 5], [0 2 3 5], [0 2 3 5],
[0 2 4 5], [0 3 4 5], [1 2 3 5], [1 2 3 5],
[1 2 4 5], [1 3 4 5], [2 3 4 5]
Obviously, the function fails to find out all the possible combinations. Some of
the combinations are overrided by child's call. This bug would trigger below
error sometimes when the alive peers are not within the above combinations.
To fix it, the last line of choose() should be changed to pass a copy of
"currentSubGroup" to the recursive call instead, i.e.
After applying the fix, the resulting combinations generated should be corrected
as below.
[0 1 2 3], [0 1 2 4], [0 1 2 5], [0 1 3 4],
[0 1 3 5], [0 1 4 5], [0 2 3 4], [0 2 3 5],
[0 2 4 5], [0 3 4 5], [1 2 3 4], [1 2 3 5],
[1 2 4 5], [1 3 4 5], [2 3 4 5]