Renamed token type and format

Signed-off-by: Alexandros Filios <alexandros.filios@ibm.com>

Author: alexandrosfilios

integration/token/dvp/tests.go

@@ -22,7 +22,7 @@ import (
 )
 
 const (
-	USD = token2.TokenType("USD")
+	USD = token2.Type("USD")
 )
 
 func TestAll(network *integration.Infrastructure, sel *token3.ReplicaSelector) {
@@ -86,7 +86,7 @@ func sellHouse(network *integration.Infrastructure, houseID string, seller *toke
 	common2.CheckFinality(network, buyer, common.JSONUnmarshalString(txIDBoxed), nil, false)
 }
 
-func checkBalance(network *integration.Infrastructure, ref *token3.NodeReference, wallet string, typ token2.TokenType, expected uint64) {
+func checkBalance(network *integration.Infrastructure, ref *token3.NodeReference, wallet string, typ token2.Type, expected uint64) {
 	res, err := network.Client(ref.ReplicaName()).CallView("balance", common.JSONMarshall(&views2.BalanceQuery{
 		Wallet: wallet,
 		Type:   typ,

integration/token/dvp/views/balance.go

@@ -19,11 +19,11 @@ import (
 type BalanceQuery struct {
 	TMSID  token.TMSID
 	Wallet string
-	Type   token2.TokenType
+	Type   token2.Type
 }
 
 type Balance struct {
-	Type     token2.TokenType
+	Type     token2.Type
 	Quantity string
 }
 

integration/token/dvp/views/buyer.go

@@ -46,7 +46,7 @@ func (b *BuyHouseView) Call(context view.Context) (interface{}, error) {
 	// check action
 	assert.Equal(otherCash, action.Recipient, "recipient mismatch")
 	assert.True(action.Amount > 0, "amount must be greater than 0")
-	assert.Equal(token2.TokenType("USD"), action.Type, "currency must be USD")
+	assert.Equal(token2.Type("USD"), action.Type, "currency must be USD")
 	assert.Equal(meCash, action.From, "sender mismatch")
 
 	// check house and action match

integration/token/dvp/views/cash/history.go

@@ -21,7 +21,7 @@ type ListIssuedTokens struct {
 	// Wallet whose identities own the token
 	Wallet string
 	// TokenType is the token type to select
-	TokenType token2.TokenType
+	TokenType token2.Type
 }
 
 type ListIssuedTokensView struct {

integration/token/dvp/views/cash/issue.go

@@ -21,7 +21,7 @@ type IssueCash struct {
 	// IssuerWallet is the issuer's wallet to use
 	IssuerWallet string
 	// TokenType is the type of token to issue
-	TokenType token.TokenType
+	TokenType token.Type
 	// Quantity represent the number of units of a certain token type stored in the token
 	Quantity uint64
 	// Recipient is an identifier of the recipient identity

integration/token/dvp/views/cash/list.go

@@ -22,7 +22,7 @@ type ListUnspentTokens struct {
 	// Wallet whose identities own the token
 	Wallet string
 	// TokenType is the token type to select
-	TokenType token2.TokenType
+	TokenType token2.Type
 }
 
 type ListUnspentTokensView struct {

integration/token/fungible/support.go

@@ -208,7 +208,7 @@ func (p *RegisterAuditorViewFactory) NewView(in []byte) (view.View, error) {
 
 type CurrentHolding struct {
 	EnrollmentID string
-	TokenType    token2.TokenType
+	TokenType    token2.Type
 	TMSID        token.TMSID
 }
 
@@ -247,9 +247,9 @@ func (p *CurrentHoldingViewFactory) NewView(in []byte) (view.View, error) {
 }
 
 type CurrentSpending struct {
-	EnrollmentID string           `json:"enrollment_id"`
-	TokenType    token2.TokenType `json:"token_type"`
-	TMSID        *token.TMSID     `json:"tmsid"`
+	EnrollmentID string       `json:"enrollment_id"`
+	TokenType    token2.Type  `json:"token_type"`
+	TMSID        *token.TMSID `json:"tmsid"`
 }
 
 // CurrentSpendingView is used to retrieve the current spending of token type of the passed enrollment id

integration/token/fungible/views/auditor.go

@@ -21,11 +21,11 @@ type BalanceQuery struct {
 	TMSID     *token.TMSID
 	SkipCheck bool
 	Wallet    string
-	Type      token2.TokenType
+	Type      token2.Type
 }
 
 type Balance struct {
-	Type     token2.TokenType
+	Type     token2.Type
 	Quantity string
 }
 

integration/token/fungible/views/balance.go

@@ -24,7 +24,7 @@ type ListIssuedTokens struct {
 	// Wallet whose identities own the token
 	Wallet string
 	// TokenType is the token type to select
-	TokenType token2.TokenType
+	TokenType token2.Type
 	// The TMS to pick in case of multiple TMSIDs
 	TMSID *token.TMSID
 }