moved package from stfe/server/descriptor to stfe/descriptor

8 files changed, 5 insertions, 10 deletions

diff --git a/client/add-entry/main.go b/client/add-entry/main.go
index 463b65c..084bdad 100644
--- a/client/add-entry/main.go
+++ b/client/add-entry/main.go
@@ -13,7 +13,7 @@ import (
 )
 
 var (
-	operators = flag.String("operators", "../../server/descriptor/stfe.json", "path to json-encoded list of log operators")
+	operators = flag.String("operators", "../../descriptor/stfe.json", "path to json-encoded list of log operators")
 	logId     = flag.String("log_id", "B9oCJk4XIOMXba8dBM5yUj+NLtqTE6xHwbvR9dYkHPM=", "base64-encoded log identifier")
 	chain     = flag.String("chain", "../../server/testdata/x509/chain.pem", "path to pem-encoded certificate chain that the log accepts")
 	key       = flag.String("key", "../../server/testdata/x509/end-entity.key", "path to ed25519 private key that corresponds to the chain's end-entity certificate")
diff --git a/client/client.go b/client/client.go
index a95fc77..88ccf2f 100644
--- a/client/client.go
+++ b/client/client.go
@@ -16,7 +16,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/google/trillian/merkle/rfc6962"
 	"github.com/system-transparency/stfe"
-	"github.com/system-transparency/stfe/server/descriptor"
+	"github.com/system-transparency/stfe/descriptor"
 	"github.com/system-transparency/stfe/x509util"
 	"golang.org/x/net/context/ctxhttp"
 )
diff --git a/client/get-consistency-proof/main.go b/client/get-consistency-proof/main.go
index f5cb57a..72fa804 100644
--- a/client/get-consistency-proof/main.go
+++ b/client/get-consistency-proof/main.go
@@ -13,7 +13,7 @@ import (
 )
 
 var (
-	operators = flag.String("operators", "../../server/descriptor/stfe.json", "path to json-encoded list of log operators")
+	operators = flag.String("operators", "../../descriptor/stfe.json", "path to json-encoded list of log operators")
 	logId     = flag.String("log_id", "B9oCJk4XIOMXba8dBM5yUj+NLtqTE6xHwbvR9dYkHPM=", "base64-encoded log identifier")
 	chain     = flag.String("chain", "../../server/testdata/x509/end-entity.pem", "path to pem-encoded certificate chain that the log accepts")
 	first     = flag.String("first", "AAEgB9oCJk4XIOMXba8dBM5yUj+NLtqTE6xHwbvR9dYkHPMAAAF1jnn7fwAAAAAAAAAxICCqLJn4QWYd0aRIRjDWGf4GWalDIb/iH60jSSX89WgvAAAAQF9XPFRdM56KaelHFFg1RqjTw1yFL085zHhdNkLeZh9BCXxVTByqrHEMngAkY69EX45aJMWh9NymmPau0qoigA8=", "first base64-encoded StItem of type StFormatSignedTreeHeadV1")
diff --git a/client/get-proof-by-hash/main.go b/client/get-proof-by-hash/main.go
index 842dbcd..897a8aa 100644
--- a/client/get-proof-by-hash/main.go
+++ b/client/get-proof-by-hash/main.go
@@ -14,7 +14,7 @@ import (
 )
 
 var (
-	operators      = flag.String("operators", "../../server/descriptor/stfe.json", "path to json-encoded list of log operators")
+	operators      = flag.String("operators", "../../descriptor/stfe.json", "path to json-encoded list of log operators")
 	logId          = flag.String("log_id", "B9oCJk4XIOMXba8dBM5yUj+NLtqTE6xHwbvR9dYkHPM=", "base64-encoded log identifier")
 	chain          = flag.String("chain", "../../server/testdata/x509/end-entity.pem", "path to pem-encoded certificate chain that the log accepts")
 	signedTreeHead = flag.String("sth", "AAEgB9oCJk4XIOMXba8dBM5yUj+NLtqTE6xHwbvR9dYkHPMAAAF1jnn7fwAAAAAAAAAxICCqLJn4QWYd0aRIRjDWGf4GWalDIb/iH60jSSX89WgvAAAAQF9XPFRdM56KaelHFFg1RqjTw1yFL085zHhdNkLeZh9BCXxVTByqrHEMngAkY69EX45aJMWh9NymmPau0qoigA8=", "base64-encoded StItem of type StFormatSignedTreeHeadV1")
diff --git a/client/get-sth/main.go b/client/get-sth/main.go
index 8db64d5..7bfcc71 100644
--- a/client/get-sth/main.go
+++ b/client/get-sth/main.go
@@ -12,7 +12,7 @@ import (
 )
 
 var (
-	operators = flag.String("operators", "../../server/descriptor/stfe.json", "path to json-encoded list of log operators")
+	operators = flag.String("operators", "../../descriptor/stfe.json", "path to json-encoded list of log operators")
 	logId     = flag.String("log_id", "B9oCJk4XIOMXba8dBM5yUj+NLtqTE6xHwbvR9dYkHPM=", "base64-encoded log identifier")
 	chain     = flag.String("chain", "../../server/testdata/x509/end-entity.pem", "path to pem-encoded certificate chain that the log accepts")
 )
diff --git a/server/descriptor/descriptor.go b/descriptor/descriptor.go
index 295e03f..267a401 100644
--- a/server/descriptor/descriptor.go
+++ b/descriptor/descriptor.go
@@ -12,11 +12,6 @@ import (
 	"io/ioutil"
 )
 
-const (
-	// Location is an url to a json-encoded list of stfe log operators
-	Location = "https://github.com/system-transparency/stfe/tree/main/server/descriptor/stfe.json"
-)
-
 // Operator is an stfe log operator that runs zero or more logs
 type Operator struct {
 	Name  string `json:"name"`
diff --git a/server/descriptor/descriptor_test.go b/descriptor/descriptor_test.go
index d01fc66..d01fc66 100644
--- a/server/descriptor/descriptor_test.go
+++ b/descriptor/descriptor_test.go
diff --git a/server/descriptor/stfe.json b/descriptor/stfe.json
index d987c47..d987c47 100644
--- a/server/descriptor/stfe.json
+++ b/descriptor/stfe.json