From 6b42ad6238e772222cd5b00a221753be90aa51df Mon Sep 17 00:00:00 2001 From: LexLuthr Date: Mon, 4 Mar 2024 12:46:32 +0400 Subject: [PATCH 1/2] add expiration to claim list --- cli/filplus.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/cli/filplus.go b/cli/filplus.go index 9fbd2a489ad..85ad2ebc0de 100644 --- a/cli/filplus.go +++ b/cli/filplus.go @@ -375,21 +375,23 @@ var filplusListClaimsCmd = &cli.Command{ tablewriter.Col("TermMin"), tablewriter.Col("TermMax"), tablewriter.Col("TermStart"), + tablewriter.Col("Expiration"), tablewriter.Col("Sector"), ) for claimId, claim := range claimsMap { if ts.Height() > claim.TermMax || !cctx.IsSet("expired") { tw.Write(map[string]interface{}{ - "ID": claimId, - "Provider": claim.Provider, - "Client": claim.Client, - "Data": claim.Data, - "Size": claim.Size, - "TermMin": claim.TermMin, - "TermMax": claim.TermMax, - "TermStart": claim.TermStart, - "Sector": claim.Sector, + "ID": claimId, + "Provider": claim.Provider, + "Client": claim.Client, + "Data": claim.Data, + "Size": claim.Size, + "TermMin": claim.TermMin, + "TermMax": claim.TermMax, + "TermStart": claim.TermStart, + "Expiration": claim.TermStart + claim.TermMax, + "Sector": claim.Sector, }) } } From c04cd6e17a652d849f997e2a952de9a33af9e421 Mon Sep 17 00:00:00 2001 From: LexLuthr Date: Mon, 4 Mar 2024 13:37:19 +0400 Subject: [PATCH 2/2] fix expired threshold --- cli/filplus.go | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/cli/filplus.go b/cli/filplus.go index 85ad2ebc0de..56922943960 100644 --- a/cli/filplus.go +++ b/cli/filplus.go @@ -375,23 +375,21 @@ var filplusListClaimsCmd = &cli.Command{ tablewriter.Col("TermMin"), tablewriter.Col("TermMax"), tablewriter.Col("TermStart"), - tablewriter.Col("Expiration"), tablewriter.Col("Sector"), ) for claimId, claim := range claimsMap { - if ts.Height() > claim.TermMax || !cctx.IsSet("expired") { + if ts.Height() > claim.TermMax+claim.TermStart || !cctx.IsSet("expired") { tw.Write(map[string]interface{}{ - "ID": claimId, - "Provider": claim.Provider, - "Client": claim.Client, - "Data": claim.Data, - "Size": claim.Size, - "TermMin": claim.TermMin, - "TermMax": claim.TermMax, - "TermStart": claim.TermStart, - "Expiration": claim.TermStart + claim.TermMax, - "Sector": claim.Sector, + "ID": claimId, + "Provider": claim.Provider, + "Client": claim.Client, + "Data": claim.Data, + "Size": claim.Size, + "TermMin": claim.TermMin, + "TermMax": claim.TermMax, + "TermStart": claim.TermStart, + "Sector": claim.Sector, }) } }