Skip to content

Commit

Permalink
scrypto.LatestVer
Browse files Browse the repository at this point in the history
  • Loading branch information
@oncilla
oncilla committed Oct 2, 2019
1 parent bdb0a49 commit ea18bbf
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions go/lib/infra/modules/trust/v2/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (p *cryptoProvider) getCheckedTRC(ctx context.Context, isd addr.ISD, versio
return nil, nil, serrors.WrapStr("unable to get requested TRC", err)
}
if !opts.AllowInactive {
info, err := p.db.GetTRCInfo(ctx, isd, scrypto.Version(scrypto.LatestVer))
info, err := p.db.GetTRCInfo(ctx, isd, scrypto.LatestVer)
if err != nil {
return nil, nil, serrors.WrapStr("unable to get latest TRC info", err)
}
Expand All @@ -98,14 +98,14 @@ func (p *cryptoProvider) getCheckedTRC(ctx context.Context, isd addr.ISD, versio
return nil, nil, serrors.WrapStr("grace period has passed", ErrInactive,
"end", info.Validity.NotBefore.Add(info.GracePeriod), "latest", info.Version)
case !decTRC.TRC.Validity.Contains(time.Now()):
if version != scrypto.Version(scrypto.LatestVer) || opts.LocalOnly {
if !version.IsLatest() || opts.LocalOnly {
return nil, nil, serrors.WrapStr("requested TRC expired", ErrInactive,
"validity", decTRC.TRC.Validity)
}
// There might exist a more recent TRC that is not available locally
// yet. Fetch it if the latest version was requested and recursion
// is allowed.
fetched, err := p.fetchTRC(ctx, isd, scrypto.Version(scrypto.LatestVer), opts, client)
fetched, err := p.fetchTRC(ctx, isd, scrypto.LatestVer, opts, client)
if err != nil {
return nil, nil, serrors.WrapStr("unable to fetch latest TRC from network", err)
}
Expand Down
34 changes: 17 additions & 17 deletions go/lib/infra/modules/trust/v2/provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func TestCryptoProviderGetTRC(t *testing.T) {
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, dec.TRC.Version).Return(
dec.Raw, nil,
)
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
trust.TRCInfo{Version: dec.TRC.Version}, nil,
)
},
Expand All @@ -77,7 +77,7 @@ func TestCryptoProviderGetTRC(t *testing.T) {
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, dec.TRC.Version).Return(
dec.Raw, nil,
)
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
info, nil,
)
},
Expand Down Expand Up @@ -111,7 +111,7 @@ func TestCryptoProviderGetTRC(t *testing.T) {
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, dec.TRC.Version).Return(
dec.Raw, nil,
)
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
trust.TRCInfo{Version: dec.TRC.Version}, nil,
)
},
Expand All @@ -122,7 +122,7 @@ func TestCryptoProviderGetTRC(t *testing.T) {
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, dec.TRC.Version).Return(
dec.Raw, nil,
)
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
trust.TRCInfo{Version: dec.TRC.Version + 2}, nil,
)
},
Expand All @@ -138,7 +138,7 @@ func TestCryptoProviderGetTRC(t *testing.T) {
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, dec.TRC.Version).Return(
dec.Raw, nil,
)
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
info, nil,
)
},
Expand All @@ -157,7 +157,7 @@ func TestCryptoProviderGetTRC(t *testing.T) {
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, dec.TRC.Version).Return(
dec.Raw, nil,
)
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
trust.TRCInfo{}, internal,
)
},
Expand Down Expand Up @@ -270,7 +270,7 @@ func TestCryptoProviderGetTRCLatest(t *testing.T) {
}{
"TRC in database, allow inactive": {
Expect: func(m *mocks, dec *decoded.TRC) decoded.TRC {
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
dec.Raw, nil,
)
return *dec
Expand All @@ -279,7 +279,7 @@ func TestCryptoProviderGetTRCLatest(t *testing.T) {
},
"not found, resolve success": {
Expect: func(m *mocks, dec *decoded.TRC) decoded.TRC {
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
nil, trust.ErrNotFound,
)
m.Recurser.EXPECT().AllowRecursion(gomock.Any()).Return(nil)
Expand All @@ -302,10 +302,10 @@ func TestCryptoProviderGetTRCLatest(t *testing.T) {
dec.TRC.Validity.NotAfter.Time = time.Now()
dec.Signed.EncodedTRC, _ = trc.Encode(dec.TRC)
dec.Raw, _ = json.Marshal(dec.Signed)
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
dec.Raw, nil,
)
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
trust.TRCInfo{Version: dec.TRC.Version}, nil,
)
m.Recurser.EXPECT().AllowRecursion(gomock.Any()).Return(internal)
Expand All @@ -318,10 +318,10 @@ func TestCryptoProviderGetTRCLatest(t *testing.T) {
dec.TRC.Validity.NotAfter.Time = time.Now()
dec.Signed.EncodedTRC, _ = trc.Encode(dec.TRC)
dec.Raw, _ = json.Marshal(dec.Signed)
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
dec.Raw, nil,
)
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
trust.TRCInfo{Version: dec.TRC.Version}, nil,
)
m.Recurser.EXPECT().AllowRecursion(gomock.Any()).Return(nil)
Expand All @@ -342,10 +342,10 @@ func TestCryptoProviderGetTRCLatest(t *testing.T) {
dec.TRC.Validity.NotAfter.Time = time.Now()
dec.Signed.EncodedTRC, _ = trc.Encode(dec.TRC)
dec.Raw, _ = json.Marshal(dec.Signed)
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
dec.Raw, nil,
)
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
trust.TRCInfo{Version: dec.TRC.Version}, nil,
)
m.Recurser.EXPECT().AllowRecursion(gomock.Any()).Return(nil)
Expand All @@ -370,10 +370,10 @@ func TestCryptoProviderGetTRCLatest(t *testing.T) {
dec.TRC.Validity.NotAfter.Time = time.Now()
dec.Signed.EncodedTRC, _ = trc.Encode(dec.TRC)
dec.Raw, _ = json.Marshal(dec.Signed)
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetRawTRC(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
dec.Raw, nil,
)
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.Version(0)).Return(
m.DB.EXPECT().GetTRCInfo(gomock.Any(), dec.TRC.ISD, scrypto.LatestVer).Return(
trust.TRCInfo{Version: dec.TRC.Version}, nil,
)
m.Recurser.EXPECT().AllowRecursion(gomock.Any()).Return(nil)
Expand Down Expand Up @@ -410,7 +410,7 @@ func TestCryptoProviderGetTRCLatest(t *testing.T) {
expected := test.Expect(&m, &decoded)
provider := trust.NewCryptoProvider(m.DB, m.Recurser, m.Resolver,
m.Router, test.CacheOnly)
trcObj, err := provider.GetTRC(nil, trc1v1.ISD, 0, test.Opts)
trcObj, err := provider.GetTRC(nil, trc1v1.ISD, scrypto.LatestVer, test.Opts)
assert.Equal(t, expected.TRC, trcObj)
if test.ExpectedErr != nil {
require.Error(t, err)
Expand Down

0 comments on commit ea18bbf

Please sign in to comment.