Skip to content

Commit

Permalink
Merge pull request #1375 from fqutishat/update
Browse files Browse the repository at this point in the history 
chore: update to rc2 vct and sidetree-core-go
  • Loading branch information
@fqutishat
fqutishat authored Jun 23, 2022
2 parents 09cd2ec + 4886ea6 commit 0a44f37
Show file tree
Hide file tree
Showing 13 changed files with 36 additions and 35 deletions.
4 changes: 2 additions & 2 deletions cmd/orb-cli/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ require (
github.com/stretchr/testify v1.7.0
github.com/trustbloc/edge-core v0.1.8
github.com/trustbloc/orb v1.0.0-rc1.0.20220531195220-8fc19d247843
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220620200455-bdd53389b6fa
github.com/trustbloc/vct v1.0.0-rc1.0.20220530071917-3aa4f907b424
github.com/trustbloc/sidetree-core-go v1.0.0-rc2
github.com/trustbloc/vct v1.0.0-rc2
)

require (
Expand Down
7 changes: 4 additions & 3 deletions cmd/orb-cli/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1432,10 +1432,11 @@ github.com/trustbloc/edge-core v0.1.8/go.mod h1:gfoyG/xquRXyHkww0ldM2jwOTuKKZpHY
github.com/trustbloc/kms v0.1.9-0.20220526151939-d46e46e8f7e1/go.mod h1:a6XvGLZgwVqBAt47550cQeRKm04X2Nn1M8DE0PVb0XA=
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ=
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220428193233-a1567c33db3e/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ=
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220620200455-bdd53389b6fa h1:9Uk54HGYfVesMTrXJZcXmoyfv6ZMLPuVaSlbKsr3Pg0=
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220620200455-bdd53389b6fa/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ=
github.com/trustbloc/vct v1.0.0-rc1.0.20220530071917-3aa4f907b424 h1:4/AWf/BGH7+i0Qbz6MZnQQzacLmx0b3vd87ajet16ak=
github.com/trustbloc/sidetree-core-go v1.0.0-rc2 h1:Ca/4iuZu/RhzraPfrj/r+tDuJiqYOd3R7bXyBJF+cXg=
github.com/trustbloc/sidetree-core-go v1.0.0-rc2/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ=
github.com/trustbloc/vct v1.0.0-rc1.0.20220530071917-3aa4f907b424/go.mod h1:k45HahHV0lr2h8ldzITXLjcWpTgXzRE8WL1avfC95po=
github.com/trustbloc/vct v1.0.0-rc2 h1:iuoG3rLC3V0kuwGnBmnzVPGH6xAxWzpozgkW5T5Qlac=
github.com/trustbloc/vct v1.0.0-rc2/go.mod h1:k45HahHV0lr2h8ldzITXLjcWpTgXzRE8WL1avfC95po=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
Expand Down
4 changes: 2 additions & 2 deletions cmd/orb-driver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/stretchr/testify v1.7.0
github.com/trustbloc/edge-core v0.1.8
github.com/trustbloc/orb v1.0.0-rc1.0.20220531195220-8fc19d247843
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220620200455-bdd53389b6fa
github.com/trustbloc/sidetree-core-go v1.0.0-rc2
)

