diff --git a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/OB30Inspector.java b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/OB30Inspector.java index 1fd21c9..a775f0c 100644 --- a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/OB30Inspector.java +++ b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/OB30Inspector.java @@ -174,6 +174,16 @@ public class OB30Inspector extends VCInspector implements SubInspector { probeCount++; accumulator.add(new CredentialSubjectProbe("AchievementSubject", true).run(ob.getJson(), ctx)); + // evidence + probeCount++; + accumulator.add(new EvidenceProbe().run(ob.getJson(), ctx)); + if(broken(accumulator)) return abort(ctx, accumulator, probeCount); + + // issuer + probeCount++; + accumulator.add(new IssuerProbe().run(ob.getJson(), ctx)); + if(broken(accumulator)) return abort(ctx, accumulator, probeCount); + //signatures, proofs probeCount++; if(ob.getProofType() == EXTERNAL){ @@ -204,16 +214,6 @@ public class OB30Inspector extends VCInspector implements SubInspector { if(broken(accumulator)) return abort(ctx, accumulator, probeCount); } - // evidence - probeCount++; - accumulator.add(new EvidenceProbe().run(ob.getJson(), ctx)); - if(broken(accumulator)) return abort(ctx, accumulator, probeCount); - - // issuer - probeCount++; - accumulator.add(new IssuerProbe().run(ob.getJson(), ctx)); - if(broken(accumulator)) return abort(ctx, accumulator, probeCount); - //embedded endorsements EndorsementInspector endorsementInspector = new EndorsementInspector.Builder().build();