Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(js): use quotes instead of brackets for local dependencies #232

Merged
merged 3 commits into from
Oct 30, 2023
Merged

fix(js): use quotes instead of brackets for local dependencies #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bf56e6
fix(js): use quotes instead of brackets for local dependencies
Oct 30, 2023
439475c
Merge branch 'main' into use-quotes-instead-of-brackets
berendsliedrecht Oct 30, 2023
bc46005
fix(js): use quotes instead of brackets for local dependencies
Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion indy-vdr-proxy/src/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,12 @@ fn get_pool_status(state: Rc<RefCell<AppState>>, namespace: &str) -> VdrResult<R
let pool_states = &state.borrow().pool_states;
let opt_pool = &pool_states
.get(namespace)
.ok_or_else(|| err_msg(VdrErrorKind::Input, format!("Unknown ledger: {}", namespace)))?
.ok_or_else(|| {
err_msg(
VdrErrorKind::Input,
format!("Unknown ledger: {}", namespace),
)
})?
.pool;
let (status, mt_root, mt_size, nodes) = if let Some(pool) = opt_pool {
let (mt_root, mt_size) = pool.get_merkle_tree_info();
Expand Down
2 changes: 1 addition & 1 deletion wrappers/javascript/indy-vdr-react-native/android/cpp-adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <fbjni/fbjni.h>
#include <ReactCommon/CallInvokerHolder.h>

#include <turboModuleUtility.h>
#include "turboModuleUtility.h"

using namespace facebook;

Expand Down
3 changes: 2 additions & 1 deletion wrappers/javascript/indy-vdr-react-native/cpp/HostObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#include <HostObject.h>
#include <algorithm>
#include <vector>

#include "HostObject.h"

IndyVdrTurboModuleHostObject::IndyVdrTurboModuleHostObject(jsi::Runtime &rt) {
return;
}
Expand Down
5 changes: 2 additions & 3 deletions wrappers/javascript/indy-vdr-react-native/cpp/HostObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#pragma once

#include <jsi/jsi.h>

#include <map>

#include <indyVdr.h>
#include <turboModuleUtility.h>
#include "indyVdr.h"
#include "turboModuleUtility.h"

using namespace facebook;

Expand Down
2 changes: 1 addition & 1 deletion wrappers/javascript/indy-vdr-react-native/cpp/indyVdr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <indyVdr.h>
#include "indyVdr.h"

using namespace indyVdrTurboModuleUtility;

Expand Down
4 changes: 2 additions & 2 deletions wrappers/javascript/indy-vdr-react-native/cpp/indyVdr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include <jsi/jsi.h>

#include <include/libindy_vdr.h>
#include <turboModuleUtility.h>
#include "include/libindy_vdr.h"
#include "turboModuleUtility.h"

using namespace facebook;

Expand Down
2 changes: 1 addition & 1 deletion wrappers/javascript/indy-vdr-react-native/cpp/turboModuleUtility.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <turboModuleUtility.h>
#include "turboModuleUtility.h"

namespace indyVdrTurboModuleUtility {

Expand Down
4 changes: 2 additions & 2 deletions wrappers/javascript/indy-vdr-react-native/cpp/turboModuleUtility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include <ReactCommon/CallInvoker.h>
#include <jsi/jsi.h>

#include <HostObject.h>
#include <include/libindy_vdr.h>
#include "HostObject.h"
#include "include/libindy_vdr.h"

using namespace facebook;

Expand Down
6 changes: 3 additions & 3 deletions wrappers/javascript/indy-vdr-react-native/ios/IndyVdr.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#import "turboModuleUtility.h"

#import "IndyVdr.h"
#import <React/RCTBridge+Private.h>
#import <jsi/jsi.h>
#import <React/RCTUtils.h>
#import <ReactCommon/RCTTurboModule.h>

#import "turboModuleUtility.h"
#import "IndyVdr.h"

using namespace facebook;

@implementation IndyVdr
Expand Down