require (
Expand Down Expand Up @@ -64,7 +64,7 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/square/go-jose/v3 v3.0.0-20200630053402-0a67ce9b0693 // indirect
github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8 // indirect
github.com/trustbloc/vct v1.0.0-rc1.0.20220530071917-3aa4f907b424 // indirect
github.com/trustbloc/vct v1.0.0-rc2 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.1 // indirect
Expand Down
7 changes: 4 additions & 3 deletions cmd/orb-driver/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1420,10 +1420,11 @@ github.com/trustbloc/edge-core v0.1.8/go.mod h1:gfoyG/xquRXyHkww0ldM2jwOTuKKZpHY
github.com/trustbloc/kms v0.1.9-0.20220526151939-d46e46e8f7e1/go.mod h1:a6XvGLZgwVqBAt47550cQeRKm04X2Nn1M8DE0PVb0XA=
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ=
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220428193233-a1567c33db3e/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ=
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220620200455-bdd53389b6fa h1:9Uk54HGYfVesMTrXJZcXmoyfv6ZMLPuVaSlbKsr3Pg0=
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220620200455-bdd53389b6fa/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ=
github.com/trustbloc/vct v1.0.0-rc1.0.20220530071917-3aa4f907b424 h1:4/AWf/BGH7+i0Qbz6MZnQQzacLmx0b3vd87ajet16ak=
github.com/trustbloc/sidetree-core-go v1.0.0-rc2 h1:Ca/4iuZu/RhzraPfrj/r+tDuJiqYOd3R7bXyBJF+cXg=
github.com/trustbloc/sidetree-core-go v1.0.0-rc2/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ=
github.com/trustbloc/vct v1.0.0-rc1.0.20220530071917-3aa4f907b424/go.mod h1:k45HahHV0lr2h8ldzITXLjcWpTgXzRE8WL1avfC95po=
github.com/trustbloc/vct v1.0.0-rc2 h1:iuoG3rLC3V0kuwGnBmnzVPGH6xAxWzpozgkW5T5Qlac=
github.com/trustbloc/vct v1.0.0-rc2/go.mod h1:k45HahHV0lr2h8ldzITXLjcWpTgXzRE8WL1avfC95po=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
Expand Down
4 changes: 2 additions & 2 deletions cmd/orb-server/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/trustbloc/edge-core v0.1.8
github.com/trustbloc/kms v0.1.9-0.20220526151939-d46e46e8f7e1
github.com/trustbloc/orb v0.1.3
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220620200455-bdd53389b6fa
github.com/trustbloc/sidetree-core-go v1.0.0-rc2
go.mongodb.org/mongo-driver v1.9.1
)

