Merge branch 'main' into anmol/starship-cli

hyperweb-io · May 21, 2023 · f09300d · f09300d
2 parents 3bbc3ae + b5c80ac
commit f09300d
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 22 deletions.
diff --git a/clients/go/client/BUILD.bazel b/clients/go/client/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "lib",
@@ -19,9 +19,3 @@ go_library(
         "@org_uber_go_zap//:zap",
     ],
 )
-
-go_binary(
-    name = "client",
-    embed = [":lib"],
-    visibility = ["//visibility:public"],
-)
diff --git a/examples/osmojs/package.json b/examples/osmojs/package.json
@@ -19,7 +19,6 @@
     "babel-preset-airbnb": "^5.0.0",
     "bignumber.js": "9.1.0",
     "eslint": "^8.40.0",
-    "interchain": "1.3.0",
     "jest": "^29.5.0",
     "jest-cli": "^29.5.0",
     "js-yaml": "^4.1.0",

diff --git a/examples/osmojs/tests/gov.test.js b/examples/osmojs/tests/gov.test.js
@@ -3,7 +3,7 @@ import { assertIsDeliverTxSuccess, SigningStargateClient } from '@cosmjs/stargat
 import { coins } from '@cosmjs/amino';
 import Long from 'long';
 import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
-import {cosmos} from "osmojs";
+import { cosmos } from "osmojs";
 
 import { ChainClients } from './setup.test';
 import { waitUntil } from "./utils.js";

diff --git a/examples/osmojs/tests/staking.test.js b/examples/osmojs/tests/staking.test.js
@@ -2,7 +2,7 @@ import { generateMnemonic } from '@confio/relayer/build/lib/helpers';
 import { assertIsDeliverTxSuccess, SigningStargateClient } from '@cosmjs/stargate';
 import { coin, coins } from '@cosmjs/amino';
 import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
-import { cosmos } from 'interchain';
+import { cosmos } from "osmojs";
 import BigNumber from 'bignumber.js';
 
 import { ChainClients } from './setup.test';

diff --git a/proto/exposer/BUILD.bazel b/proto/exposer/BUILD.bazel
@@ -6,8 +6,8 @@ proto_library(
     srcs = [
         "genesis.proto",
         "mnemonic.proto",
-        "service.proto",
         "node.proto",
+        "service.proto",
     ],
     visibility = ["//visibility:public"],
     deps = [

diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel
@@ -5,9 +5,7 @@ load("@io_bazel_rules_docker//container:container.bzl", "container_bundle", "con
 
 go_library(
     name = "tests_lib",
-    srcs = [
-        "config.go"
-    ],
+    srcs = ["config.go"],
     importpath = "github.com/cosmology-tech/starship/tests",
     visibility = ["//visibility:public"],
 )
@@ -21,24 +19,43 @@ go_test(
     name = "tests",
     srcs = [
         "e2e_test.go",
-        "registry_test.go",
         "exposer_test.go",
+        "registry_test.go",
+    ],
+    data = [
+        ":configfiles",
     ],
     embed = [":tests_lib"],
+    env = {
+        "GO_TEST_WRAP_TESTV": "1",
+    },
     deps = [
-        "//proto/registry:registry_go_proto",
         "//proto/exposer:exposer_go_proto",
+        "//proto/registry:registry_go_proto",
+        "@com_github_golang_protobuf//jsonpb",
+        "@com_github_golang_protobuf//proto",
         "@com_github_json_iterator_go//:go",
         "@com_github_stretchr_testify//suite",
         "@in_gopkg_yaml_v3//:yaml_v3",
         "@org_uber_go_zap//:zap",
+    ],
+)
+
+go_test(
+    name = "tests_test",
+    srcs = [
+        "e2e_test.go",
+        "exposer_test.go",
+        "registry_test.go",
+    ],
+    embed = [":tests"],
+    deps = [
+        "//proto/exposer:exposer_go_proto",
+        "//proto/registry:registry_go_proto",
         "@com_github_golang_protobuf//jsonpb",
         "@com_github_golang_protobuf//proto",
+        "@com_github_stretchr_testify//suite",
+        "@in_gopkg_yaml_v3//:yaml_v3",
+        "@org_uber_go_zap//:zap",
     ],
-    data = [
-        ":configfiles",
-    ],
-    env = {
-        "GO_TEST_WRAP_TESTV": "1",
-    },
 )