From 822d86aca0f553aacc83664fd1c4b705c9aa1a2e Mon Sep 17 00:00:00 2001
From: Tom Molesworth <tom@deriv.com>
Date: Fri, 16 Aug 2024 00:42:18 +0800
Subject: [PATCH 1/3] Update tests for latest Data::Checks

---
 t/syntax.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/syntax.t b/t/syntax.t
index 44ec838e..93546526 100644
--- a/t/syntax.t
+++ b/t/syntax.t
@@ -167,10 +167,10 @@ subtest 'Myriad::Class :v2' => sub {
     }, undef, 'can check numeric >= 5');
     like(exception {
         $obj->checked(-3)
-    }, qr/\Qsatisfying :Checked(NumGE(5))/, 'numeric check fails on number out of range');
+    }, qr/\Qsatisfying NumGE(5)/, 'numeric check fails on number out of range');
     like(exception {
         $obj->checked('xx')
-    }, qr/\Qsatisfying :Checked(NumGE(5))/, 'numeric check fails on invalid number');
+    }, qr/\Qsatisfying NumGE(5)/, 'numeric check fails on invalid number');
     done_testing;
 };
 done_testing;

From 477e5b9943c69cde494831aac8acb6bf9bda5af7 Mon Sep 17 00:00:00 2001
From: Tom Molesworth <tom@deriv.com>
Date: Fri, 16 Aug 2024 00:52:24 +0800
Subject: [PATCH 2/3] Update Object::Pad imports to avoid turning on all
 experimental features unnecessarily

---
 t/RPC/full-cycle.t          | 2 +-
 t/RPC/overflow-protection.t | 2 +-
 t/RPC/pending-requests.t    | 2 +-
 t/commands.t                | 2 +-
 t/myriad.t                  | 2 +-
 t/registry.t                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/t/RPC/full-cycle.t b/t/RPC/full-cycle.t
index d5187ed4..911f222b 100644
--- a/t/RPC/full-cycle.t
+++ b/t/RPC/full-cycle.t
@@ -8,7 +8,7 @@ use Log::Any::Adapter qw(TAP);
 
 use Future;
 use Future::AsyncAwait;
-use Object::Pad qw(:experimental);
+use Object::Pad;
 
 my ($ping_service, $pong_service);
 
diff --git a/t/RPC/overflow-protection.t b/t/RPC/overflow-protection.t
index 0f39205c..9acca954 100644
--- a/t/RPC/overflow-protection.t
+++ b/t/RPC/overflow-protection.t
@@ -12,7 +12,7 @@ use Myriad::Transport::Memory;
 use Myriad::Transport::Redis;
 use Myriad::RPC::Message;
 use Sys::Hostname qw(hostname);
-use Object::Pad qw(:experimental);
+use Object::Pad qw(:experimental(mop));
 
 use Myriad;
 
diff --git a/t/RPC/pending-requests.t b/t/RPC/pending-requests.t
index d5313343..fe60e66b 100644
--- a/t/RPC/pending-requests.t
+++ b/t/RPC/pending-requests.t
@@ -12,7 +12,7 @@ use Myriad::Transport::Memory;
 use Myriad::Transport::Redis;
 use Myriad::RPC::Message;
 use Sys::Hostname qw(hostname);
-use Object::Pad qw(:experimental);
+use Object::Pad qw(:experimental(mop));
 
 use Myriad;
 
diff --git a/t/commands.t b/t/commands.t
index f4d1db92..55774867 100644
--- a/t/commands.t
+++ b/t/commands.t
@@ -7,7 +7,7 @@ use Test::MockObject;
 use Test::Fatal;
 use Test::Deep;
 
-use Object::Pad qw(:experimental);
+use Object::Pad qw(:experimental(mop));
 use Log::Any::Adapter qw(TAP);
 
 use Future::AsyncAwait;
diff --git a/t/myriad.t b/t/myriad.t
index 7420fc4f..e14a076e 100644
--- a/t/myriad.t
+++ b/t/myriad.t
@@ -10,7 +10,7 @@ use Test::MockObject;
 use Future::AsyncAwait;
 use IO::Async::Test;
 
-use Object::Pad qw(:experimental);
+use Object::Pad qw(:experimental(mop));
 
 sub loop_notifiers {
     my $loop = shift;
diff --git a/t/registry.t b/t/registry.t
index c541e84c..b5d96cc8 100644
--- a/t/registry.t
+++ b/t/registry.t
@@ -11,7 +11,7 @@ use IO::Async::Test;
 use Future::AsyncAwait;
 # Needed to set Testing::Service method names without fully defining service as Myriad::Service
 use Sub::Util qw(subname set_subname);
-use Object::Pad qw(:experimental);
+use Object::Pad qw(:experimental(mop));
 
 use Myriad;
 use Myriad::Registry;

From 587c4517f424025c5438389da3322fa59faa24ac Mon Sep 17 00:00:00 2001
From: Tom Molesworth <tom@deriv.com>
Date: Fri, 16 Aug 2024 00:52:36 +0800
Subject: [PATCH 3/3] Drop unused experimental Object::Pad feature

---
 lib/Myriad/Class.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Myriad/Class.pm b/lib/Myriad/Class.pm
index 8f1b9b48..8e48c9b4 100644
--- a/lib/Myriad/Class.pm
+++ b/lib/Myriad/Class.pm
@@ -396,7 +396,7 @@ sub import {
     }
 
     if(my $class = $args{class} // $pkg) {
-        Object::Pad->import_into($pkg, ":experimental(init_expr mop custom_field_attr adjust_params)");
+        Object::Pad->import_into($pkg, ":experimental(init_expr mop custom_field_attr)");
 
         my $method = 'begin_' . ($args{type} || 'class');
         Module::Load::load($args{extends}) if $args{extends};