Make Linkage counterparty the right type

Author: jchavannes

wallet/interfaces.go

@@ -419,7 +419,7 @@ type RevealSpecificKeyLinkageResult struct {
 	EncryptedLinkageProof []byte        `json:"encryptedLinkageProof"`
 	Prover                *ec.PublicKey `json:"prover"`
 	Verifier              *ec.PublicKey `json:"verifier"`
-	Counterparty          Counterparty  `json:"counterparty"`
+	Counterparty          *ec.PublicKey `json:"counterparty"`
 	ProtocolID            Protocol      `json:"protocolID"`
 	KeyID                 string        `json:"keyID"`
 	ProofType             byte          `json:"proofType"`

wallet/serializer/reveal_specific_key_linkage.go

@@ -75,9 +75,10 @@ func SerializeRevealSpecificKeyLinkageResult(result *wallet.RevealSpecificKeyLin
 		return nil, fmt.Errorf("verifier public key is required")
 	}
 	w.WriteBytes(result.Verifier.Compressed())
-	if err := encodeCounterparty(w, result.Counterparty); err != nil {
-		return nil, fmt.Errorf("error encoding counterparty: %w", err)
+	if result.Counterparty == nil {
+		return nil, fmt.Errorf("counterparty public key is required")
 	}
+	w.WriteBytes(result.Counterparty.Compressed())
 
 	// Write protocol ID (security level + protocol string)
 	w.WriteBytes(encodeProtocol(result.ProtocolID))
@@ -110,9 +111,9 @@ func DeserializeRevealSpecificKeyLinkageResult(data []byte) (*wallet.RevealSpeci
 	}
 	result.Verifier = verifier
 
-	counterparty, err := decodeCounterparty(r)
+	counterparty, err := ec.PublicKeyFromBytes(r.ReadBytes(sizePubKey))
 	if err != nil {
-		return nil, fmt.Errorf("error decoding counterparty: %w", err)
+		return nil, fmt.Errorf("error parsing counterparty public key: %w", err)
 	}
 	result.Counterparty = counterparty
 

wallet/serializer/reveal_specific_key_linkage_test.go

@@ -70,7 +70,7 @@ func TestRevealSpecificKeyLinkageResult(t *testing.T) {
 			result: &wallet.RevealSpecificKeyLinkageResult{
 				Prover:       tu.GetPKFromHex(t, "03d4f6b2d5e6c8a9b0f7e1d2c3b4a59687f0e1d2c3b4a59687f0e1d2c3b4a59687"),
 				Verifier:     tu.GetPKFromHex(t, "02c3b4a59687f0e1d2c3b4a59687f0e1d2c3b4a59687f0e1d2c3b4a59687f0e1d2"),
-				Counterparty: newCounterparty(t, "03f0e1d2c3b4a59687f0e1d2c3b4a59687f0e1d2c3b4a59687f0e1d2c3b4a59687"),
+				Counterparty: tu.GetPKFromHex(t, "03f0e1d2c3b4a59687f0e1d2c3b4a59687f0e1d2c3b4a59687f0e1d2c3b4a59687"),
 				ProtocolID: wallet.Protocol{
 					SecurityLevel: wallet.SecurityLevel(1),
 					Protocol:      "test-protocol",
@@ -86,7 +86,7 @@ func TestRevealSpecificKeyLinkageResult(t *testing.T) {
 			result: &wallet.RevealSpecificKeyLinkageResult{
 				Prover:       tu.GetPKFromHex(t, "03d4f6b2d5e6c8a9b0f7e1d2c3b4a59687f0e1d2c3b4a59687f0e1d2c3b4a59687"),
 				Verifier:     tu.GetPKFromHex(t, "02c3b4a59687f0e1d2c3b4a59687f0e1d2c3b4a59687f0e1d2c3b4a59687f0e1d2"),
-				Counterparty: newCounterparty(t, "03f0e1d2c3b4a59687f0e1d2c3b4a59687f0e1d2c3b4a59687f0e1d2c3b4a59687"),
+				Counterparty: tu.GetPKFromHex(t, "03f0e1d2c3b4a59687f0e1d2c3b4a59687f0e1d2c3b4a59687f0e1d2c3b4a59687"),
 				ProtocolID: wallet.Protocol{
 					SecurityLevel: wallet.SecurityLevel(0),
 					Protocol:      "minimal",

wallet/substrates/vector_test.go

@@ -277,10 +277,7 @@ func TestVectors(t *testing.T) {
 			EncryptedLinkageProof: []byte{5, 6, 7, 8},
 			Prover:                prover,
 			Verifier:              verifier,
-			Counterparty: wallet.Counterparty{
-				Type:         wallet.CounterpartyTypeOther,
-				Counterparty: counterparty,
-			},
+			Counterparty:          counterparty,
 			ProtocolID: wallet.Protocol{
 				SecurityLevel: wallet.SecurityLevelEveryAppAndCounterparty,
 				Protocol:      "tests",