Skip to content

Commit

Permalink
Revert "update simpleasset to refer to go modules"
Browse files Browse the repository at this point in the history
This reverts commit 29e2364.
  • Loading branch information
knarayan committed Jul 22, 2021
1 parent 5f3a2f8 commit 660248f
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 103 deletions.
2 changes: 2 additions & 0 deletions samples/fabric/simpleasset/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
simpleasset
asset-mgmt
mocks
9 changes: 7 additions & 2 deletions samples/fabric/simpleasset/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
build:
base-class:
cp -r ../../../core/network/fabric-interop-cc/interfaces/asset-mgmt .
build: base-class
go build -v .
test:
test: base-class
cp -r ../../../core/network/fabric-interop-cc/contracts/interop/mocks .
go test -v .
clean:
rm -rf asset-mgmt
rm -rf mocks
rm simpleasset || true
2 changes: 1 addition & 1 deletion samples/fabric/simpleasset/assetmgmt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-chaincode-go/shim"
"github.com/stretchr/testify/require"
sa "github.com/hyperledger-labs/weaver-dlt-interoperability/samples/fabric/simpleasset"
sa "github.com/hyperledger-labs/weaver/samples/simpleasset"
"github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go/common"
)

Expand Down
2 changes: 1 addition & 1 deletion samples/fabric/simpleasset/bondasset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"github.com/hyperledger/fabric-protos-go/ledger/queryresult"
sa "github.com/hyperledger-labs/weaver-dlt-interoperability/samples/fabric/simpleasset"
sa "github.com/hyperledger-labs/weaver/samples/simpleasset"
"github.com/stretchr/testify/require"
)

Expand Down
13 changes: 7 additions & 6 deletions samples/fabric/simpleasset/go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
module github.com/hyperledger-labs/weaver-dlt-interoperability/samples/fabric/simpleasset
module github.com/hyperledger-labs/weaver/samples/simpleasset

go 1.15

replace github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/interfaces/asset-mgmt => ./asset-mgmt

require (
github.com/golang/protobuf v1.5.2
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.2.1
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/contracts/interop v1.2.1
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/interfaces/asset-mgmt v1.2.1
github.com/hyperledger/fabric-chaincode-go v0.0.0-20210718160520-38d29fabecb9
github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v0.0.0-20210712215013-866f5840a1a9
github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/interfaces/asset-mgmt v0.0.0-00010101000000-000000000000
github.com/hyperledger/fabric-chaincode-go v0.0.0-20210319203922-6b661064d4d9
github.com/hyperledger/fabric-contract-api-go v1.1.1
github.com/hyperledger/fabric-protos-go v0.0.0-20210720123151-f0dc3e2a0871
github.com/hyperledger/fabric-protos-go v0.0.0-20210528200356-82833ecdac31
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.7.0
)
105 changes: 15 additions & 90 deletions samples/fabric/simpleasset/go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions samples/fabric/simpleasset/setup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ package main_test

import (
"os"
"github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/contracts/interop/mocks"
sa "github.com/hyperledger-labs/weaver-dlt-interoperability/samples/fabric/simpleasset"
"github.com/hyperledger-labs/weaver/samples/simpleasset/mocks"
sa "github.com/hyperledger-labs/weaver/samples/simpleasset"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion samples/fabric/simpleasset/tokenasset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/golang/protobuf/proto"
mspProtobuf "github.com/hyperledger/fabric-protos-go/msp"
sa "github.com/hyperledger-labs/weaver-dlt-interoperability/samples/fabric/simpleasset"
sa "github.com/hyperledger-labs/weaver/samples/simpleasset"
"github.com/stretchr/testify/require"
)

Expand Down

0 comments on commit 660248f

Please sign in to comment.