Merge pull request #449 from insolar/MN-806-update-mainnet-version

MN-806: update mainnet version
insolar · Oct 19, 2020 · 515abcd · 515abcd
2 parents e2f14de + 6952970
commit 515abcd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/hashicorp/golang-lru v0.5.3
 	github.com/insolar/insconfig v0.0.0-20200227134411-011eca6dc866
 	github.com/insolar/insolar v1.9.0
-	github.com/insolar/mainnet v1.12.1
+	github.com/insolar/mainnet v1.12.2
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/labstack/echo/v4 v4.1.11
 	github.com/mitchellh/mapstructure v1.1.2

diff --git a/go.sum b/go.sum
@@ -78,7 +78,9 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gbrlsnchs/jwt/v3 v3.0.0-rc.2/go.mod h1:AncDcjXz18xetI3A6STfXq2w+LuTx8pQ8bGEwRN8zVM=
 github.com/getkin/kin-openapi v0.2.0/go.mod h1:V1z9xl9oF5Wt7v32ne4FmiF1alpS4dM6mNzoywPOXlk=
+github.com/getkin/kin-openapi v0.2.1-0.20191211203508-0d9caf80ada6 h1:4nv60wGOeFauhMx5mAy0Jy5fcsQs2JtPraUxDPlw8Lw=
 github.com/getkin/kin-openapi v0.2.1-0.20191211203508-0d9caf80ada6/go.mod h1:8hr1ZT9XxXHCLcD+I0ow6wOKn6ljqk04N+xEMS2BILY=
+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/globocom/echo-prometheus v0.1.2 h1:tyusm7z6+873CHVhnl6QN8VOaKvNVgWfbNaiELkTRGc=
 github.com/globocom/echo-prometheus v0.1.2/go.mod h1:3oQLuoG5ZI5nufWK0ILpMl4vmw1q9OIPe2iy+ToRE+A=
@@ -171,9 +173,10 @@ github.com/insolar/insolar v1.8.2 h1:d1bZyPvU5z6otUYDpb4JQ7NC2X01gOSYN687Yc+vTNA
 github.com/insolar/insolar v1.8.2/go.mod h1:vBRQccV1Uuao6tRxD8Ek45CDp+15LMz15gELb2Qgn34=
 github.com/insolar/insolar v1.9.0 h1:lX8fVreRtCKdl/QxXAcQEORui0ax/eXmpObj7c8xlX0=
 github.com/insolar/insolar v1.9.0/go.mod h1:K9BPXhEiWsTornH2QSzUBC5OZc6shew3bUCUon7+FB0=
-github.com/insolar/mainnet v1.12.1 h1:KDDoRTARDQJeOuKpiuESoZq7rXQNAWF6W5ykxzhX+6A=
-github.com/insolar/mainnet v1.12.1/go.mod h1:Ob3JpozS3MtAyWN06tk/ztU9WLvRZJ6C1MYsOriT+TM=
+github.com/insolar/mainnet v1.12.2 h1:sGQup6+bFkH21pr677IL77Pn42SCF7R+k15l0bAOyUE=
+github.com/insolar/mainnet v1.12.2/go.mod h1:STHGgyo+C28VyIgngo7O6ly5AM3ZJythYXPqRcfp55w=
 github.com/insolar/ratelimiter v1.0.0/go.mod h1:tdN/LjBmGJt5/dfwAQk+0GXVtv2f+mGKvXpnt2FBpfs=
+github.com/insolar/rpc v1.2.2-0.20200331123021-db57b8833f82 h1:SbU7YjfN6JdDP3ULyYqqgxtSOlDkFPKm6ddN4tM0bFI=
 github.com/insolar/rpc v1.2.2-0.20200331123021-db57b8833f82/go.mod h1:BZcTsPtQu8QG8RqqQdAnuNAG8n6TOrdNxIHro0h99Ik=
 github.com/insolar/x-crypto v0.0.0-20191031140942-75fab8a325f6 h1:WS4a7qw+P1pcnviyxyMTA/aR+T51wJok1IC9rJkHrTg=
 github.com/insolar/x-crypto v0.0.0-20191031140942-75fab8a325f6/go.mod h1:9mvKFD2wFLEGmK8pNFIowmGRTjfyn3YHtr10s7DHpBY=

diff --git a/internal/app/observer/collecting/deposit_test.go b/internal/app/observer/collecting/deposit_test.go
@@ -21,7 +21,7 @@ import (
 	proxyDeposit "github.com/insolar/mainnet/application/builtin/proxy/deposit"
 	proxyPKShard "github.com/insolar/mainnet/application/builtin/proxy/pkshard"
 	proxyWallet "github.com/insolar/mainnet/application/builtin/proxy/wallet"
-	"github.com/insolar/mainnet/application/genesisrefs"
+	"github.com/insolar/mainnet/application/genesis"
 	"github.com/stretchr/testify/require"
 
 	"github.com/insolar/observer/internal/app/observer"
@@ -52,8 +52,8 @@ func TestDepositCollector_CollectGenesisDeposit(t *testing.T) {
 		Lockup:             lockup,
 	}
 
-	depositRef := genesisrefs.ContractMigrationDeposit
-	memberRef := genesisrefs.ContractMigrationAdminMember
+	depositRef := genesis.ContractMigrationDeposit
+	memberRef := genesis.ContractMigrationAdminMember
 	walletRef1 := gen.ReferenceWithPulse(pn)
 	accountRef1 := gen.ReferenceWithPulse(pn)
 
@@ -79,8 +79,8 @@ func TestDepositCollector_CollectGenesisDeposit(t *testing.T) {
 
 	expected := []observer.Deposit{{
 		EthHash:         txHash,
-		Ref:             genesisrefs.ContractMigrationDeposit,
-		Member:          genesisrefs.ContractMigrationAdminMember,
+		Ref:             genesis.ContractMigrationDeposit,
+		Member:          genesis.ContractMigrationAdminMember,
 		Timestamp:       1546300800,
 		Balance:         balance,
 		Amount:          amount,

diff --git a/internal/app/observer/collecting/transactions.go b/internal/app/observer/collecting/transactions.go
@@ -18,7 +18,7 @@ import (
 	"github.com/insolar/mainnet/application/builtin/contract/member"
 	proxyDeposit "github.com/insolar/mainnet/application/builtin/proxy/deposit"
 	proxyMember "github.com/insolar/mainnet/application/builtin/proxy/member"
-	"github.com/insolar/mainnet/application/genesisrefs"
+	"github.com/insolar/mainnet/application/genesis"
 	"github.com/pkg/errors"
 
 	"github.com/insolar/observer/internal/app/observer"
@@ -620,7 +620,7 @@ func (c *TxSagaResultCollector) Collect(ctx context.Context, rec exporter.Record
 		return nil
 	}
 
-	if rec.Record.ObjectID == *genesisrefs.ContractFeeMember.GetLocal() {
+	if rec.Record.ObjectID == *genesis.ContractFeeMember.GetLocal() {
 		log.Debug("skipped (fee member object)")
 		return nil
 	}