Revert "Move read methods to ReadMethods, remove some legacy access to Arch"

This reverts commit 3352ff4abbcac563e08d78ed8aa77728d00284a8.

1 files changed, 3 insertions, 15 deletions

diff --git a/ecp5/arch_pybindings.h b/ecp5/arch_pybindings.h
index 6256af18..a5044f29 100644
--- a/ecp5/arch_pybindings.h
+++ b/ecp5/arch_pybindings.h
@@ -30,11 +30,7 @@ namespace PythonConversion {
 
 template <> struct string_converter<BelId>
 {
-    BelId from_str(Context *ctx, std::string name)
-    {
-        auto &&proxy = ctx->rproxy();
-        return proxy.getBelByName(ctx->id(name));
-    }
+    BelId from_str(Context *ctx, std::string name) { return ctx->getBelByName(ctx->id(name)); }
 
     std::string to_str(Context *ctx, BelId id)
     {
@@ -53,22 +49,14 @@ template <> struct string_converter<BelType>
 
 template <> struct string_converter<WireId>
 {
-    WireId from_str(Context *ctx, std::string name)
-    {
-        auto &&proxy = ctx->rproxy();
-        return proxy.getWireByName(ctx->id(name));
-    }
+    WireId from_str(Context *ctx, std::string name) { return ctx->getWireByName(ctx->id(name)); }
 
     std::string to_str(Context *ctx, WireId id) { return ctx->getWireName(id).str(ctx); }
 };
 
 template <> struct string_converter<PipId>
 {
-    PipId from_str(Context *ctx, std::string name)
-    {
-        auto &&proxy = ctx->rproxy();
-        return proxy.getPipByName(ctx->id(name));
-    }
+    PipId from_str(Context *ctx, std::string name) { return ctx->getPipByName(ctx->id(name)); }
 
     std::string to_str(Context *ctx, PipId id) { return ctx->getPipName(id).str(ctx); }
 };