Skip to content

Commit 691fe87

Browse files
sethjbacksethjback
authored
update to go code org (#225)
* update to go code org * remove replace Co-authored-by: Seth Back <[email protected]>
1 parent 1a53a23 commit 691fe87

23 files changed

Lines changed: 372 additions & 140 deletions

‎devops/CompileProtoFiles.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ function Remove-Protofiles($protoPath)
2626

2727
function Update-Golang()
2828
{
29-
$GoPath = "../go/okapi/proto"
29+
$GoPath = "../go/okapiproto"
3030
Remove-Protofiles($GoPath)
3131
protoc $( Get-ProtoPath ) `
3232
--go_out="$GoPath" `
3333
--go-grpc_out="$GoPath" `
34-
'--go_opt=module=github.com/trinsic-id/okapi' `
35-
'--go-grpc_opt=module=github.com/trinsic-id/okapi' `
34+
'--go_opt=module=github.com/trinsic-id/okapiproto' `
35+
'--go-grpc_opt=module=github.com/trinsic-id/okapiproto' `
3636
$( Get-ProtoFiles )
3737
Remove-Item "$GoPath/examples_grpc.pb.go"
3838
}

‎go/go.mod‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ module github.com/trinsic-id/okapi/go
22

33
go 1.16
44

5-
replace github.com/trinsic-id/okapi/go => ./
6-
75
require (
86
github.com/btcsuite/btcutil v1.0.2
97
github.com/stretchr/testify v1.7.0
10-
google.golang.org/protobuf v1.25.0
8+
golang.org/x/net v0.0.0-20211020060615-d418f374d309 // indirect
9+
golang.org/x/sys v0.0.0-20211020174200-9d6173849985 // indirect
10+
golang.org/x/text v0.3.7 // indirect
11+
google.golang.org/genproto v0.0.0-20211021150943-2b146023228c // indirect
12+
google.golang.org/grpc v1.41.0
13+
google.golang.org/protobuf v1.27.1
1114
)

‎go/go.sum‎

Lines changed: 69 additions & 3 deletions
Large diffs are not rendered by default.

‎go/okapi/DidComm.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package okapi
22

33
import (
4-
okapi "github.com/trinsic-id/okapi/go/okapi/proto"
4+
"github.com/trinsic-id/okapi/go/okapiproto"
55
)
66

77
type DidCommer interface {
8-
Pack(request *okapi.PackRequest) (*okapi.PackResponse, error)
9-
Unpack(request *okapi.UnpackRequest) (*okapi.UnpackResponse, error)
10-
Sign(request *okapi.SignRequest) (*okapi.SignResponse, error)
11-
Verify(request *okapi.VerifyRequest) (*okapi.VerifyResponse, error)
8+
Pack(request *okapiproto.PackRequest) (*okapiproto.PackResponse, error)
9+
Unpack(request *okapiproto.UnpackRequest) (*okapiproto.UnpackResponse, error)
10+
Sign(request *okapiproto.SignRequest) (*okapiproto.SignResponse, error)
11+
Verify(request *okapiproto.VerifyRequest) (*okapiproto.VerifyResponse, error)
1212
}
1313

1414
func DidComm() DidCommer {
@@ -17,26 +17,26 @@ func DidComm() DidCommer {
1717

1818
type didComm struct{}
1919

20-
func (d *didComm) Pack(request *okapi.PackRequest) (*okapi.PackResponse, error) {
21-
response := okapi.PackResponse{}
20+
func (d *didComm) Pack(request *okapiproto.PackRequest) (*okapiproto.PackResponse, error) {
21+
response := okapiproto.PackResponse{}
2222
err := callOkapiNative(request, &response, didcommPack)
2323
return &response, err
2424
}
2525

26-
func (d *didComm) Unpack(request *okapi.UnpackRequest) (*okapi.UnpackResponse, error) {
27-
response := okapi.UnpackResponse{}
26+
func (d *didComm) Unpack(request *okapiproto.UnpackRequest) (*okapiproto.UnpackResponse, error) {
27+
response := okapiproto.UnpackResponse{}
2828
err := callOkapiNative(request, &response, didcommUnpack)
2929
return &response, err
3030
}
3131

32-
func (d *didComm) Sign(request *okapi.SignRequest) (*okapi.SignResponse, error) {
33-
response := okapi.SignResponse{}
32+
func (d *didComm) Sign(request *okapiproto.SignRequest) (*okapiproto.SignResponse, error) {
33+
response := okapiproto.SignResponse{}
3434
err := callOkapiNative(request, &response, didcommSign)
3535
return &response, err
3636
}
3737

38-
func (d *didComm) Verify(request *okapi.VerifyRequest) (*okapi.VerifyResponse, error) {
39-
response := okapi.VerifyResponse{}
38+
func (d *didComm) Verify(request *okapiproto.VerifyRequest) (*okapiproto.VerifyResponse, error) {
39+
response := okapiproto.VerifyResponse{}
4040
err := callOkapiNative(request, &response, didcommVerify)
4141
return &response, err
4242
}

‎go/okapi/DidKey.go‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package okapi
22

3-
import (
4-
okapi "github.com/trinsic-id/okapi/go/okapi/proto"
5-
)
3+
import "github.com/trinsic-id/okapi/go/okapiproto"
64

75
// DidKeyer is the interface that groups the did:key functions
86
type DidKeyer interface {
9-
Generate(request *okapi.GenerateKeyRequest) (*okapi.GenerateKeyResponse, error)
10-
Resolve(request *okapi.ResolveRequest) (*okapi.ResolveResponse, error)
7+
Generate(request *okapiproto.GenerateKeyRequest) (*okapiproto.GenerateKeyResponse, error)
8+
Resolve(request *okapiproto.ResolveRequest) (*okapiproto.ResolveResponse, error)
119
}
1210

1311
// DidKey returns a DidKeyer that can generate and resolve did:keys
@@ -17,14 +15,14 @@ func DidKey() DidKeyer {
1715

1816
type didKey struct{}
1917

20-
func (d *didKey) Generate(request *okapi.GenerateKeyRequest) (*okapi.GenerateKeyResponse, error) {
21-
response := okapi.GenerateKeyResponse{}
18+
func (d *didKey) Generate(request *okapiproto.GenerateKeyRequest) (*okapiproto.GenerateKeyResponse, error) {
19+
response := okapiproto.GenerateKeyResponse{}
2220
err := callOkapiNative(request, &response, didkeyGenerate)
2321
return &response, err
2422
}
2523

26-
func (d *didKey) Resolve(request *okapi.ResolveRequest) (*okapi.ResolveResponse, error) {
27-
response := okapi.ResolveResponse{}
24+
func (d *didKey) Resolve(request *okapiproto.ResolveRequest) (*okapiproto.ResolveResponse, error) {
25+
response := okapiproto.ResolveResponse{}
2826
err := callOkapiNative(request, &response, didkeyResolve)
2927
return &response, err
3028
}

‎go/okapi/LdProofs.go‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package okapi
22

3-
import (
4-
okapi "github.com/trinsic-id/okapi/go/okapi/proto"
5-
)
3+
import "github.com/trinsic-id/okapi/go/okapiproto"
64

75
type LdProofer interface {
8-
CreateProof(request *okapi.CreateProofRequest) (*okapi.CreateProofResponse, error)
9-
VerifyProof(request *okapi.VerifyProofRequest) (*okapi.VerifyProofResponse, error)
6+
CreateProof(request *okapiproto.CreateProofRequest) (*okapiproto.CreateProofResponse, error)
7+
VerifyProof(request *okapiproto.VerifyProofRequest) (*okapiproto.VerifyProofResponse, error)
108
}
119

1210
func LdProofs() LdProofer {
@@ -15,14 +13,14 @@ func LdProofs() LdProofer {
1513

1614
type ldProofs struct{}
1715

18-
func (l *ldProofs) CreateProof(request *okapi.CreateProofRequest) (*okapi.CreateProofResponse, error) {
19-
response := okapi.CreateProofResponse{}
16+
func (l *ldProofs) CreateProof(request *okapiproto.CreateProofRequest) (*okapiproto.CreateProofResponse, error) {
17+
response := okapiproto.CreateProofResponse{}
2018
err := callOkapiNative(request, &response, ldproofsCreateProof)
2119
return &response, err
2220
}
2321

24-
func (l *ldProofs) VerifyProof(request *okapi.VerifyProofRequest) (*okapi.VerifyProofResponse, error) {
25-
response := okapi.VerifyProofResponse{}
22+
func (l *ldProofs) VerifyProof(request *okapiproto.VerifyProofRequest) (*okapiproto.VerifyProofResponse, error) {
23+
response := okapiproto.VerifyProofResponse{}
2624
err := callOkapiNative(request, &response, ldproofsVerifyProof)
2725
return &response, err
2826
}

‎go/okapi/Oberon.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package okapi
22

3-
import okapi "github.com/trinsic-id/okapi/go/okapi/proto"
3+
import "github.com/trinsic-id/okapi/go/okapiproto"
44

55
type Oberoner interface {
6-
CreateKey(request *okapi.CreateOberonKeyRequest) (*okapi.CreateOberonKeyResponse, error)
7-
CreateToken(request *okapi.CreateOberonTokenRequest) (*okapi.CreateOberonTokenResponse, error)
8-
BlindToken(request *okapi.BlindOberonTokenRequest) (*okapi.BlindOberonTokenResponse, error)
9-
UnblindToken(request *okapi.UnBlindOberonTokenRequest) (*okapi.UnBlindOberonTokenResponse, error)
10-
CreateProof(request *okapi.CreateOberonProofRequest) (*okapi.CreateOberonProofResponse, error)
11-
VerifyProof(request *okapi.VerifyOberonProofRequest) (*okapi.VerifyOberonProofResponse, error)
6+
CreateKey(request *okapiproto.CreateOberonKeyRequest) (*okapiproto.CreateOberonKeyResponse, error)
7+
CreateToken(request *okapiproto.CreateOberonTokenRequest) (*okapiproto.CreateOberonTokenResponse, error)
8+
BlindToken(request *okapiproto.BlindOberonTokenRequest) (*okapiproto.BlindOberonTokenResponse, error)
9+
UnblindToken(request *okapiproto.UnBlindOberonTokenRequest) (*okapiproto.UnBlindOberonTokenResponse, error)
10+
CreateProof(request *okapiproto.CreateOberonProofRequest) (*okapiproto.CreateOberonProofResponse, error)
11+
VerifyProof(request *okapiproto.VerifyOberonProofRequest) (*okapiproto.VerifyOberonProofResponse, error)
1212
}
1313

1414
func Oberon() Oberoner {
@@ -17,38 +17,38 @@ func Oberon() Oberoner {
1717

1818
type oberon struct{}
1919

20-
func (d *oberon) CreateKey(request *okapi.CreateOberonKeyRequest) (*okapi.CreateOberonKeyResponse, error) {
21-
response := okapi.CreateOberonKeyResponse{}
20+
func (d *oberon) CreateKey(request *okapiproto.CreateOberonKeyRequest) (*okapiproto.CreateOberonKeyResponse, error) {
21+
response := okapiproto.CreateOberonKeyResponse{}
2222
err := callOkapiNative(request, &response, oberonCreateKey)
2323
return &response, err
2424
}
2525

26-
func (d *oberon) CreateToken(request *okapi.CreateOberonTokenRequest) (*okapi.CreateOberonTokenResponse, error) {
27-
response := okapi.CreateOberonTokenResponse{}
26+
func (d *oberon) CreateToken(request *okapiproto.CreateOberonTokenRequest) (*okapiproto.CreateOberonTokenResponse, error) {
27+
response := okapiproto.CreateOberonTokenResponse{}
2828
err := callOkapiNative(request, &response, oberonCreateToken)
2929
return &response, err
3030
}
3131

32-
func (d *oberon) BlindToken(request *okapi.BlindOberonTokenRequest) (*okapi.BlindOberonTokenResponse, error) {
33-
response := okapi.BlindOberonTokenResponse{}
32+
func (d *oberon) BlindToken(request *okapiproto.BlindOberonTokenRequest) (*okapiproto.BlindOberonTokenResponse, error) {
33+
response := okapiproto.BlindOberonTokenResponse{}
3434
err := callOkapiNative(request, &response, oberonBlindToken)
3535
return &response, err
3636
}
3737

38-
func (d *oberon) UnblindToken(request *okapi.UnBlindOberonTokenRequest) (*okapi.UnBlindOberonTokenResponse, error) {
39-
response := okapi.UnBlindOberonTokenResponse{}
38+
func (d *oberon) UnblindToken(request *okapiproto.UnBlindOberonTokenRequest) (*okapiproto.UnBlindOberonTokenResponse, error) {
39+
response := okapiproto.UnBlindOberonTokenResponse{}
4040
err := callOkapiNative(request, &response, oberonUnBlindToken)
4141
return &response, err
4242
}
4343

44-
func (d *oberon) CreateProof(request *okapi.CreateOberonProofRequest) (*okapi.CreateOberonProofResponse, error) {
45-
response := okapi.CreateOberonProofResponse{}
44+
func (d *oberon) CreateProof(request *okapiproto.CreateOberonProofRequest) (*okapiproto.CreateOberonProofResponse, error) {
45+
response := okapiproto.CreateOberonProofResponse{}
4646
err := callOkapiNative(request, &response, oberonCreateProof)
4747
return &response, err
4848
}
4949

50-
func (d *oberon) VerifyProof(request *okapi.VerifyOberonProofRequest) (*okapi.VerifyOberonProofResponse, error) {
51-
response := okapi.VerifyOberonProofResponse{}
50+
func (d *oberon) VerifyProof(request *okapiproto.VerifyOberonProofRequest) (*okapiproto.VerifyOberonProofResponse, error) {
51+
response := okapiproto.VerifyOberonProofResponse{}
5252
err := callOkapiNative(request, &response, oberonVerifyProof)
5353
return &response, err
5454
}

‎go/okapi/didkey_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/btcsuite/btcutil/base58"
99
"github.com/stretchr/testify/assert"
10-
okapi "github.com/trinsic-id/okapi/go/okapi/proto"
10+
"github.com/trinsic-id/okapi/go/okapiproto"
1111

1212
"testing"
1313
)
@@ -16,8 +16,8 @@ func TestGenerateKey(t *testing.T) {
1616
assert := assert.New(t)
1717
dk := DidKey()
1818

19-
request := okapi.GenerateKeyRequest{}
20-
request.KeyType = okapi.KeyType_KEY_TYPE_ED25519
19+
request := okapiproto.GenerateKeyRequest{}
20+
request.KeyType = okapiproto.KeyType_KEY_TYPE_ED25519
2121
request.Seed = []byte{1, 2, 3}
2222

2323
response, err := dk.Generate(&request)
@@ -29,8 +29,8 @@ func TestGenerateKey(t *testing.T) {
2929
func TestGenerateKeyNoSeed(t *testing.T) {
3030
dk := DidKey()
3131

32-
request := okapi.GenerateKeyRequest{}
33-
request.KeyType = okapi.KeyType_KEY_TYPE_ED25519
32+
request := okapiproto.GenerateKeyRequest{}
33+
request.KeyType = okapiproto.KeyType_KEY_TYPE_ED25519
3434

3535
response, err := dk.Generate(&request)
3636
assert.Nil(t, err)
@@ -41,7 +41,7 @@ func TestResolveKey(t *testing.T) {
4141
dk := DidKey()
4242

4343
key := "did:key:z6Mkt6QT8FPajKXDrtMefkjxRQENd9wFzKkDFomdQAVFzpzm#z6LSfDq6DuofPeZUqNEmdZsxpvfHvSoUXGEWFhw7JHk4cynN"
44-
request := &okapi.ResolveRequest{}
44+
request := &okapiproto.ResolveRequest{}
4545
request.Did = key
4646

4747
response, err := dk.Resolve(request)
@@ -52,7 +52,7 @@ func TestResolveKey(t *testing.T) {
5252
func TestGenerateKeyThrowsInvalidKeyType(t *testing.T) {
5353
dk := DidKey()
5454

55-
request := okapi.GenerateKeyRequest{}
55+
request := okapiproto.GenerateKeyRequest{}
5656
request.KeyType = -1
5757

5858
_, err := dk.Generate(&request)
@@ -61,7 +61,7 @@ func TestGenerateKeyThrowsInvalidKeyType(t *testing.T) {
6161
}
6262

6363
type DataArgument struct {
64-
keyType okapi.KeyType
64+
keyType okapiproto.KeyType
6565
keyTypeString string
6666
seed string
6767
response string
@@ -70,10 +70,10 @@ type DataArgument struct {
7070
func TestGenerateKeyFromSeed(t *testing.T) {
7171
dk := DidKey()
7272

73-
dataArguments := []DataArgument{{keyType: okapi.KeyType_KEY_TYPE_ED25519, keyTypeString: "Ed25519",
73+
dataArguments := []DataArgument{{keyType: okapiproto.KeyType_KEY_TYPE_ED25519, keyTypeString: "Ed25519",
7474
seed: "4f66b355aa7b0980ff901f2295b9c562ac3061be4df86703eb28c612faae6578",
7575
response: "6fioC1zcDPyPEL19pXRS2E4iJ46zH7xP6uSgAaPdwDrx"},
76-
{keyType: okapi.KeyType_KEY_TYPE_X25519, keyTypeString: "X25519",
76+
{keyType: okapiproto.KeyType_KEY_TYPE_X25519, keyTypeString: "X25519",
7777
seed: "9b29d42b38ddd52ed39c0ff70b39572a6eb9b3cac201918dc6d6a84b4c88d2a5",
7878
response: "3EK9AYXoUV4Unn5AjvYY39hyK91n7gg4ExC8rKKSUQXJ"},
7979
}
@@ -84,7 +84,7 @@ func TestGenerateKeyFromSeed(t *testing.T) {
8484
if err != nil {
8585
assert.Failf(t, "Failed to decode hex", argument.seed)
8686
}
87-
request := okapi.GenerateKeyRequest{KeyType: argument.keyType, Seed: hex}
87+
request := okapiproto.GenerateKeyRequest{KeyType: argument.keyType, Seed: hex}
8888
response, err := dk.Generate(&request)
8989
assert.Nil(t, err)
9090

@@ -94,7 +94,7 @@ func TestGenerateKeyFromSeed(t *testing.T) {
9494
}
9595
}
9696

97-
func assertValidKeyGenerated(t *testing.T, response *okapi.GenerateKeyResponse, crvOptional ...string) []byte {
97+
func assertValidKeyGenerated(t *testing.T, response *okapiproto.GenerateKeyResponse, crvOptional ...string) []byte {
9898
crv := "Ed25519"
9999
if len(crvOptional) > 0 {
100100
crv = crvOptional[0]

‎go/okapi/ldproofs_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"time"
66

77
"github.com/stretchr/testify/assert"
8-
okapi "github.com/trinsic-id/okapi/go/okapi/proto"
8+
"github.com/trinsic-id/okapi/go/okapiproto"
99
"google.golang.org/protobuf/types/known/structpb"
1010
)
1111

@@ -25,23 +25,23 @@ func TestGenerateCapabilityInvocationProofWithJCS(t *testing.T) {
2525
return
2626
}
2727

28-
request := okapi.GenerateKeyRequest{KeyType: okapi.KeyType_KEY_TYPE_ED25519}
28+
request := okapiproto.GenerateKeyRequest{KeyType: okapiproto.KeyType_KEY_TYPE_ED25519}
2929
response, err := dk.Generate(&request)
3030
if !assert.Nil(err) {
3131
return
3232
}
3333

34-
signingKey := &okapi.JsonWebKey{}
34+
signingKey := &okapiproto.JsonWebKey{}
3535
for _, key := range response.Key {
3636
if key.Crv == "Ed25519" {
3737
signingKey = key
3838
break
3939
}
4040
}
41-
signedCapability, err := ldp.CreateProof(&okapi.CreateProofRequest{
41+
signedCapability, err := ldp.CreateProof(&okapiproto.CreateProofRequest{
4242
Document: proofStruct,
4343
Key: signingKey,
44-
Suite: okapi.LdSuite_LD_SUITE_JCSED25519SIGNATURE2020,
44+
Suite: okapiproto.LdSuite_LD_SUITE_JCSED25519SIGNATURE2020,
4545
})
4646
if !assert.Nil(err) {
4747
return

0 commit comments

Comments
 (0)