Merge pull request #657 from GeorgeTsagk/move-asset-type-rpc

taprpc: Move asset type to genesis info

Author: GeorgeTsagk

itest/assertions.go

@@ -52,9 +52,10 @@ func AssetAmountCheck(amt uint64) AssetCheck {
 // AssetTypeCheck returns a check function that tests an asset's type.
 func AssetTypeCheck(assetType taprpc.AssetType) AssetCheck {
 	return func(a *taprpc.Asset) error {
-		if a.AssetType != assetType {
+		if a.AssetGenesis.AssetType != assetType {
 			return fmt.Errorf("unexpected asset type, got %v "+
-				"wanted %v", a.AssetType, assetType)
+				"wanted %v", a.AssetGenesis.AssetType,
+				assetType)
 		}
 
 		return nil
@@ -765,7 +766,7 @@ func AssertNonInteractiveRecvComplete(t *testing.T,
 // asset.
 func AssertAddr(t *testing.T, expected *taprpc.Asset, actual *taprpc.Addr) {
 	require.Equal(t, expected.AssetGenesis.AssetId, actual.AssetId)
-	require.Equal(t, expected.AssetType, actual.AssetType)
+	require.Equal(t, expected.AssetGenesis.AssetType, actual.AssetType)
 
 	if expected.AssetGroup == nil {
 		require.Nil(t, actual.GroupKey)
@@ -789,7 +790,10 @@ func AssertAddr(t *testing.T, expected *taprpc.Asset, actual *taprpc.Addr) {
 func AssertAsset(t *testing.T, expected, actual *taprpc.Asset) {
 	require.Equal(t, expected.Version, actual.Version)
 	AssertAssetGenesis(t, expected.AssetGenesis, actual.AssetGenesis)
-	require.Equal(t, expected.AssetType, actual.AssetType)
+	require.Equal(
+		t, expected.AssetGenesis.AssetType,
+		actual.AssetGenesis.AssetType,
+	)
 	require.Equal(t, expected.Amount, actual.Amount)
 	require.Equal(t, expected.LockTime, actual.LockTime)
 	require.Equal(t, expected.RelativeLockTime, actual.RelativeLockTime)
@@ -820,7 +824,8 @@ func assertProofReveals(t *testing.T, expected *taprpc.Asset,
 			actual.GenesisReveal.GenesisBaseReveal,
 		)
 		require.Equal(
-			t, expected.AssetType, actual.GenesisReveal.AssetType,
+			t, expected.AssetGenesis.AssetType,
+			actual.GenesisReveal.GenesisBaseReveal.AssetType,
 		)
 	}
 }
@@ -987,7 +992,7 @@ func AssertGroup(t *testing.T, a *taprpc.Asset, b *taprpc.AssetHumanReadable,
 	require.Equal(t, a.RelativeLockTime, b.RelativeLockTime)
 	require.Equal(t, a.AssetGenesis.Name, b.Tag)
 	require.Equal(t, a.AssetGenesis.MetaHash, b.MetaHash)
-	require.Equal(t, a.AssetType, b.Type)
+	require.Equal(t, a.AssetGenesis.AssetType, b.Type)
 	require.Equal(t, a.AssetGroup.TweakedGroupKey, groupKey)
 }
 
@@ -1314,7 +1319,7 @@ func VerifyGroupAnchor(t *testing.T, assets []*taprpc.Asset,
 	require.NoError(t, err)
 
 	anchorGen := ParseGenInfo(t, anchor.AssetGenesis)
-	anchorGen.Type = asset.Type(anchor.AssetType)
+	anchorGen.Type = asset.Type(anchor.AssetGenesis.AssetType)
 	AssertGroupAnchor(t, anchorGen, anchor.AssetGroup)
 
 	return anchor

itest/assets_test.go

@@ -186,7 +186,7 @@ func transferAssetProofs(t *harnessTest, src, dst *tapdHarness,
 		AssertAssetState(
 			t.t, importedAssets, gen.Name, gen.MetaHash,
 			AssetAmountCheck(existingAsset.Amount),
-			AssetTypeCheck(existingAsset.AssetType),
+			AssetTypeCheck(existingAsset.AssetGenesis.AssetType),
 			AssetAnchorCheck(*anchorTxHash, *anchorBlockHash),
 			AssetScriptKeyIsLocalCheck(shouldShowUpAsLocal),
 		)

itest/burn_test.go

@@ -157,7 +157,7 @@ func testBurnAssets(t *harnessTest) {
 	AssertAssetStateByScriptKey(
 		t.t, allAssets.Assets, burnedAsset.ScriptKey,
 		AssetAmountCheck(burnedAsset.Amount),
-		AssetTypeCheck(burnedAsset.AssetType),
+		AssetTypeCheck(burnedAsset.AssetGenesis.AssetType),
 		AssetScriptKeyIsLocalCheck(false),
 		AssetScriptKeyIsBurnCheck(true),
 	)

itest/loadtest/utils.go

@@ -53,7 +53,7 @@ func (r *rpcClient) assetIDWithBalance(t *testing.T, ctx context.Context,
 
 	for assetIDHex, balance := range balances.AssetBalances {
 		if balance.Balance >= minBalance &&
-			balance.AssetType == assetType {
+			balance.AssetGenesis.AssetType == assetType {
 
 			assetIDBytes, err := hex.DecodeString(assetIDHex)
 			require.NoError(t, err)

itest/multi_asset_group_test.go

@@ -389,7 +389,7 @@ func assetIDWithBalance(t *testing.T, node *tapdHarness,
 
 	for assetIDHex, balance := range balances.AssetBalances {
 		if balance.Balance >= minBalance &&
-			balance.AssetType == assetType {
+			balance.AssetGenesis.AssetType == assetType {
 
 			assetIDBytes, err := hex.DecodeString(assetIDHex)
 			require.NoError(t, err)

itest/tapd_harness.go

@@ -305,7 +305,7 @@ func (hs *tapdHarness) assetIDWithBalance(t *testing.T, ctx context.Context,
 
 	for assetIDHex, balance := range balances.AssetBalances {
 		if balance.Balance >= minBalance &&
-			balance.AssetType == assetType {
+			balance.AssetGenesis.AssetType == assetType {
 
 			assetIDBytes, err := hex.DecodeString(assetIDHex)
 			require.NoError(t, err)

rpcserver.go

@@ -765,12 +765,12 @@ func (r *rpcServer) listBalancesByAsset(ctx context.Context,
 			AssetGenesis: &taprpc.GenesisInfo{
 				Version:      int32(balance.Version),
 				GenesisPoint: balance.GenesisPoint.String(),
+				AssetType:    taprpc.AssetType(balance.Type),
 				Name:         balance.Tag,
 				MetaHash:     balance.MetaHash[:],
 				AssetId:      balance.ID[:],
 			},
-			AssetType: taprpc.AssetType(balance.Type),
-			Balance:   balance.Balance,
+			Balance: balance.Balance,
 		}
 	}
 
@@ -1421,8 +1421,8 @@ func (r *rpcServer) marshalProof(ctx context.Context, p *proof.Proof,
 				MetaHash:     rpcGenesis.MetaHash[:],
 				AssetId:      decodedAssetID[:],
 				OutputIndex:  rpcGenesis.OutputIndex,
+				AssetType:    taprpc.AssetType(p.Asset.Type),
 			},
-			AssetType: taprpc.AssetType(p.Asset.Type),
 		}
 	}
 

taprpc/marshal.go

@@ -72,13 +72,13 @@ func MarshalAsset(ctx context.Context, a *asset.Asset,
 		Version: assetVersion,
 		AssetGenesis: &GenesisInfo{
 			GenesisPoint: a.Genesis.FirstPrevOut.String(),
+			AssetType:    AssetType(a.Type),
 			Name:         a.Genesis.Tag,
 			MetaHash:     a.Genesis.MetaHash[:],
 			AssetId:      assetID[:],
 			OutputIndex:  a.Genesis.OutputIndex,
 			Version:      int32(assetVersion),
 		},
-		AssetType:        AssetType(a.Type),
 		Amount:           a.Amount,
 		LockTime:         int32(a.LockTime),
 		RelativeLockTime: int32(a.RelativeLockTime),