update simpleasset to refer to go modules

Signed-off-by: Krishnasuri Narayanam <knaraya3@in.ibm.com>

samples/fabric/simpleasset/.gitignore

@@ -1,3 +1 @@
 simpleasset
-asset-mgmt
-mocks

samples/fabric/simpleasset/Makefile

@@ -1,11 +1,6 @@
-base-class:
- cp -r ../../../core/network/fabric-interop-cc/interfaces/asset-mgmt .
-build: base-class
+build:
  go build -v .
-test: base-class
- cp -r ../../../core/network/fabric-interop-cc/contracts/interop/mocks .
+test:
  go test -v .
 clean:
- rm -rf asset-mgmt
- rm -rf mocks
  rm simpleasset || true

samples/fabric/simpleasset/assetmgmt_test.go

@@ -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/samples/simpleasset"
+ sa "github.com/hyperledger-labs/weaver-dlt-interoperability/samples/fabric/simpleasset"
  "github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go/common"
 )
 

samples/fabric/simpleasset/bondasset_test.go

@@ -7,7 +7,7 @@ import (
  "time"
 
  "github.com/hyperledger/fabric-protos-go/ledger/queryresult"
- sa "github.com/hyperledger-labs/weaver/samples/simpleasset"
+ sa "github.com/hyperledger-labs/weaver-dlt-interoperability/samples/fabric/simpleasset"
  "github.com/stretchr/testify/require"
 )
 

samples/fabric/simpleasset/go.mod

@@ -1,16 +1,15 @@
-module github.com/hyperledger-labs/weaver/samples/simpleasset
+module github.com/hyperledger-labs/weaver-dlt-interoperability/samples/fabric/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 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-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/fabric-contract-api-go v1.1.1
- github.com/hyperledger/fabric-protos-go v0.0.0-20210528200356-82833ecdac31
+ github.com/hyperledger/fabric-protos-go v0.0.0-20210720123151-f0dc3e2a0871
  github.com/sirupsen/logrus v1.8.1
  github.com/stretchr/testify v1.7.0
 )

samples/fabric/simpleasset/setup_test.go

@@ -8,8 +8,8 @@ package main_test
 
 import (
  "os"
- "github.com/hyperledger-labs/weaver/samples/simpleasset/mocks"
- sa "github.com/hyperledger-labs/weaver/samples/simpleasset"
+ "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"
 )
 
 const (

samples/fabric/simpleasset/tokenasset_test.go

@@ -9,7 +9,7 @@ import (
 
  "github.com/golang/protobuf/proto"
  mspProtobuf "github.com/hyperledger/fabric-protos-go/msp"
- sa "github.com/hyperledger-labs/weaver/samples/simpleasset"
+ sa "github.com/hyperledger-labs/weaver-dlt-interoperability/samples/fabric/simpleasset"
  "github.com/stretchr/testify/require"
 )