Skip to content

Commit

Permalink
update to go code org (#225)
Browse files Browse the repository at this point in the history 
* update to go code org

* remove replace

Co-authored-by: Seth Back <sethjback@gmail.com>
  • Loading branch information
@sethjback
sethjback and sethjback authored Oct 22, 2021
1 parent 1a53a23 commit 691fe87
Show file tree
Hide file tree
Showing 23 changed files with 372 additions and 140 deletions.
6 changes: 3 additions & 3 deletions devops/CompileProtoFiles.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ function Remove-Protofiles($protoPath)

function Update-Golang()
{
$GoPath = "../go/okapi/proto"
$GoPath = "../go/okapiproto"
Remove-Protofiles($GoPath)
protoc $( Get-ProtoPath ) `
--go_out="$GoPath" `
--go-grpc_out="$GoPath" `
'--go_opt=module=github.com/trinsic-id/okapi' `
'--go-grpc_opt=module=github.com/trinsic-id/okapi' `
'--go_opt=module=github.com/trinsic-id/okapiproto' `
'--go-grpc_opt=module=github.com/trinsic-id/okapiproto' `
$( Get-ProtoFiles )
Remove-Item "$GoPath/examples_grpc.pb.go"
}
Expand Down
9 changes: 6 additions & 3 deletions go/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ module github.com/trinsic-id/okapi/go

go 1.16

replace github.com/trinsic-id/okapi/go => ./

require (
github.com/btcsuite/btcutil v1.0.2
github.com/stretchr/testify v1.7.0
google.golang.org/protobuf v1.25.0
golang.org/x/net v0.0.0-20211020060615-d418f374d309 // indirect
golang.org/x/sys v0.0.0-20211020174200-9d6173849985 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20211021150943-2b146023228c // indirect
google.golang.org/grpc v1.41.0
google.golang.org/protobuf v1.27.1
)
72 changes: 69 additions & 3 deletions go/go.sum
View file

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions go/okapi/DidComm.go
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package okapi

import (
okapi "github.com/trinsic-id/okapi/go/okapi/proto"
"github.com/trinsic-id/okapi/go/okapiproto"
)

type DidCommer interface {
Pack(request *okapi.PackRequest) (*okapi.PackResponse, error)
Unpack(request *okapi.UnpackRequest) (*okapi.UnpackResponse, error)
Sign(request *okapi.SignRequest) (*okapi.SignResponse, error)
Verify(request *okapi.VerifyRequest) (*okapi.VerifyResponse, error)
Pack(request *okapiproto.PackRequest) (*okapiproto.PackResponse, error)
Unpack(request *okapiproto.UnpackRequest) (*okapiproto.UnpackResponse, error)
Sign(request *okapiproto.SignRequest) (*okapiproto.SignResponse, error)
Verify(request *okapiproto.VerifyRequest) (*okapiproto.VerifyResponse, error)
}

func DidComm() DidCommer {
Expand All @@ -17,26 +17,26 @@ func DidComm() DidCommer {

type didComm struct{}

func (d *didComm) Pack(request *okapi.PackRequest) (*okapi.PackResponse, error) {
response := okapi.PackResponse{}
func (d *didComm) Pack(request *okapiproto.PackRequest) (*okapiproto.PackResponse, error) {
response := okapiproto.PackResponse{}
err := callOkapiNative(request, &response, didcommPack)
return &response, err
}

func (d *didComm) Unpack(request *okapi.UnpackRequest) (*okapi.UnpackResponse, error) {
response := okapi.UnpackResponse{}
func (d *didComm) Unpack(request *okapiproto.UnpackRequest) (*okapiproto.UnpackResponse, error) {
response := okapiproto.UnpackResponse{}
err := callOkapiNative(request, &response, didcommUnpack)
return &response, err
}

func (d *didComm) Sign(request *okapi.SignRequest) (*okapi.SignResponse, error) {
response := okapi.SignResponse{}
func (d *didComm) Sign(request *okapiproto.SignRequest) (*okapiproto.SignResponse, error) {
response := okapiproto.SignResponse{}
err := callOkapiNative(request, &response, didcommSign)
return &response, err
}

func (d *didComm) Verify(request *okapi.VerifyRequest) (*okapi.VerifyResponse, error) {
response := okapi.VerifyResponse{}
func (d *didComm) Verify(request *okapiproto.VerifyRequest) (*okapiproto.VerifyResponse, error) {
response := okapiproto.VerifyResponse{}
err := callOkapiNative(request, &response, didcommVerify)
return &response, err
}
16 changes: 7 additions & 9 deletions go/okapi/DidKey.go
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package okapi

import (
okapi "github.com/trinsic-id/okapi/go/okapi/proto"
)
import "github.com/trinsic-id/okapi/go/okapiproto"

// DidKeyer is the interface that groups the did:key functions
type DidKeyer interface {
Generate(request *okapi.GenerateKeyRequest) (*okapi.GenerateKeyResponse, error)
Resolve(request *okapi.ResolveRequest) (*okapi.ResolveResponse, error)
Generate(request *okapiproto.GenerateKeyRequest) (*okapiproto.GenerateKeyResponse, error)
Resolve(request *okapiproto.ResolveRequest) (*okapiproto.ResolveResponse, error)
}

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

type didKey struct{}

func (d *didKey) Generate(request *okapi.GenerateKeyRequest) (*okapi.GenerateKeyResponse, error) {
response := okapi.GenerateKeyResponse{}
func (d *didKey) Generate(request *okapiproto.GenerateKeyRequest) (*okapiproto.GenerateKeyResponse, error) {
response := okapiproto.GenerateKeyResponse{}
err := callOkapiNative(request, &response, didkeyGenerate)
return &response, err
}

func (d *didKey) Resolve(request *okapi.ResolveRequest) (*okapi.ResolveResponse, error) {
response := okapi.ResolveResponse{}
func (d *didKey) Resolve(request *okapiproto.ResolveRequest) (*okapiproto.ResolveResponse, error) {
response := okapiproto.ResolveResponse{}
err := callOkapiNative(request, &response, didkeyResolve)
return &response, err
}
16 changes: 7 additions & 9 deletions go/okapi/LdProofs.go
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package okapi

import (
okapi "github.com/trinsic-id/okapi/go/okapi/proto"
)
import "github.com/trinsic-id/okapi/go/okapiproto"

type LdProofer interface {
CreateProof(request *okapi.CreateProofRequest) (*okapi.CreateProofResponse, error)
VerifyProof(request *okapi.VerifyProofRequest) (*okapi.VerifyProofResponse, error)
CreateProof(request *okapiproto.CreateProofRequest) (*okapiproto.CreateProofResponse, error)
VerifyProof(request *okapiproto.VerifyProofRequest) (*okapiproto.VerifyProofResponse, error)
}

func LdProofs() LdProofer {
Expand All @@ -15,14 +13,14 @@ func LdProofs() LdProofer {

type ldProofs struct{}

func (l *ldProofs) CreateProof(request *okapi.CreateProofRequest) (*okapi.CreateProofResponse, error) {
response := okapi.CreateProofResponse{}
func (l *ldProofs) CreateProof(request *okapiproto.CreateProofRequest) (*okapiproto.CreateProofResponse, error) {
response := okapiproto.CreateProofResponse{}
err := callOkapiNative(request, &response, ldproofsCreateProof)
return &response, err
}

func (l *ldProofs) VerifyProof(request *okapi.VerifyProofRequest) (*okapi.VerifyProofResponse, error) {
response := okapi.VerifyProofResponse{}
func (l *ldProofs) VerifyProof(request *okapiproto.VerifyProofRequest) (*okapiproto.VerifyProofResponse, error) {
response := okapiproto.VerifyProofResponse{}
err := callOkapiNative(request, &response, ldproofsVerifyProof)
return &response, err
}
38 changes: 19 additions & 19 deletions go/okapi/Oberon.go
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package okapi

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

type Oberoner interface {
CreateKey(request *okapi.CreateOberonKeyRequest) (*okapi.CreateOberonKeyResponse, error)
CreateToken(request *okapi.CreateOberonTokenRequest) (*okapi.CreateOberonTokenResponse, error)
BlindToken(request *okapi.BlindOberonTokenRequest) (*okapi.BlindOberonTokenResponse, error)
UnblindToken(request *okapi.UnBlindOberonTokenRequest) (*okapi.UnBlindOberonTokenResponse, error)
CreateProof(request *okapi.CreateOberonProofRequest) (*okapi.CreateOberonProofResponse, error)
VerifyProof(request *okapi.VerifyOberonProofRequest) (*okapi.VerifyOberonProofResponse, error)
CreateKey(request *okapiproto.CreateOberonKeyRequest) (*okapiproto.CreateOberonKeyResponse, error)
CreateToken(request *okapiproto.CreateOberonTokenRequest) (*okapiproto.CreateOberonTokenResponse, error)
BlindToken(request *okapiproto.BlindOberonTokenRequest) (*okapiproto.BlindOberonTokenResponse, error)
UnblindToken(request *okapiproto.UnBlindOberonTokenRequest) (*okapiproto.UnBlindOberonTokenResponse, error)
CreateProof(request *okapiproto.CreateOberonProofRequest) (*okapiproto.CreateOberonProofResponse, error)
VerifyProof(request *okapiproto.VerifyOberonProofRequest) (*okapiproto.VerifyOberonProofResponse, error)
}

func Oberon() Oberoner {
Expand All @@ -17,38 +17,38 @@ func Oberon() Oberoner {

type oberon struct{}

func (d *oberon) CreateKey(request *okapi.CreateOberonKeyRequest) (*okapi.CreateOberonKeyResponse, error) {
response := okapi.CreateOberonKeyResponse{}
func (d *oberon) CreateKey(request *okapiproto.CreateOberonKeyRequest) (*okapiproto.CreateOberonKeyResponse, error) {
response := okapiproto.CreateOberonKeyResponse{}
err := callOkapiNative(request, &response, oberonCreateKey)
return &response, err
}

func (d *oberon) CreateToken(request *okapi.CreateOberonTokenRequest) (*okapi.CreateOberonTokenResponse, error) {
response := okapi.CreateOberonTokenResponse{}
func (d *oberon) CreateToken(request *okapiproto.CreateOberonTokenRequest) (*okapiproto.CreateOberonTokenResponse, error) {
response := okapiproto.CreateOberonTokenResponse{}
err := callOkapiNative(request, &response, oberonCreateToken)
return &response, err
}

func (d *oberon) BlindToken(request *okapi.BlindOberonTokenRequest) (*okapi.BlindOberonTokenResponse, error) {
response := okapi.BlindOberonTokenResponse{}
func (d *oberon) BlindToken(request *okapiproto.BlindOberonTokenRequest) (*okapiproto.BlindOberonTokenResponse, error) {
response := okapiproto.BlindOberonTokenResponse{}
err := callOkapiNative(request, &response, oberonBlindToken)
return &response, err
}

func (d *oberon) UnblindToken(request *okapi.UnBlindOberonTokenRequest) (*okapi.UnBlindOberonTokenResponse, error) {
response := okapi.UnBlindOberonTokenResponse{}
func (d *oberon) UnblindToken(request *okapiproto.UnBlindOberonTokenRequest) (*okapiproto.UnBlindOberonTokenResponse, error) {
response := okapiproto.UnBlindOberonTokenResponse{}
err := callOkapiNative(request, &response, oberonUnBlindToken)
return &response, err
}

func (d *oberon) CreateProof(request *okapi.CreateOberonProofRequest) (*okapi.CreateOberonProofResponse, error) {
response := okapi.CreateOberonProofResponse{}
func (d *oberon) CreateProof(request *okapiproto.CreateOberonProofRequest) (*okapiproto.CreateOberonProofResponse, error) {
response := okapiproto.CreateOberonProofResponse{}
err := callOkapiNative(request, &response, oberonCreateProof)
return &response, err
}

func (d *oberon) VerifyProof(request *okapi.VerifyOberonProofRequest) (*okapi.VerifyOberonProofResponse, error) {
response := okapi.VerifyOberonProofResponse{}
func (d *oberon) VerifyProof(request *okapiproto.VerifyOberonProofRequest) (*okapiproto.VerifyOberonProofResponse, error) {
response := okapiproto.VerifyOberonProofResponse{}
err := callOkapiNative(request, &response, oberonVerifyProof)
return &response, err
}
24 changes: 12 additions & 12 deletions go/okapi/didkey_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/btcsuite/btcutil/base58"
"github.com/stretchr/testify/assert"
okapi "github.com/trinsic-id/okapi/go/okapi/proto"
"github.com/trinsic-id/okapi/go/okapiproto"

"testing"
)
Expand All @@ -16,8 +16,8 @@ func TestGenerateKey(t *testing.T) {
assert := assert.New(t)
dk := DidKey()

request := okapi.GenerateKeyRequest{}
request.KeyType = okapi.KeyType_KEY_TYPE_ED25519
request := okapiproto.GenerateKeyRequest{}
request.KeyType = okapiproto.KeyType_KEY_TYPE_ED25519
request.Seed = []byte{1, 2, 3}

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

request := okapi.GenerateKeyRequest{}
request.KeyType = okapi.KeyType_KEY_TYPE_ED25519
request := okapiproto.GenerateKeyRequest{}
request.KeyType = okapiproto.KeyType_KEY_TYPE_ED25519

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

key := "did:key:z6Mkt6QT8FPajKXDrtMefkjxRQENd9wFzKkDFomdQAVFzpzm#z6LSfDq6DuofPeZUqNEmdZsxpvfHvSoUXGEWFhw7JHk4cynN"
request := &okapi.ResolveRequest{}
request := &okapiproto.ResolveRequest{}
request.Did = key

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

request := okapi.GenerateKeyRequest{}
request := okapiproto.GenerateKeyRequest{}
request.KeyType = -1

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

type DataArgument struct {
keyType okapi.KeyType
keyType okapiproto.KeyType
keyTypeString string
seed string
response string
Expand All @@ -70,10 +70,10 @@ type DataArgument struct {
func TestGenerateKeyFromSeed(t *testing.T) {
dk := DidKey()

dataArguments := []DataArgument{{keyType: okapi.KeyType_KEY_TYPE_ED25519, keyTypeString: "Ed25519",
dataArguments := []DataArgument{{keyType: okapiproto.KeyType_KEY_TYPE_ED25519, keyTypeString: "Ed25519",
seed: "4f66b355aa7b0980ff901f2295b9c562ac3061be4df86703eb28c612faae6578",
response: "6fioC1zcDPyPEL19pXRS2E4iJ46zH7xP6uSgAaPdwDrx"},
{keyType: okapi.KeyType_KEY_TYPE_X25519, keyTypeString: "X25519",
{keyType: okapiproto.KeyType_KEY_TYPE_X25519, keyTypeString: "X25519",
seed: "9b29d42b38ddd52ed39c0ff70b39572a6eb9b3cac201918dc6d6a84b4c88d2a5",
response: "3EK9AYXoUV4Unn5AjvYY39hyK91n7gg4ExC8rKKSUQXJ"},
}
Expand All @@ -84,7 +84,7 @@ func TestGenerateKeyFromSeed(t *testing.T) {
if err != nil {
assert.Failf(t, "Failed to decode hex", argument.seed)
}
request := okapi.GenerateKeyRequest{KeyType: argument.keyType, Seed: hex}
request := okapiproto.GenerateKeyRequest{KeyType: argument.keyType, Seed: hex}
response, err := dk.Generate(&request)
assert.Nil(t, err)

Expand All @@ -94,7 +94,7 @@ func TestGenerateKeyFromSeed(t *testing.T) {
}
}

func assertValidKeyGenerated(t *testing.T, response *okapi.GenerateKeyResponse, crvOptional ...string) []byte {
func assertValidKeyGenerated(t *testing.T, response *okapiproto.GenerateKeyResponse, crvOptional ...string) []byte {
crv := "Ed25519"
if len(crvOptional) > 0 {
crv = crvOptional[0]
Expand Down
10 changes: 5 additions & 5 deletions go/okapi/ldproofs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"time"

"github.com/stretchr/testify/assert"
okapi "github.com/trinsic-id/okapi/go/okapi/proto"
"github.com/trinsic-id/okapi/go/okapiproto"
"google.golang.org/protobuf/types/known/structpb"
)

Expand All @@ -25,23 +25,23 @@ func TestGenerateCapabilityInvocationProofWithJCS(t *testing.T) {
return
}

request := okapi.GenerateKeyRequest{KeyType: okapi.KeyType_KEY_TYPE_ED25519}
request := okapiproto.GenerateKeyRequest{KeyType: okapiproto.KeyType_KEY_TYPE_ED25519}
response, err := dk.Generate(&request)
if !assert.Nil(err) {
return
}

signingKey := &okapi.JsonWebKey{}
signingKey := &okapiproto.JsonWebKey{}
for _, key := range response.Key {
if key.Crv == "Ed25519" {
signingKey = key
break
}
}
signedCapability, err := ldp.CreateProof(&okapi.CreateProofRequest{
signedCapability, err := ldp.CreateProof(&okapiproto.CreateProofRequest{
Document: proofStruct,
Key: signingKey,
Suite: okapi.LdSuite_LD_SUITE_JCSED25519SIGNATURE2020,
Suite: okapiproto.LdSuite_LD_SUITE_JCSED25519SIGNATURE2020,
})
if !assert.Nil(err) {
return
Expand Down
Loading

0 comments on commit 691fe87

Please sign in to comment.