added hrtype for quottery ActiveBets

clients/quottery/client.go

@@ -46,7 +46,7 @@ func (c *Client) GetBetInfo(ctx context.Context, betID uint32) (hrtypes.BetInfo,
 	return bi, nil
 }
 
-func (c *Client) GetActiveBets(ctx context.Context) (nodetypes.ActiveBets, error) {
+func (c *Client) GetActiveBets(ctx context.Context) (hrtypes.ActiveBets, error) {
 	rcf := connector.RequestContractFunction{
 		ContractIndex: nodetypes.QuotteryContractID,
 		InputType:     nodetypes.ViewID.ActiveBet,
@@ -56,10 +56,16 @@ func (c *Client) GetActiveBets(ctx context.Context) (nodetypes.ActiveBets, error
 	var result nodetypes.ActiveBets
 	err := c.connector.PerformSmartContractRequest(ctx, rcf, nil, &result)
 	if err != nil {
-		return nodetypes.ActiveBets{}, errors.Wrap(err, "handling smart contract request")
+		return hrtypes.ActiveBets{}, errors.Wrap(err, "handling smart contract request")
 	}
 
-	return result, nil
+	var ab hrtypes.ActiveBets
+	err = ab.FromNodeType(result)
+	if err != nil {
+		return hrtypes.ActiveBets{}, errors.Wrap(err, "converting from node type")
+	}
+
+	return ab, nil
 }
 
 var QuotteryGetBetInfoRequest = connector.RequestContractFunction{

clients/quottery/hrtypes/bets.go

@@ -153,3 +153,34 @@ func quotteryGetMinute(data uint32) int {
 func quotteryGetSecond(data uint32) int {
 	return int(data & 0b111111)
 }
+
+type ActiveBets struct {
+	Count  uint32
+	BetIDs []uint32
+}
+
+func (ab *ActiveBets) FromNodeType(m nodetypes.ActiveBets) error {
+	abc := activeBetsConverter{rawActiveBets: m}
+
+	converted := abc.toType()
+	*ab = converted
+
+	return nil
+}
+
+type activeBetsConverter struct {
+	rawActiveBets nodetypes.ActiveBets
+}
+
+func (abc *activeBetsConverter) toType() ActiveBets {
+	betIDs := make([]uint32, 0, abc.rawActiveBets.Count)
+
+	for _, b := range abc.rawActiveBets.BetIDs {
+		betIDs = append(betIDs, b)
+	}
+
+	return ActiveBets{
+		Count:  abc.rawActiveBets.Count,
+		BetIDs: betIDs,
+	}
+}