Merge branch 'main' into CNS-639-add-query-to-fetch-all-conflicts-tha…

…t-the-provider-is-reported
lavanet · Oct 12, 2023 · 289935f · 289935f
2 parents e1ac45c + c5a381d
commit 289935f
Show file tree

Hide file tree

Showing 74 changed files with 7,968 additions and 4,633 deletions.
diff --git a/.github/workflows/cli_tests.yml b/.github/workflows/cli_tests.yml
@@ -0,0 +1,43 @@
+name: Lava cli Tests
+
+on: [pull_request]
+
+jobs:
+  go:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: '0'
+    - uses: actions/setup-go@v3
+      with:
+        go-version: 1.20.5
+
+
+    # Setup Paths
+    - name: home
+      run:  pwd && ls -l
+    - name: ls usr 
+      run: ls -l /home/runner/work/lava/lava
+    - name: cp lava
+      run:  cp -r ~/work/lava/lava ~/go/lava 
+    - name: export PATH
+      run: export PATH=$PATH:/go:/go/bin:$(go env GOPATH)/bin:/usr/local:`pwd`:/home/runner/work/lava/lava/
+    - name: export GOPATH
+      run: export GOPATH=$GOPATH:$(go env GOPATH):/go:/go/lava:/usr/local:`pwd`
+    - name: export LAVA
+      run: export LAVA=/home/runner/work/lava/lava
+    - name: go env
+      run:  go env
+    - name: pwd
+      run: pwd
+    - name: tree
+      run: tree
+    - name: ls -l
+      run: ls -l
+
+    - name: lavad cli test
+      run: |
+        chmod +x ./scripts/cli_test.sh    
+        ./scripts/cli_test.sh     
+        killall lavad    
diff --git a/.github/workflows/consensus_tests.yml b/.github/workflows/consensus_tests.yml
@@ -65,9 +65,15 @@ jobs:
 
     - name: lava subscription unit Tests
       run: go test ./x/subscription/... 
+
+    - name: lava dualstaking unit Tests
+      run: go test ./x/dualstaking/... 
+
+    - name: lava fixation unit Tests
+      run: go test ./x/fixationstore/... 
+
+    - name: lava timerstore unit Tests
+      run: go test ./x/timerstore/... 
 
-    - name: lavad cli test
-      run: |
-        chmod +x ./scripts/cli_test.sh    
-        ./scripts/cli_test.sh     
-        killall lavad    
+    - name: lava downtime unit Tests
+      run: go test ./x/downtime/... 
diff --git a/app/upgrades/empty_upgrades.go b/app/upgrades/empty_upgrades.go
@@ -6,9 +6,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	"github.com/lavanet/lava/app/keepers"
-	"github.com/lavanet/lava/common"
 	v1 "github.com/lavanet/lava/x/downtime/v1"
 	dualstakingtypes "github.com/lavanet/lava/x/dualstaking/types"
+	"github.com/lavanet/lava/x/fixationstore"
 	protocoltypes "github.com/lavanet/lava/x/protocol/types"
 )
 
@@ -70,7 +70,7 @@ func v0_23_0_UpgradeHandler(
 	lk *keepers.LavaKeepers,
 ) upgradetypes.UpgradeHandler {
 	return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
-		lk.PairingKeeper.InitProviderQoS(ctx, *common.DefaultGenesis())
+		lk.PairingKeeper.InitProviderQoS(ctx, *fixationstore.DefaultGenesis())
 		return m.RunMigrations(ctx, c, vm)
 	}
 }

diff --git a/common/common_test.go b/common/common_test.go
diff --git a/common/fixation_entry_index.go b/common/fixation_entry_index.go
diff --git a/common/timer_migrate.go b/common/timer_migrate.go
diff --git a/ecosystem/lava-sdk/src/grpc_web_services/amino/amino_pb.js b/ecosystem/lava-sdk/src/grpc_web_services/amino/amino_pb.js
@@ -1,3 +1,4 @@
+// source: amino/amino.proto
 /**
  * @fileoverview
  * @enhanceable
@@ -12,6 +13,7 @@ var goog = jspb;
 var global = Function('return this')();
 
 var google_protobuf_descriptor_pb = require('google-protobuf/google/protobuf/descriptor_pb.js');
+goog.object.extend(proto, google_protobuf_descriptor_pb);
 goog.exportSymbol('proto.amino.dontOmitempty', null, global);
 goog.exportSymbol('proto.amino.encoding', null, global);
 goog.exportSymbol('proto.amino.fieldName', null, global);