[FABG-723] add int tests for dist signatures

Integration test includes external signing using OpenSSL When signing with an external tool like OpenSSL, one must convert the signature with a low S value to prevent from ECDSA signature malleability. This is a Fabric requirement as well. For more details, see the comments about this in the call: loadExternalSignature() found in test/integration/e2e/orgs/multi_orgs_ch_update_signatures_test.go Change-Id: Idddae8b38c11c821fcf0467509aa6a79e963396e Signed-off-by: Baha Shaaban <[email protected]>
hyperledger · Oct 4, 2018 · 7687669 · 7687669
1 parent 6ca34b9
commit 7687669
Show file tree

Hide file tree

Showing 10 changed files with 694 additions and 36 deletions.
diff --git a/test/fixtures/fabric/v1.1/config/configtx.yaml b/test/fixtures/fabric/v1.1/config/configtx.yaml
@@ -31,6 +31,7 @@ Profiles:
                 Organizations:
                     - *org1
                     - *org2
+
     OneOrgChannel:
         Consortium: SampleConsortium
         Application:
@@ -39,6 +40,7 @@ Profiles:
             - *org1
             Capabilities:
                 <<: *ApplicationCapabilities
+
     TwoOrgsChannel:
         Consortium: SampleConsortium
         Application:
@@ -49,6 +51,16 @@ Profiles:
             Capabilities:
                 <<: *ApplicationCapabilities
 
+    DsChannel:
+        Consortium: SampleConsortium
+        Application:
+            <<: *ApplicationDefaults
+            Organizations:
+                - *org1
+                - *org2
+            Capabilities:
+                <<: *ApplicationCapabilities
+
 ################################################################################
 #
 #   Section: Organizations

diff --git a/test/fixtures/fabric/v1.2/config/configtx.yaml b/test/fixtures/fabric/v1.2/config/configtx.yaml
@@ -409,7 +409,7 @@ Profiles:
                       <<: *OrdererOrgPolicies
                       Admins:
                           Type: Signature
-                          Rule: "OR('OrdererMSP.member')"
+                          Rule: "OR('OrdererMSP.admin')"
         Consortiums:
             TestConsortium:
                 Organizations:
@@ -418,7 +418,7 @@ Profiles:
                       <<: *Org1Policies
                       Admins:
                           Type: Signature
-                          Rule: "OR('Org1MSP.member')"
+                          Rule: "OR('Org1MSP.admin')"
 
             SampleConsortium:
                 Organizations:
@@ -427,13 +427,13 @@ Profiles:
                           <<: *Org1Policies
                           Admins:
                               Type: Signature
-                              Rule: "OR('Org1MSP.member')"
+                              Rule: "OR('Org1MSP.admin')"
                     - <<: *Org2
                       Policies:
                           <<: *Org2Policies
                           Admins:
                               Type: Signature
-                              Rule: "OR('Org2MSP.member')"
+                              Rule: "OR('Org2MSP.admin')"
 
     OneOrgChannel:
         Consortium: TestConsortium
@@ -443,6 +443,14 @@ Profiles:
             - *Org1
 
     TwoOrgsChannel:
+        Consortium: SampleConsortium
+        Application:
+            <<: *ApplicationDefaults
+            Organizations:
+                - *Org1
+                - *Org2
+
+    DsChannel:
         Consortium: SampleConsortium
         Application:
             <<: *ApplicationDefaults

diff --git a/test/fixtures/fabric/v1.3/config/configtx.yaml b/test/fixtures/fabric/v1.3/config/configtx.yaml
@@ -409,7 +409,7 @@ Profiles:
                   <<: *OrdererOrgPolicies
                   Admins:
                       Type: Signature
-                      Rule: "OR('OrdererMSP.member')"
+                      Rule: "OR('OrdererMSP.admin')"
         Consortiums:
             TestConsortium:
                 Organizations:
@@ -418,7 +418,7 @@ Profiles:
                       <<: *Org1Policies
                       Admins:
                           Type: Signature
-                          Rule: "OR('Org1MSP.member')"
+                          Rule: "OR('Org1MSP.admin')"
 
             SampleConsortium:
                 Organizations:
@@ -427,13 +427,13 @@ Profiles:
                       <<: *Org1Policies
                       Admins:
                           Type: Signature
-                          Rule: "OR('Org1MSP.member')"
+                          Rule: "OR('Org1MSP.admin')"
                 - <<: *Org2
                   Policies:
                       <<: *Org2Policies
                       Admins:
                           Type: Signature
-                          Rule: "OR('Org2MSP.member')"
+                          Rule: "OR('Org2MSP.admin')"
 
     OneOrgChannel:
         Consortium: TestConsortium
@@ -443,6 +443,14 @@ Profiles:
             - *Org1
 
     TwoOrgsChannel:
+        Consortium: SampleConsortium
+        Application:
+            <<: *ApplicationDefaults
+            Organizations:
+            - *Org1
+            - *Org2
+
+    DsChannel:
         Consortium: SampleConsortium
         Application:
             <<: *ApplicationDefaults

diff --git a/test/fixtures/testdata/src/github.com/example_pvt_cc/example_pvt_cc.go b/test/fixtures/testdata/src/github.com/example_pvt_cc/example_pvt_cc.go
@@ -31,7 +31,7 @@ const (
 	putBothFunc       = "putboth"
 	getAndPutBothFunc = "getandputboth"
 	invokeCCFunc      = "invokecc"
-	addToIntFunc	  = "addToInt"
+	addToIntFunc      = "addToInt"
 )
 
 // ExampleCC example chaincode that puts and gets state and private data
@@ -220,7 +220,7 @@ func (cc *ExampleCC) getAndPutBoth(stub shim.ChaincodeStubInterface, args []stri
 
 // Adds a given int amount to the value stored in the given private collection's key, storing the result using the same key.
 // If the given key does not already exist then it will be added and stored with the given amount.
-func (cc *ExampleCC) addToInt(stub shim.ChaincodeStubInterface, args[]string) pb.Response {
+func (cc *ExampleCC) addToInt(stub shim.ChaincodeStubInterface, args []string) pb.Response {
 	if len(args) != 3 {
 		return shim.Error("Invalid args. Expecting collection, key, amountToAdd")
 	}