Expand Down Expand Up @@ -99,7 +99,7 @@ require (
github.com/square/go-jose/v3 v3.0.0-20200630053402-0a67ce9b0693 // indirect
github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8 // indirect
github.com/transparency-dev/merkle v0.0.0-20220208131541-728dc2de1344 // indirect
github.com/trustbloc/vct v1.0.0-rc1.0.20220530071917-3aa4f907b424 // indirect
github.com/trustbloc/vct v1.0.0-rc2 // indirect
github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions cmd/orb-server/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1441,10 +1441,10 @@ github.com/trustbloc/edge-core v0.1.8 h1:m4X5XNDwiHJjGf8gHnpo6aLkBYuqDyNRq+npjxL
github.com/trustbloc/edge-core v0.1.8/go.mod h1:gfoyG/xquRXyHkww0ldM2jwOTuKKZpHYn+87f+TBQ8M=
github.com/trustbloc/kms v0.1.9-0.20220526151939-d46e46e8f7e1 h1:/RqxggSgs1fh8cbifAmkme2LC8Fi1/BBJK9mqyfMWpU=
github.com/trustbloc/kms v0.1.9-0.20220526151939-d46e46e8f7e1/go.mod h1:a6XvGLZgwVqBAt47550cQeRKm04X2Nn1M8DE0PVb0XA=
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220620200455-bdd53389b6fa h1:9Uk54HGYfVesMTrXJZcXmoyfv6ZMLPuVaSlbKsr3Pg0=
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220620200455-bdd53389b6fa/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ=
github.com/trustbloc/vct v1.0.0-rc1.0.20220530071917-3aa4f907b424 h1:4/AWf/BGH7+i0Qbz6MZnQQzacLmx0b3vd87ajet16ak=
github.com/trustbloc/vct v1.0.0-rc1.0.20220530071917-3aa4f907b424/go.mod h1:k45HahHV0lr2h8ldzITXLjcWpTgXzRE8WL1avfC95po=
github.com/trustbloc/sidetree-core-go v1.0.0-rc2 h1:Ca/4iuZu/RhzraPfrj/r+tDuJiqYOd3R7bXyBJF+cXg=
github.com/trustbloc/sidetree-core-go v1.0.0-rc2/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ=
github.com/trustbloc/vct v1.0.0-rc2 h1:iuoG3rLC3V0kuwGnBmnzVPGH6xAxWzpozgkW5T5Qlac=
github.com/trustbloc/vct v1.0.0-rc2/go.mod h1:k45HahHV0lr2h8ldzITXLjcWpTgXzRE8WL1avfC95po=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ require (
github.com/stretchr/testify v1.7.0
github.com/transparency-dev/merkle v0.0.0-20220208131541-728dc2de1344
github.com/trustbloc/edge-core v0.1.8
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220620200455-bdd53389b6fa
github.com/trustbloc/vct v1.0.0-rc1.0.20220530071917-3aa4f907b424
github.com/trustbloc/sidetree-core-go v1.0.0-rc2
github.com/trustbloc/vct v1.0.0-rc2
go.mongodb.org/mongo-driver v1.9.1
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
)
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1429,10 +1429,10 @@ github.com/trustbloc/edge-core v0.1.7/go.mod h1:nQnH3CcEHTRXsWZe/vgj+J0JxxjwFK9I
github.com/trustbloc/edge-core v0.1.8 h1:m4X5XNDwiHJjGf8gHnpo6aLkBYuqDyNRq+npjxLc5cY=
github.com/trustbloc/edge-core v0.1.8/go.mod h1:gfoyG/xquRXyHkww0ldM2jwOTuKKZpHYn+87f+TBQ8M=
github.com/trustbloc/kms v0.1.9-0.20220526151939-d46e46e8f7e1/go.mod h1:a6XvGLZgwVqBAt47550cQeRKm04X2Nn1M8DE0PVb0XA=
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220620200455-bdd53389b6fa h1:9Uk54HGYfVesMTrXJZcXmoyfv6ZMLPuVaSlbKsr3Pg0=
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220620200455-bdd53389b6fa/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ=
github.com/trustbloc/vct v1.0.0-rc1.0.20220530071917-3aa4f907b424 h1:4/AWf/BGH7+i0Qbz6MZnQQzacLmx0b3vd87ajet16ak=
github.com/trustbloc/vct v1.0.0-rc1.0.20220530071917-3aa4f907b424/go.mod h1:k45HahHV0lr2h8ldzITXLjcWpTgXzRE8WL1avfC95po=
github.com/trustbloc/sidetree-core-go v1.0.0-rc2 h1:Ca/4iuZu/RhzraPfrj/r+tDuJiqYOd3R7bXyBJF+cXg=
github.com/trustbloc/sidetree-core-go v1.0.0-rc2/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ=
github.com/trustbloc/vct v1.0.0-rc2 h1:iuoG3rLC3V0kuwGnBmnzVPGH6xAxWzpozgkW5T5Qlac=
github.com/trustbloc/vct v1.0.0-rc2/go.mod h1:k45HahHV0lr2h8ldzITXLjcWpTgXzRE8WL1avfC95po=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
Expand Down
1 change: 0 additions & 1 deletion test/bdd/fixtures/.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ COMPOSE_DIR=.
ORB_FIXTURE_IMAGE=ghcr.io/trustbloc/orb
ORB_TEST_FIXTURE_IMAGE=ghcr.io/trustbloc/orb-test


# couch settings
COUCHDB_IMAGE=couchdb
COUCHDB_IMAGE_TAG=3.1.1
Expand Down
6 changes: 3 additions & 3 deletions test/bdd/fixtures/docker-compose-testver.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ services:

orb.trillian.log.server:
container_name: orb.trillian.log.server
image: ghcr.io/trustbloc/vct-log-server:v1.0.0-rc.1
image: ghcr.io/trustbloc/vct-log-server:v1.0.0-rc2
restart: always
command:
- --quota_system=noop
Expand All @@ -501,7 +501,7 @@ services:

orb.trillian.log.signer:
container_name: orb.trillian.log.signer
image: ghcr.io/trustbloc/vct-log-signer:v1.0.0-rc.1
image: ghcr.io/trustbloc/vct-log-signer:v1.0.0-rc2
restart: always
command:
- --quota_system=noop
Expand Down Expand Up @@ -544,7 +544,7 @@ services:

orb.vct:
container_name: orb.vct
image: ghcr.io/trustbloc-cicd/vct:v1.0.0-rc2-snapshot-3aa4f90
image: ghcr.io/trustbloc/vct:v1.0.0-rc2
restart: always
environment:
- VCT_API_HOST=172.20.0.14:8077
Expand Down
6 changes: 3 additions & 3 deletions test/bdd/fixtures/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ services:

orb.trillian.log.server:
container_name: orb.trillian.log.server
image: ghcr.io/trustbloc/vct-log-server:v1.0.0-rc.1
image: ghcr.io/trustbloc/vct-log-server:v1.0.0-rc2
restart: always
command:
- --quota_system=noop
Expand All @@ -924,7 +924,7 @@ services:

orb.trillian.log.signer:
container_name: orb.trillian.log.signer
image: ghcr.io/trustbloc/vct-log-signer:v1.0.0-rc.1
image: ghcr.io/trustbloc/vct-log-signer:v1.0.0-rc2
restart: always
command:
- --quota_system=noop
Expand Down Expand Up @@ -991,7 +991,7 @@ services:

orb.vct:
container_name: orb.vct
image: ghcr.io/trustbloc-cicd/vct:v1.0.0-rc2-snapshot-3aa4f90
image: ghcr.io/trustbloc/vct:v1.0.0-rc2
restart: always
environment:
- VCT_API_HOST=172.20.0.14:8077
Expand Down
4 changes: 2 additions & 2 deletions test/bdd/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ require (
github.com/sirupsen/logrus v1.8.1
github.com/tidwall/gjson v1.7.4
github.com/trustbloc/orb v1.0.0-rc1.0.20220531195220-8fc19d247843
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220620200455-bdd53389b6fa
github.com/trustbloc/sidetree-core-go v1.0.0-rc2
)

require (
Expand Down Expand Up @@ -104,7 +104,7 @@ require (
github.com/tidwall/match v1.0.3 // indirect
github.com/tidwall/pretty v1.1.0 // indirect
github.com/trustbloc/edge-core v0.1.8 // indirect
github.com/trustbloc/vct v1.0.0-rc1.0.20220530071917-3aa4f907b424 // indirect
github.com/trustbloc/vct v1.0.0-rc2 // indirect
github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions test/bdd/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1689,11 +1689,11 @@ github.com/trustbloc/edge-core v0.1.8/go.mod h1:gfoyG/xquRXyHkww0ldM2jwOTuKKZpHY
github.com/trustbloc/kms v0.1.8/go.mod h1:a6XvGLZgwVqBAt47550cQeRKm04X2Nn1M8DE0PVb0XA=
github.com/trustbloc/kms v0.1.9-0.20220526151939-d46e46e8f7e1/go.mod h1:a6XvGLZgwVqBAt47550cQeRKm04X2Nn1M8DE0PVb0XA=
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ=
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220620200455-bdd53389b6fa h1:9Uk54HGYfVesMTrXJZcXmoyfv6ZMLPuVaSlbKsr3Pg0=
github.com/trustbloc/sidetree-core-go v1.0.0-rc.1.0.20220620200455-bdd53389b6fa/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ=
github.com/trustbloc/sidetree-core-go v1.0.0-rc2 h1:Ca/4iuZu/RhzraPfrj/r+tDuJiqYOd3R7bXyBJF+cXg=
github.com/trustbloc/sidetree-core-go v1.0.0-rc2/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ=
github.com/trustbloc/vct v1.0.0-rc.1/go.mod h1:Q2fGxTITe3IWhVOf2aJAKk/CGlMCLsYANdszM70HBcU=
github.com/trustbloc/vct v1.0.0-rc1.0.20220530071917-3aa4f907b424 h1:4/AWf/BGH7+i0Qbz6MZnQQzacLmx0b3vd87ajet16ak=
github.com/trustbloc/vct v1.0.0-rc1.0.20220530071917-3aa4f907b424/go.mod h1:k45HahHV0lr2h8ldzITXLjcWpTgXzRE8WL1avfC95po=
github.com/trustbloc/vct v1.0.0-rc2 h1:iuoG3rLC3V0kuwGnBmnzVPGH6xAxWzpozgkW5T5Qlac=
github.com/trustbloc/vct v1.0.0-rc2/go.mod h1:k45HahHV0lr2h8ldzITXLjcWpTgXzRE8WL1avfC95po=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
Expand Down

0 comments on commit 0a44f37

Please sign in to comment.