Adding ConsumerInfo

Signed-off-by: Edward Payzant <adam@synadia.com>

Author: AdamPayzant

src/jsm.c

@@ -793,7 +793,6 @@ js_unmarshalStreamConfig(nats_JSON *json, const char *fieldName, jsStreamConfig
     IFOK(s, _unmarshalPersistModeType(jcfg, &(cfg->PersistMode)));
     IFOK(s, nats_JSONGetBool(jcfg, "allow_atomic", &(cfg->AllowAtomic)));
     IFOK(s, nats_JSONGetBool(jcfg, "allow_msg_counter", &(cfg->AllowMsgCounter)));
-    IFOK(s, nats_JSONGetBool(jcfg, "allow_msg_schedules", &(cfg->AllowMsgSchedules)));
 
     if (s == NATS_OK)
         *new_cfg = cfg;
@@ -931,8 +930,6 @@ js_marshalStreamConfig(natsBuffer **new_buf, jsStreamConfig *cfg)
         s = nats_marshalLong(buf, true, "subject_delete_marker_ttl", cfg->SubjectDeleteMarkerTTL);
     if ((s == NATS_OK) && cfg->AllowMsgCounter)
         s = natsBuf_Append(buf, ",\"allow_msg_counter\":true", -1);
-    if ((s == NATS_OK) && cfg->AllowMsgSchedules)
-        s = natsBuf_Append(buf, ",\"allow_msg_schedules\":true", -1);
 
     IFOK(s, natsBuf_AppendByte(buf, '}'));
 
@@ -3583,6 +3580,7 @@ _unmarshalConsumerResetResp(jsConsumerResetResponse **new_crr, natsMsg *resp, js
         else
         {
             s = nats_JSONGetULong(json, "reset_seq", &(crr->ResetSeq));
+            IFOK(s, js_unmarshalConsumerInfo(json, &(crr->Consumer)));
             if (s == NATS_OK)
                 *new_crr = crr;
             else
@@ -3602,6 +3600,7 @@ jsConsumerResetResponse_Destroy(jsConsumerResetResponse *crr)
     if (crr == NULL)
         return;
 
+    jsConsumerInfo_Destroy(crr->Consumer);
     NATS_FREE(crr);
 }
 

src/nats.h

@@ -1191,6 +1191,7 @@ typedef struct jsConsumerPauseResponse
  */
 typedef struct jsConsumerResetResponse
 {
+        jsConsumerInfo  *Consumer;      ///< Consumer info after the reset.
         uint64_t        ResetSeq;       ///< Stream sequence the consumer was reset to.
 
 } jsConsumerResetResponse;

test/test.c

@@ -34199,7 +34199,14 @@ void test_JetStreamConsumerReset(void)
     test("Reset consumer (no seq): ");
     s = js_ResetConsumer(&crr, js, "s1", "c1", 0, NULL, &jerr);
     testCond((s == NATS_OK) && (jerr == 0)
-                && (crr != NULL));
+                && (crr != NULL)
+                && (crr->Consumer != NULL)
+                && (crr->Consumer->Name != NULL)
+                && (strcmp(crr->Consumer->Name, "c1") == 0)
+                && (crr->Consumer->Stream != NULL)
+                && (strcmp(crr->Consumer->Stream, "s1") == 0)
+                && (crr->Consumer->Delivered.Consumer == 0)
+                && (crr->Consumer->NumRedelivered == 0));
     jsConsumerResetResponse_Destroy(crr);
     crr = NULL;