Skip to content

Commit

Permalink
Merge branch 'main' into block-index
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronbuchwald authored Oct 3, 2024
2 parents 0f4688e + 2ea784a commit 6f473b9
Show file tree
Hide file tree
Showing 7 changed files with 592 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
* @aaronbuchwald @joshua-kim
.github/ @richardpringle
/x/contracts/ @iFrostizz @richardpringle @samliok
/x/contracts/ @richardpringle @samliok
Cargo.toml @richardpringle @samliok
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ members = [
"x/contracts/test/contracts/*",
"x/contracts/simulator",
"x/contracts/examples/tutorial",
"x/contracts/examples/multisig",
]
resolver = "2"

Expand Down
4 changes: 4 additions & 0 deletions pubsub/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ func (x *counter) dummyProcessTXCallback(b []byte, _ *Connection) {
// a msg to be sent to all connections. Checks the message was delivered properly
// and the connection is properly handled when closed.
func TestServerPublish(t *testing.T) {
t.Skip("FLAKY")

require := require.New(t)
// Create a new logger for the test
logger := logging.NoLog{}
Expand Down Expand Up @@ -192,6 +194,8 @@ func TestServerRead(t *testing.T) {
// a msg to be sent to only one of the connections. Checks the message was
// delivered properly and the connection is properly handled when closed.
func TestServerPublishSpecific(t *testing.T) {
t.Skip("FLAKY")

require := require.New(t)
// Create a new logger for the test
logger := logging.NoLog{}
Expand Down
17 changes: 17 additions & 0 deletions x/contracts/examples/multisig/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[package]
name = "multisig"
version = "0.1.0"
edition = "2021"

[dependencies]
wasmlanche.workspace = true

[dev-dependencies]
counter = { path = "../counter", features = ["bindings"] }
wasmlanche = { workspace = true, features = ["debug", "test"] }

[build-dependencies]
wasmlanche = { workspace = true, features = ["build"] }

[features]
debug = ["wasmlanche/debug"]
6 changes: 6 additions & 0 deletions x/contracts/examples/multisig/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Copyright (C) 2024, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.

fn main() {
wasmlanche::build::build_wasm();
}
Loading

0 comments on commit 6f473b9

Please sign in to comment.