namestate: check for expiration when getting JSON

handshake-org · May 24, 2021 · e9627fd · e9627fd
1 parent bacae27
commit e9627fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lib/covenants/namestate.js b/lib/covenants/namestate.js
@@ -651,12 +651,15 @@ class NameState extends bio.Struct {
   getJSON(height, network) {
     let state = undefined;
     let stats = undefined;
+    let expired = this.expired;
 
     if (height != null) {
       network = Network.get(network);
       state = this.state(height, network);
       state = statesByVal[state];
       stats = this.toStats(height, network);
+
+      expired = this.isExpired(height, network);
     }
 
     return {
@@ -674,7 +677,7 @@ class NameState extends bio.Struct {
       claimed: this.claimed,
       renewals: this.renewals,
       registered: this.registered,
-      expired: this.expired,
+      expired: expired,
       weak: this.weak,
       stats: stats
     };

diff --git a/test/namestate-test.js b/test/namestate-test.js
@@ -97,7 +97,7 @@ describe('Namestate', function() {
 
       assert.strictEqual(json.state, 'CLOSED');
       assert(json.stats === null);
-      // TODO: ns.expired should be true
+      assert(json.expired);
     });
 
     it('should be CLOSED until expiration with owner', () => {
@@ -139,7 +139,7 @@ describe('Namestate', function() {
             'blocksSinceExpired'
           ]
         );
-        // TODO: ns.expired should be true
+        assert(json.expired);
         heightWithOwner++;
       }
     });
@@ -190,7 +190,7 @@ describe('Namestate', function() {
             'blocksSinceExpired'
           ]
         );
-        // TODO: ns.expired should be true
+        assert(json.expired);
         heightWithTransfer++;
       }
     });
@@ -264,7 +264,7 @@ describe('Namestate', function() {
             'blocksSinceExpired'
           ]
         );
-        // TODO: ns.expired should be true
+        assert(json.expired);
         heightWithRevoke++;
       }
     });
@@ -338,7 +338,7 @@ describe('Namestate', function() {
             'blocksSinceExpired'
           ]
         );
-        // TODO: ns.expired should be true
+        assert(json.expired);
         heightWithOwner++;
       }
     });