Skip to content

Commit 9fc67ab

Browse files
committed
Remove scipp dependency, inline Status class
- Add science/synapse/status.h with StatusCode enum and Status class - Update all includes from science/scipp/status.h to local status.h - Add missing #include <optional> and <chrono> to device.h - Remove science-scipp from vcpkg.json dependencies
1 parent 2008579 commit 9fc67ab

9 files changed

Lines changed: 59 additions & 7 deletions

File tree

include/science/synapse/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <vector>
66
#include <utility>
77

8-
#include "science/scipp/status.h"
8+
#include "science/synapse/status.h"
99
#include "science/synapse/api/synapse.pb.h"
1010
#include "science/synapse/node.h"
1111

include/science/synapse/device.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#pragma once
22

3+
#include <chrono>
34
#include <future>
45
#include <memory>
6+
#include <optional>
57
#include <string>
68
#include <vector>
79

include/science/synapse/node.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <vector>
66
#include <utility>
77

8-
#include "science/scipp/status.h"
8+
#include "science/synapse/status.h"
99
#include "science/synapse/api/node.pb.h"
1010

1111
namespace synapse {

include/science/synapse/signal_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <vector>
55
#include "science/synapse/api/nodes/signal_config.pb.h"
66
#include "science/synapse/channel.h"
7-
#include "science/scipp/status.h"
7+
#include "science/synapse/status.h"
88

99
namespace synapse {
1010

include/science/synapse/status.h

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#pragma once
2+
3+
#include <string>
4+
#include <utility>
5+
6+
namespace science {
7+
8+
/**
9+
* Library-agnostic status codes for return values.
10+
* These codes are 1:1 with abseil / gRPC status codes.
11+
*/
12+
enum class StatusCode : int {
13+
kOk = 0,
14+
kCancelled = 1,
15+
kUnknown = 2,
16+
kInvalidArgument = 3,
17+
kDeadlineExceeded = 4,
18+
kNotFound = 5,
19+
kAlreadyExists = 6,
20+
kPermissionDenied = 7,
21+
kResourceExhausted = 8,
22+
kFailedPrecondition = 9,
23+
kAborted = 10,
24+
kOutOfRange = 11,
25+
kUnimplemented = 12,
26+
kInternal = 13,
27+
kUnavailable = 14,
28+
kDataLoss = 15,
29+
kUnauthenticated = 16,
30+
};
31+
32+
/**
33+
* Status, containing a status code and an optional message.
34+
*/
35+
class Status {
36+
public:
37+
Status() = default;
38+
explicit Status(StatusCode code) : code_(code) {}
39+
Status(StatusCode code, std::string message) : code_(code), message_(std::move(message)) {}
40+
41+
[[nodiscard]] bool ok() const { return code_ == StatusCode::kOk; }
42+
[[nodiscard]] StatusCode code() const { return code_; }
43+
[[nodiscard]] std::string message() const { return message_; }
44+
45+
private:
46+
StatusCode code_{StatusCode::kOk};
47+
std::string message_{};
48+
};
49+
50+
} // namespace science

include/science/synapse/tap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <optional>
77

88
#include <zmq.hpp>
9-
#include "science/scipp/status.h"
9+
#include "science/synapse/status.h"
1010
#include "science/synapse/api/tap.pb.h"
1111

1212
namespace synapse {

include/science/synapse/util/discover.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <string>
55
#include <vector>
66

7-
#include "science/scipp/status.h"
7+
#include "science/synapse/status.h"
88
#include "science/synapse/device_advertisement.h"
99

1010
namespace synapse {

test/test_discover.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
#include <gtest/gtest.h>
3-
#include <science/scipp/status.h>
3+
#include <science/synapse/status.h>
44
#include <science/synapse/util/discover.h>
55

66
using synapse::DeviceAdvertisement;

vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "0.1.0",
55
"supports": "arm64 | x64 | linux | osx",
66
"default-features": ["examples", "tests"],
7-
"dependencies": ["grpc", "protobuf", "cppzmq", "science-scipp"],
7+
"dependencies": ["grpc", "protobuf", "cppzmq"],
88
"vcpkg-configuration": {
99
"overlay-ports": ["./external/sciencecorp/vcpkg/ports"]
1010
},

0 commit comments

Comments
 (0)