support testnet

Author: lizixing

client_block.go

@@ -9,33 +9,35 @@ import (
 )
 
 type GetBlockOption struct {
-	HeaderOnlyIdHeight   bool
-	WithTransactions     bool
-	WithConsensus        bool
-	TransactionOnlyID    bool
-	WithContractBytecode bool
-	WithContractSalt     bool
+	WithHeader              bool
+	WithConsensus           bool
+	WithTransactions        bool
+	WithTransactionDetail   bool
+	WithTransactionReceipts bool
+	WithContractBytecode    bool
+	WithContractSalt        bool
 }
 
 func (o GetBlockOption) BuildIgnoreChecker() query.IgnoreChecker {
 	var checkers []query.IgnoreChecker
-	if !o.WithTransactions {
-		checkers = append(checkers, query.IgnoreObjects(types.Transaction{}))
+	if !o.WithHeader {
+		checkers = append(checkers, query.IgnoreField(types.Block{}, "Header"))
 	}
 	if !o.WithConsensus {
 		checkers = append(checkers, query.IgnoreField(types.Block{}, "Consensus"))
 	}
-	if o.HeaderOnlyIdHeight {
-		checkers = append(checkers, query.IgnoreOtherFields(types.Header{}, "Id", "Height"))
-	}
-	if o.TransactionOnlyID {
+	if !o.WithTransactions {
+		checkers = append(checkers, query.IgnoreField(types.Block{}, "Transactions"))
+	} else if !o.WithTransactionDetail {
 		checkers = append(checkers, query.IgnoreOtherFields(types.Transaction{}, "Id"))
 	} else {
 		// Otherwise it will create circular dependencies
 		checkers = append(checkers, query.IgnoreField(types.SuccessStatus{}, "Block"))
-		checkers = append(checkers, query.IgnoreField(types.SuccessStatus{}, "Receipts"))
 		checkers = append(checkers, query.IgnoreField(types.FailureStatus{}, "Block"))
-		checkers = append(checkers, query.IgnoreField(types.FailureStatus{}, "Receipts"))
+		if !o.WithTransactionReceipts {
+			checkers = append(checkers, query.IgnoreField(types.SuccessStatus{}, "Receipts"))
+			checkers = append(checkers, query.IgnoreField(types.FailureStatus{}, "Receipts"))
+		}
 	}
 	if !o.WithContractBytecode {
 		checkers = append(checkers, query.IgnoreField(types.Contract{}, "Bytecode"))

client_block_test.go

@@ -38,20 +38,16 @@ func (c *Client) GetChain(ctx context.Context, opt GetChainOption) (types.ChainI
 
 func (c *Client) GetLatestBlockHeight(ctx context.Context) (types.U32, error) {
 	info, err := c.GetChain(ctx, GetChainOption{
-		Simple: true,
-		GetBlockOption: GetBlockOption{
-			HeaderOnlyIdHeight: true,
-		},
+		Simple:         true,
+		GetBlockOption: GetBlockOption{},
 	})
-	return info.LatestBlock.Header.Height, err
+	return info.LatestBlock.Height, err
 }
 
 func (c *Client) GetLatestBlockHeader(ctx context.Context) (types.Header, error) {
 	info, err := c.GetChain(ctx, GetChainOption{
-		Simple: true,
-		GetBlockOption: GetBlockOption{
-			WithTransactions: false,
-		},
+		Simple:         true,
+		GetBlockOption: GetBlockOption{WithHeader: true},
 	})
 	return info.LatestBlock.Header, err
 }

client_chain.go

@@ -17,8 +17,6 @@ type GetTransactionOption struct {
 func (o GetTransactionOption) BuildIgnoreChecker() query.IgnoreChecker {
 	ignoreCheckers := []query.IgnoreChecker{
 		query.IgnoreField(types.Block{}, "Transactions"),
-		query.IgnoreField(types.SuccessStatus{}, "Receipts"),
-		query.IgnoreField(types.FailureStatus{}, "Receipts"),
 	}
 	if !o.WithContractBytecode {
 		ignoreCheckers = append(ignoreCheckers, query.IgnoreField(types.Contract{}, "Bytecode"))
@@ -27,7 +25,7 @@ func (o GetTransactionOption) BuildIgnoreChecker() query.IgnoreChecker {
 		ignoreCheckers = append(ignoreCheckers, query.IgnoreField(types.Contract{}, "Salt"))
 	}
 	if !o.WithReceipts {
-		ignoreCheckers = append(ignoreCheckers, query.IgnoreField(types.Transaction{}, "Receipts"))
+		ignoreCheckers = append(ignoreCheckers, query.IgnoreObjects(types.Receipt{}))
 	}
 	if !o.WithStatus {
 		ignoreCheckers = append(ignoreCheckers, query.IgnoreField(types.Transaction{}, "Status"))

client_test.go

@@ -22,8 +22,10 @@ scalarMapper:
   String: string
   Tai64Timestamp: time.Time
   TransactionId: common.Hash
+  RelayedTransactionId: common.Hash
   TxPointer: string
   U8: uint8
+  U16: uint16
   U32: uint32
   U64: uint64
   UtxoId: hexutil.Bytes