rename convert to upgrade when needed

Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>

Author: adecaro

token/core/common/tokens.go

@@ -19,7 +19,7 @@ func NewTokensService() *TokensService {
 	return &TokensService{}
 }
 
-func (s *TokensService) NewUpgradeChallenge() (driver.TokenUpgradeChallenge, error) {
+func (s *TokensService) NewUpgradeChallenge() (driver.TokensUpgradeChallenge, error) {
 	// generate a 32 bytes secure random slice
 	key := make([]byte, 32)
 	_, err := rand.Read(key)
@@ -29,10 +29,10 @@ func (s *TokensService) NewUpgradeChallenge() (driver.TokenUpgradeChallenge, err
 	return key, nil
 }
 
-func (s *TokensService) GenUpgradeProof(ch driver.TokenUpgradeChallenge, tokens []token.LedgerToken) ([]byte, error) {
+func (s *TokensService) GenUpgradeProof(ch driver.TokensUpgradeChallenge, tokens []token.LedgerToken) ([]byte, error) {
 	return nil, nil
 }
 
-func (s *TokensService) CheckUpgradeProof(ch driver.TokenUpgradeChallenge, proof driver.TokenUpgradeProof, tokens []token.LedgerToken) (bool, error) {
+func (s *TokensService) CheckUpgradeProof(ch driver.TokensUpgradeChallenge, proof driver.TokensUpgradeProof, tokens []token.LedgerToken) (bool, error) {
 	return true, nil
 }

token/core/fabtoken/issue.go

@@ -39,7 +39,7 @@ func (s *IssueService) Issue(ctx context.Context, issuerIdentity driver.Identity
 		return nil, nil, errors.Errorf("issuer identity, token type and values should be defined")
 	}
 	if opts != nil {
-		if opts.TokenConversionRequest != nil {
+		if opts.TokensUpgradeRequest != nil {
 			return nil, nil, errors.Errorf("redeem during issue is not supported")
 		}
 	}

token/core/zkatdlog/nogh/issue.go

@@ -61,7 +61,7 @@ func (s *IssueService) Issue(ctx context.Context, issuerIdentity driver.Identity
 	if issuerIdentity.IsNone() && len(tokenType) == 0 && values == nil {
 		// this is a special case where the issue contains also redemption
 		// we need to extract token types and values from the passed tokens
-		tokenTypes, tokenValues, err := s.TokensService.ProcessTokenConversionRequest(opts.TokenConversionRequest)
+		tokenTypes, tokenValues, err := s.TokensService.ProcessTokensUpgradeRequest(opts.TokensUpgradeRequest)
 		if err != nil {
 			return nil, nil, errors.Wrapf(err, "failed to extract token types and values from the passed tokens")
 		}
@@ -137,8 +137,8 @@ func (s *IssueService) Issue(ctx context.Context, issuerIdentity driver.Identity
 
 	// prepare inputs to redeem, if any
 	var tokenIDs []*token.ID
-	if opts != nil && opts.TokenConversionRequest != nil && len(opts.TokenConversionRequest.Tokens) > 0 {
-		tokens := opts.TokenConversionRequest.Tokens
+	if opts != nil && opts.TokensUpgradeRequest != nil && len(opts.TokensUpgradeRequest.Tokens) > 0 {
+		tokens := opts.TokensUpgradeRequest.Tokens
 		action.Inputs = make([]issue.ActionInput, len(tokens))
 		for i, tok := range tokens {
 			action.Inputs[i] = issue.ActionInput{

token/core/zkatdlog/nogh/tokens.go

@@ -99,12 +99,12 @@ func (s *TokensService) DeserializeToken(outputFormat token.Format, outputRaw []
 	return output, metadata, nil, nil
 }
 
-func (s *TokensService) GenUpgradeProof(ch driver.TokenUpgradeChallenge, tokens []token.LedgerToken) ([]byte, error) {
+func (s *TokensService) GenUpgradeProof(ch driver.TokensUpgradeChallenge, tokens []token.LedgerToken) ([]byte, error) {
 	// TODO: implement
 	return nil, nil
 }
 
-func (s *TokensService) CheckUpgradeProof(ch driver.TokenUpgradeChallenge, proof driver.TokenUpgradeProof, tokens []token.LedgerToken) (bool, error) {
+func (s *TokensService) CheckUpgradeProof(ch driver.TokensUpgradeChallenge, proof driver.TokensUpgradeProof, tokens []token.LedgerToken) (bool, error) {
 	// TODO: implement
 	return true, nil
 }
@@ -159,7 +159,7 @@ func supportedTokenFormat(pp *crypto.PublicParams) (token.Format, error) {
 	return token.Format(hasher.HexDigest()), nil
 }
 
-func (s *TokensService) ProcessTokenConversionRequest(utp *driver.TokenConversionRequest) ([]token.Type, []uint64, error) {
+func (s *TokensService) ProcessTokensUpgradeRequest(utp *driver.TokenUpgradeRequest) ([]token.Type, []uint64, error) {
 	if utp == nil {
 		return nil, nil, errors.New("nil token upgrade request")
 	}

token/driver/issue.go

@@ -12,22 +12,22 @@ import (
 	"github.com/hyperledger-labs/fabric-token-sdk/token/token"
 )
 
-// TokenConversionRequest is a request to convert tokens
-type TokenConversionRequest struct {
+// TokenUpgradeRequest is a request to convert tokens
+type TokenUpgradeRequest struct {
 	// Challenge is a challenge to be solved by the prover
-	Challenge TokenUpgradeChallenge
+	Challenge TokensUpgradeChallenge
 	// Tokens is a list of tokens to be converted
 	Tokens []token.LedgerToken
 	// Proof is a proof that the prover has solved the challenge
-	Proof TokenUpgradeProof
+	Proof TokensUpgradeProof
 }
 
 // IssueOptions models the options that can be passed to the issue command
 type IssueOptions struct {
 	// Attributes is a container of generic options that might be driver specific
 	Attributes map[interface{}]interface{}
-	// TokenConversionRequest is a request to convert tokens
-	TokenConversionRequest *TokenConversionRequest
+	// TokensUpgradeRequest is a request to upgrade tokens
+	TokensUpgradeRequest *TokenUpgradeRequest
 	// Wallet is the wallet that should be used to issue the tokens.
 	Wallet IssuerWallet
 }